small fixes for release.

Author: dave

examples/mbed/stm32f429FrameBuffer/stm32f429FrameBuffer.emf

@@ -159,6 +159,22 @@
         "staticDataInRAM": true
       }
     },
+    {
+      "parentId": 5,
+      "type": "runtimeList",
+      "item": {
+        "initialRows": 5,
+        "listCreationMode": "FLASH_ARRAY",
+        "name": "Board List",
+        "variableName": "SettingsBoardList",
+        "id": 26,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "staticDataInRAM": false
+      }
+    },
     {
       "parentId": 0,
       "type": "subMenu",
@@ -522,5 +538,16 @@
     "packageNamespace": "",
     "appIsModular": false
   },
-  "stringLists": []
+  "stringLists": [
+    {
+      "id": 26,
+      "listItems": [
+        "STM32",
+        "ESP32",
+        "AVR",
+        "SAMD",
+        "RP2040"
+      ]
+    }
+  ]
 }

examples/mbed/stm32f429FrameBuffer/stm32f429FrameBuffer_menu.cpp

@@ -64,8 +64,16 @@ BooleanMenuItem menuConnectivityEnableUSB(&minfoConnectivityEnableUSB, false, nu
 const SubMenuInfo minfoConnectivity = { "Connectivity", 9, 0xffff, 0, NO_CALLBACK };
 BackMenuItem menuBackConnectivity(&minfoConnectivity, &menuConnectivityEnableUSB, INFO_LOCATION_PGM);
 SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, &menuSamples, INFO_LOCATION_PGM);
+const char enumStrSettingsBoardList_0[] = "STM32";
+const char enumStrSettingsBoardList_1[] = "ESP32";
+const char enumStrSettingsBoardList_2[] = "AVR";
+const char enumStrSettingsBoardList_3[] = "SAMD";
+const char enumStrSettingsBoardList_4[] = "RP2040";
+const char* const enumStrSettingsBoardList[]  = { enumStrSettingsBoardList_0, enumStrSettingsBoardList_1, enumStrSettingsBoardList_2, enumStrSettingsBoardList_3, enumStrSettingsBoardList_4 };
+const AnyMenuInfo minfoSettingsBoardList = { "Board List", 26, 0xffff, 0, NO_CALLBACK };
+ListRuntimeMenuItem menuSettingsBoardList(&minfoSettingsBoardList, 5, enumStrSettingsBoardList, ListRuntimeMenuItem::FLASH_ARRAY, nullptr, INFO_LOCATION_PGM);
 AnyMenuInfo minfoSettingsDashboard = { "Dashboard", 25, 0xffff, 0, onShowDash };
-ActionMenuItem menuSettingsDashboard(&minfoSettingsDashboard, nullptr, INFO_LOCATION_RAM);
+ActionMenuItem menuSettingsDashboard(&minfoSettingsDashboard, &menuSettingsBoardList, INFO_LOCATION_RAM);
 const AnyMenuInfo minfoSettingsCalibrateNow = { "Calibrate Now", 24, 0xffff, 0, onCalibrateScreen };
 ActionMenuItem menuSettingsCalibrateNow(&minfoSettingsCalibrateNow, &menuSettingsDashboard, INFO_LOCATION_PGM);
 const BooleanMenuInfo minfoSettingsTSCalibration = { "TS Calibration", 23, 0xffff, 1, onTouchCalibration, NAMING_CHECKBOX };

examples/mbed/stm32f429FrameBuffer/stm32f429FrameBuffer_menu.h

@@ -57,6 +57,8 @@ extern SubMenuItem menuSamples;
 extern BooleanMenuItem menuConnectivityEnableUSB;
 extern BackMenuItem menuBackConnectivity;
 extern SubMenuItem menuConnectivity;
+extern const char* const enumStrSettingsBoardList[];
+extern ListRuntimeMenuItem menuSettingsBoardList;
 extern AnyMenuInfo minfoSettingsDashboard;
 extern ActionMenuItem menuSettingsDashboard;
 extern ActionMenuItem menuSettingsCalibrateNow;

src/RuntimeMenuItem.cpp

@@ -35,7 +35,7 @@ RuntimeMenuItem::RuntimeMenuItem(const AnyMenuInfo* rtInfo, bool isPgm, MenuType
 int defaultRtListCallback(RuntimeMenuItem* item, uint8_t row, RenderFnMode mode, char* buffer, int bufferSize) {
     switch(mode) {
         case RENDERFN_INVOKE:
-            item->runCallback();
+            // we must never call the invoke function on MenuItem from here
             return true;
         case RENDERFN_NAME:
             if(row != LIST_PARENT_ITEM_POS) {
@@ -102,8 +102,7 @@ RuntimeMenuItem *ListRuntimeMenuItem::asParent() {
 
 RuntimeMenuItem *ListRuntimeMenuItem::asBackMenu() {
     if(activeItem == 0) {
-        // the title is active.
-        renderFn(this, 0, RENDERFN_ACTIVATE, nullptr, 0);
+        runCallback();
     }
     menuType = MENUTYPE_BACK_VALUE;
     itemPosition = LIST_PARENT_ITEM_POS;

src/graphics/MenuTouchScreenEncoder.cpp

@@ -78,13 +78,11 @@ void MenuTouchScreenEncoder::touched(const TouchNotification &evt) {
             auto menuType = theItem->getMenuType();
             auto held = evt.getTouchState() == HELD;
             bool showingTheList = menuMgr.getCurrentMenu() == theItem;
-            if(theItem->getMenuType() == MENUTYPE_RUNTIME_LIST && showingTheList) {
+            if(menuType == MENUTYPE_RUNTIME_LIST && showingTheList) {
                 auto* listItem = reinterpret_cast<ListRuntimeMenuItem*>(theItem);
                 int row = evt.getEntry()->getPosition().getRow();
                 if(row == 0) {
-                    listItem->asBackMenu();
                     menuMgr.onMenuSelect(false);
-                    listItem->asParent();
                 }
                 else {
                     listItem->setActiveIndex(row - 1);