Interim update of the examples

dave · dave · commit 10ecbcd8aa70 · 2026-01-18T09:41:24.000Z
diff --git a/examples/esp/esp32s2Saola/esp32s2Saola.emf b/examples/esp/esp32s2Saola/esp32s2Saola.emf
@@ -3,6 +3,21 @@
   "projectName": "eInk demonstration with digital joystick",
   "author": "dave",
   "items": [
+    {
+      "parentId": 0,
+      "type": "actionMenu",
+      "item": {
+        "name": "Hibernate",
+        "variableName": "Hibernate",
+        "id": 21,
+        "eepromAddress": -1,
+        "functionName": "onHibernate",
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "staticDataInRAM": false
+      }
+    },
     {
       "parentId": 0,
       "type": "analogItem",
@@ -100,85 +115,6 @@
         "staticDataInRAM": false
       }
     },
-    {
-      "parentId": 0,
-      "type": "subMenu",
-      "item": {
-        "secured": false,
-        "name": "Hibernate",
-        "variableName": "Hibernate",
-        "id": 6,
-        "eepromAddress": -1,
-        "functionName": "onHibernate",
-        "readOnly": false,
-        "localOnly": false,
-        "visible": true,
-        "staticDataInRAM": false
-      }
-    },
-    {
-      "parentId": 6,
-      "type": "floatItem",
-      "defaultValue": "0.0",
-      "item": {
-        "numDecimalPlaces": 3,
-        "name": "Float 1",
-        "variableName": "SelectMeFloat1",
-        "id": 7,
-        "eepromAddress": -1,
-        "readOnly": false,
-        "localOnly": false,
-        "visible": true,
-        "staticDataInRAM": false
-      }
-    },
-    {
-      "parentId": 6,
-      "type": "floatItem",
-      "defaultValue": "0.0",
-      "item": {
-        "numDecimalPlaces": 3,
-        "name": "Float 2",
-        "variableName": "SelectMeFloat2",
-        "id": 8,
-        "eepromAddress": -1,
-        "readOnly": false,
-        "localOnly": false,
-        "visible": true,
-        "staticDataInRAM": false
-      }
-    },
-    {
-      "parentId": 6,
-      "type": "actionMenu",
-      "item": {
-        "name": "Press Me",
-        "variableName": "SelectMePressMe",
-        "id": 9,
-        "eepromAddress": -1,
-        "functionName": "pressMeActionRun",
-        "readOnly": false,
-        "localOnly": false,
-        "visible": true,
-        "staticDataInRAM": false
-      }
-    },
-    {
-      "parentId": 6,
-      "type": "boolItem",
-      "defaultValue": "true",
-      "item": {
-        "naming": "CHECKBOX",
-        "name": "New BoolItem",
-        "variableName": "SelectMeNewBoolItem",
-        "id": 21,
-        "eepromAddress": -1,
-        "readOnly": false,
-        "localOnly": false,
-        "visible": true,
-        "staticDataInRAM": false
-      }
-    },
     {
       "parentId": 0,
       "type": "subMenu",
diff --git a/examples/esp/esp32s2Saola/esp32s2Saola_menu.cpp b/examples/esp/esp32s2Saola/esp32s2Saola_menu.cpp
@@ -8,7 +8,7 @@
     use elsewhere.
  */
 
-// Generated for Arduino ESP32 by TcMenu 4.5.0 on 2026-01-17T20:35:55.954392Z.
+// Generated for Arduino ESP32 by TcMenu 4.5.0 on 2026-01-18T09:39:52.216322Z.
 
 #include <tcMenu.h>
 #include "esp32s2Saola_menu.h"
@@ -55,19 +55,8 @@ TextMenuItem menuExtrasText(&minfoExtrasText, "", 5, &menuExtrasColor, INFO_LOCA
 const PROGMEM SubMenuInfo minfoExtras = { "Extras", 10, 0xffff, 0, NO_CALLBACK };
 BackMenuItem menuBackExtras(&minfoExtras, &menuExtrasText, INFO_LOCATION_PGM);
 SubMenuItem menuExtras(&minfoExtras, &menuBackExtras, &menuConnectivity, INFO_LOCATION_PGM);
-const PROGMEM BooleanMenuInfo minfoSelectMeNewBoolItem = { "New BoolItem", 21, 0xffff, 1, NO_CALLBACK, NAMING_CHECKBOX };
-BooleanMenuItem menuSelectMeNewBoolItem(&minfoSelectMeNewBoolItem, true, nullptr, INFO_LOCATION_PGM);
-const PROGMEM AnyMenuInfo minfoSelectMePressMe = { "Press Me", 9, 0xffff, 0, pressMeActionRun };
-ActionMenuItem menuSelectMePressMe(&minfoSelectMePressMe, &menuSelectMeNewBoolItem, INFO_LOCATION_PGM);
-const PROGMEM FloatMenuInfo minfoSelectMeFloat2 = { "Float 2", 8, 0xffff, 3, NO_CALLBACK };
-FloatMenuItem menuSelectMeFloat2(&minfoSelectMeFloat2, 0.0, &menuSelectMePressMe, INFO_LOCATION_PGM);
-const PROGMEM FloatMenuInfo minfoSelectMeFloat1 = { "Float 1", 7, 0xffff, 3, NO_CALLBACK };
-FloatMenuItem menuSelectMeFloat1(&minfoSelectMeFloat1, 0.0, &menuSelectMeFloat2, INFO_LOCATION_PGM);
-const PROGMEM SubMenuInfo minfoHibernate = { "Hibernate", 6, 0xffff, 0, onHibernate };
-BackMenuItem menuBackHibernate(&minfoHibernate, &menuSelectMeFloat1, INFO_LOCATION_PGM);
-SubMenuItem menuHibernate(&minfoHibernate, &menuBackHibernate, &menuExtras, INFO_LOCATION_PGM);
 const PROGMEM BooleanMenuInfo minfoDoorOpen = { "Door Open", 5, 10, 1, NO_CALLBACK, NAMING_YES_NO };
-BooleanMenuItem menuDoorOpen(&minfoDoorOpen, false, &menuHibernate, INFO_LOCATION_PGM);
+BooleanMenuItem menuDoorOpen(&minfoDoorOpen, false, &menuExtras, INFO_LOCATION_PGM);
 const char enumStrFoods_0[] PROGMEM = "Pizza";
 const char enumStrFoods_1[] PROGMEM = "Pasta";
 const char enumStrFoods_2[] PROGMEM = "Salad";
@@ -81,6 +70,8 @@ const PROGMEM AnalogMenuInfo minfoDecEdit = { "Dec Edit", 2, 4, 1000, NO_CALLBAC
 AnalogMenuItem menuDecEdit(&minfoDecEdit, 0, &menuHalves, INFO_LOCATION_PGM);
 const PROGMEM AnalogMenuInfo minfoIntEdit = { "Int Edit", 1, 2, 100, NO_CALLBACK, 0, 1, "%" };
 AnalogMenuItem menuIntEdit(&minfoIntEdit, 0, &menuDecEdit, INFO_LOCATION_PGM);
+const PROGMEM AnyMenuInfo minfoHibernate = { "Hibernate", 21, 0xffff, 0, onHibernate };
+ActionMenuItem menuHibernate(&minfoHibernate, &menuIntEdit, INFO_LOCATION_PGM);
 
 void setupMenu() {
     // First we set up eeprom and authentication (if needed).
@@ -90,15 +81,15 @@ void setupMenu() {
     authManager.initialise(menuMgr.getEepromAbstraction(), 200);
     menuMgr.setAuthenticator(&authManager);
     // Now add any readonly, non-remote and visible flags.
-    menuConnectivityAuthenticator.setLocalOnly(true);
     menuConnectivityIoTMonitor.setLocalOnly(true);
+    menuConnectivityAuthenticator.setLocalOnly(true);
 
     // Code generated by plugins and new operators.
     display.init(115200, true, 10, false);
     display.setRotation(0);
     renderer.setUpdatesPerSecond(1);
     switches.init(internalDigitalIo(), SWITCHES_POLL_EVERYTHING, true);
-    menuMgr.initFor4WayJoystick(&renderer, &menuIntEdit, 2, 1, 3, 4, -1, 20);
+    menuMgr.initFor4WayJoystick(&renderer, &menuHibernate, 2, 1, 3, 4, -1, 20);
     remoteServer.addConnection(&ethernetConnection);
     applyTheme(renderer);
 
diff --git a/examples/esp/esp32s2Saola/esp32s2Saola_menu.h b/examples/esp/esp32s2Saola/esp32s2Saola_menu.h
@@ -51,20 +51,15 @@ extern Rgb32MenuItem menuExtrasColor;
 extern TextMenuItem menuExtrasText;
 extern BackMenuItem menuBackExtras;
 extern SubMenuItem menuExtras;
-extern BooleanMenuItem menuSelectMeNewBoolItem;
-extern ActionMenuItem menuSelectMePressMe;
-extern FloatMenuItem menuSelectMeFloat2;
-extern FloatMenuItem menuSelectMeFloat1;
-extern BackMenuItem menuBackHibernate;
-extern SubMenuItem menuHibernate;
 extern BooleanMenuItem menuDoorOpen;
 extern EnumMenuItem menuFoods;
 extern AnalogMenuItem menuHalves;
 extern AnalogMenuItem menuDecEdit;
 extern AnalogMenuItem menuIntEdit;
+extern ActionMenuItem menuHibernate;
 
 // Provide a wrapper to get hold of the root menu item and export setupMenu
-inline MenuItem& rootMenuItem() { return menuIntEdit; }
+inline MenuItem& rootMenuItem() { return menuHibernate; }
 void setupMenu();
 
 // Callback functions must always include CALLBACK_FUNCTION after the return type
@@ -73,6 +68,5 @@ void setupMenu();
 void CALLBACK_FUNCTION onListSelected(int id);
 int fnExtrasMyListRtCall(RuntimeMenuItem* item, uint8_t row, RenderFnMode mode, char* buffer, int bufferSize);
 void CALLBACK_FUNCTION onHibernate(int id);
-void CALLBACK_FUNCTION pressMeActionRun(int id);
 
 #endif // MENU_GENERATED_CODE_H
