From 08f351fe31adef6f7f78f486fdfef970e7213f9f Mon Sep 17 00:00:00 2001 From: Gabriel Ozouf Date: Fri, 26 Mar 2021 12:06:20 +0100 Subject: [PATCH] [settings] Add PCB version to software version / patch level cycle --- apps/settings/sub_menu/about_controller.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index 790a36382..19b4ae58d 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -25,11 +25,15 @@ bool AboutController::handleEvent(Ion::Events::Event event) { if (event == Ion::Events::OK || event == Ion::Events::EXE) { if (selectedRow() == 0) { MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell(); - if (strcmp(myCell->accessoryText(), Ion::patchLevel()) == 0) { + const char * currentText = myCell->accessoryText(); + if (strcmp(currentText, Ion::patchLevel()) == 0) { + myCell->setAccessoryText(Ion::pcbVersion()); + } else if (strcmp(currentText, Ion::pcbVersion()) == 0) { myCell->setAccessoryText(Ion::softwareVersion()); - return true; + } else { + assert(strcmp(currentText, Ion::softwareVersion()) == 0); + myCell->setAccessoryText(Ion::patchLevel()); } - myCell->setAccessoryText(Ion::patchLevel()); return true; } return false;