Update examples ready for TcMenu 1.7

Author: dave

examples/colorTftEthernet32/colorTftEthernet.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1602516900,
+    "seconds": 1603533153,
     "nanos": 0
   },
   "codeOptions": {
@@ -96,7 +96,7 @@
       },
       {
         "name": "DISPLAY_ROTATION",
-        "latestValue": "0",
+        "latestValue": "1",
         "subsystem": "DISPLAY"
       },
       {
@@ -257,58 +257,17 @@
       }
     },
     {
-      "parentId": 4,
-      "type": "",
-      "item": null
-    },
-    {
-      "parentId": 4,
-      "type": "",
-      "item": null
-    },
-    {
-      "parentId": 4,
-      "type": "subMenu",
-      "item": {
-        "name": "Rom Values",
-        "eepromAddress": -1,
-        "id": 20,
-        "readOnly": false,
-        "localOnly": false,
-        "visible": true,
-        "secured": false
-      }
-    },
-    {
-      "parentId": 20,
-      "type": "",
-      "item": null
-    },
-    {
-      "parentId": 20,
-      "type": "textItem",
-      "item": {
-        "name": "Item Text",
-        "eepromAddress": -1,
-        "id": 21,
-        "readOnly": false,
-        "localOnly": false,
-        "visible": true,
-        "itemType": "PLAIN_TEXT",
-        "textLength": 10
-      }
-    },
-    {
-      "parentId": 20,
-      "type": "actionMenu",
+      "parentId": 11,
+      "type": "rgbItem",
       "item": {
-        "name": "Save item",
-        "eepromAddress": -1,
-        "id": 23,
+        "name": "RGB",
+        "eepromAddress": 16,
+        "id": 26,
         "readOnly": false,
         "localOnly": false,
         "visible": true,
-        "functionName": "onSaveItem"
+        "functionName": "onRgbChanged",
+        "includeAlphaChannel": false
       }
     },
     {
@@ -377,6 +336,82 @@
         "textLength": 20
       }
     },
+    {
+      "parentId": 0,
+      "type": "subMenu",
+      "item": {
+        "name": "Rom Values",
+        "eepromAddress": -1,
+        "id": 20,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "functionName": "",
+        "secured": false
+      }
+    },
+    {
+      "parentId": 20,
+      "type": "scrollItem",
+      "item": {
+        "name": "Rom Choice",
+        "eepromAddress": 14,
+        "id": 25,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "itemWidth": 10,
+        "numEntries": 10,
+        "variable": null,
+        "eepromOffset": 1024,
+        "choiceMode": "ARRAY_IN_EEPROM"
+      }
+    },
+    {
+      "parentId": 20,
+      "type": "scrollItem",
+      "item": {
+        "name": "Rom Location",
+        "eepromAddress": -1,
+        "id": 24,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "functionName": "",
+        "itemWidth": 10,
+        "numEntries": 10,
+        "variable": null,
+        "eepromOffset": 0,
+        "choiceMode": "CUSTOM_RENDERFN"
+      }
+    },
+    {
+      "parentId": 20,
+      "type": "textItem",
+      "item": {
+        "name": "Rom Text",
+        "eepromAddress": -1,
+        "id": 21,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "itemType": "PLAIN_TEXT",
+        "textLength": 10
+      }
+    },
+    {
+      "parentId": 20,
+      "type": "actionMenu",
+      "item": {
+        "name": "Save item",
+        "eepromAddress": -1,
+        "id": 23,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "functionName": "onSaveItem"
+      }
+    },
     {
       "parentId": 0,
       "type": "actionMenu",

examples/colorTftEthernet32/colorTftEthernet32.ino

@@ -7,12 +7,13 @@
 #include <Fonts/FreeSans9pt7b.h>
 #include <Ethernet.h>
 #include <SPI.h>
+#include <IoLogging.h>
 
 // contains the graphical widget title components.
 #include "stockIcons/wifiAndConnectionIcons16x12.h"
 
 /*
- * Shows how to use adagraphics with a TFT panel and an ethernet module.
+ * Shows how to use adafruit graphics with a TFT panel and an ethernet module.
  * This is a 32 bit example, which by default targets 32 bit devices.
  * Assumed board for this is a SAMD based MKR board.
  * 
@@ -44,7 +45,7 @@ IoAbstractionRef io8574 = ioFrom8574(0x20, 0); // on addr 0x20 and interrupt pin
 ArduinoAnalogDevice analogDevice(12, 10);
 
 // Here we create two additional menus, that will be added manually to handle the connectivity
-// status and authentication keys. In a future version these will be added to th desinger.
+// status and authentication keys. In a future version these will be added to th designer.
 RemoteMenuItem menuRemoteMonitor(1001, 2);
 EepromAuthenicationInfoMenuItem menuAuthKeyMgr(1002, &authManager, &menuRemoteMonitor);
 
@@ -87,7 +88,7 @@ void prepareCustomConfiguration() {
     //colorConfig.editIcon = myEditIcon;
     //colorConfig.activeIcon = myActiveIcon;
     //colorConfig.editIconWidth = myEditWidth;
-    //colorConfig.editIconHeight = myEditheight;
+    //colorConfig.editIconHeight = myEditHeight;
     colorConfig.editIcon = NULL;
     colorConfig.activeIcon = NULL;
 }
@@ -105,6 +106,9 @@ void setup() {
     // we used an i2c device (io8574) so must initialise wire too
     Wire.begin();
 
+    // We should set the eeprom that menu manager will use as early as possible
+    menuMgr.setEepromRef(&eeprom);
+
     // now we enable authentication using EEPROM authentication. Where the EEPROM is
     // queried for authentication requests, and any additional pairs are stored there too.
     // first we initialise the authManager, then pass it to the class.
@@ -140,7 +144,7 @@ void setup() {
     setupMenu();
 
     // and then load back the previous state
-    menuMgr.load(eeprom);
+    menuMgr.load();
 
     // spin up the Ethernet library
     byte* rawIp = menuIpAddress.getIpAddress();
@@ -152,7 +156,6 @@ void setup() {
     Serial.print("Ethernet available on ");Serial.println(sz);
 
     taskManager.scheduleFixedRate(2250, [] {
-        Serial.print(".");
         float a1Value = analogDevice.getCurrentFloat(A1);
         menuVoltA1.setFloatValue(a1Value * 3.3);
     });
@@ -185,11 +188,13 @@ void CALLBACK_FUNCTION onLimitMode(int /*id*/) {
 
 void CALLBACK_FUNCTION onSaveRom(int /*id*/) {
     // save out the state, in a real system we could detect power down for this.
-    menuMgr.save(eeprom);
+    menuMgr.save();
 }
 
 bool starting = true;
 
+const char pgmHeaderSavedItem[] PROGMEM = "Rom Item Saved";
+
 void myRenderCallback(unsigned int encoderVal, RenderPressMode pressType) {
     if(pressType == RPRESS_HELD)
     {
@@ -219,15 +224,57 @@ void myRenderCallback(unsigned int encoderVal, RenderPressMode pressType) {
     }
 }
 
-void CALLBACK_FUNCTION onTakeDisplay(int id) {
+void CALLBACK_FUNCTION onTakeDisplay(int /*id*/) {
     starting = true;
     renderer.takeOverDisplay(myRenderCallback);
 }
 
-void CALLBACK_FUNCTION onRgbChanged(int id) {
-    // TODO - your menu change code
+void CALLBACK_FUNCTION onRgbChanged(int /*id*/) {
+    auto colorData = menuRGB.getColorData();
+    serdebugF4("RGB changed: ", colorData.red, colorData.green, colorData.blue);
 }
 
-void CALLBACK_FUNCTION onSaveItem(int id) {
-    // TODO - your menu change code
+void CALLBACK_FUNCTION onSaveItem(int /*id*/) {
+    auto itemNo = menuRomLocation.getCurrentValue();
+    auto itemSize = menuRomChoice.getItemWidth();
+    auto position = menuRomChoice.getEepromStart() + (itemNo * itemSize);
+    eeprom.writeArrayToRom(position, (const uint8_t*)menuRomText.getTextValue(), 10);
+
+    if(renderer.getDialog()->isInUse()) return;
+    renderer.getDialog()->setButtons(BTNTYPE_NONE, BTNTYPE_OK);
+    renderer.getDialog()->show(pgmHeaderSavedItem, true);
+    renderer.getDialog()->copyIntoBuffer(menuRomText.getTextValue());
+}
+
+void CALLBACK_FUNCTION onRomLocationChange(int /*id*/) {
+    auto itemNo = menuRomLocation.getCurrentValue();
+    char sz[12];
+    auto itemSize = menuRomChoice.getItemWidth();
+    eeprom.readIntoMemArray((uint8_t*)sz, menuRomChoice.getEepromStart() + (itemNo * itemSize), 10);
+    menuRomText.setTextValue(sz);
+    serdebugF2("Rom data was ", sz)
+}
+
+//
+// Here we handle the custom rendering for the runtime list menu item that just counts. We basically get called back
+// every time it needs more data. For example when the name is required, when any index value is required or when
+// it will be saved to EEPROM or invoked.
+//
+int CALLBACK_FUNCTION fnRomLocationRtCall(RuntimeMenuItem * item, uint8_t row, RenderFnMode mode, char * buffer, int bufferSize) {
+   switch(mode) {
+    case RENDERFN_INVOKE:
+        onRomLocationChange(item->getId());
+        return true;
+    case RENDERFN_NAME:
+        // TODO - each row has it's own name - 0xff is the parent item
+        strncpy(buffer, "Rom Location", bufferSize);
+        return true;
+    case RENDERFN_VALUE:
+        // TODO - each row can has its own value - 0xff is the parent item
+        strncpy(buffer, "Item ", bufferSize);
+        fastltoa(buffer, row, 3, NOT_PADDED, bufferSize);
+        return true;
+    case RENDERFN_EEPROM_POS: return 0xFFFF; // lists are generally not saved to EEPROM
+    default: return false;
+    }
 }

examples/colorTftEthernet32/colorTftEthernet32.ino.backup

@@ -223,3 +223,19 @@ void CALLBACK_FUNCTION onTakeDisplay(int id) {
     starting = true;
     renderer.takeOverDisplay(myRenderCallback);
 }
+
+void CALLBACK_FUNCTION onRgbChanged(int id) {
+    // TODO - your menu change code
+}
+
+void CALLBACK_FUNCTION onRomValuesSubOpen(int id) {
+    // TODO - your menu change code
+}
+
+void CALLBACK_FUNCTION onSaveItem(int id) {
+    // TODO - your menu change code
+}
+
+void CALLBACK_FUNCTION onRomLocationChange(int id) {
+}
+

examples/colorTftEthernet32/colorTftEthernet32_menu.cpp

@@ -23,12 +23,23 @@ EthernetServer server(3333);
 
 const AnyMenuInfo minfoTakeDisplay = { "Take display", 17, 0xFFFF, 0, onTakeDisplay };
 ActionMenuItem menuTakeDisplay(&minfoTakeDisplay, NULL);
+const AnyMenuInfo minfoSaveItem = { "Save item", 23, 0xFFFF, 0, onSaveItem };
+ActionMenuItem menuSaveItem(&minfoSaveItem, NULL);
+RENDERING_CALLBACK_NAME_INVOKE(fnRomTextRtCall, textItemRenderFn, "Rom Text", -1, NO_CALLBACK)
+TextMenuItem menuRomText(fnRomTextRtCall, 21, 10, &menuSaveItem);
+ScrollChoiceMenuItem menuRomLocation(24, fnRomLocationRtCall, 0, 10, &menuRomText);
+RENDERING_CALLBACK_NAME_INVOKE(fnRomChoiceRtCall, enumItemRenderFn, "Rom Choice", 14, NO_CALLBACK)
+ScrollChoiceMenuItem menuRomChoice(25, fnRomChoiceRtCall, 0, 1024, 10, 10, &menuRomLocation);
+const SubMenuInfo minfoRomValues = { "Rom Values", 20, 0xFFFF, 0, NO_CALLBACK };
+RENDERING_CALLBACK_NAME_INVOKE(fnRomValuesRtCall, backSubItemRenderFn, "Rom Values", -1, NO_CALLBACK)
+BackMenuItem menuBackRomValues(fnRomValuesRtCall, &menuRomChoice);
+SubMenuItem menuRomValues(&minfoRomValues, &menuBackRomValues, &menuTakeDisplay);
 RENDERING_CALLBACK_NAME_INVOKE(fnIpAddressRtCall, ipAddressRenderFn, "Ip Address", 10, NO_CALLBACK)
 IpAddressMenuItem menuIpAddress(fnIpAddressRtCall, 15, NULL);
 const SubMenuInfo minfoConnectivity = { "Connectivity", 14, 0xFFFF, 0, NO_CALLBACK };
 RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
 BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuIpAddress);
-SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, &menuTakeDisplay);
+SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, &menuRomValues);
 const FloatMenuInfo minfoVoltA1 = { "Volt A1", 9, 0xFFFF, 2, NO_CALLBACK };
 FloatMenuItem menuVoltA1(&minfoVoltA1, NULL);
 const FloatMenuInfo minfoVoltA0 = { "Volt A0", 8, 0xFFFF, 2, NO_CALLBACK };
@@ -37,24 +48,18 @@ const SubMenuInfo minfoStatus = { "Status", 7, 0xFFFF, 0, NO_CALLBACK };
 RENDERING_CALLBACK_NAME_INVOKE(fnStatusRtCall, backSubItemRenderFn, "Status", -1, NO_CALLBACK)
 BackMenuItem menuBackStatus(fnStatusRtCall, &menuVoltA0);
 SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuConnectivity);
-const AnyMenuInfo minfoSaveItem = { "Save item", 23, 0xFFFF, 0, onSaveItem };
-ActionMenuItem menuSaveItem(&minfoSaveItem, NULL);
-RENDERING_CALLBACK_NAME_INVOKE(fnItemTextRtCall, textItemRenderFn, "Item Text", -1, NO_CALLBACK)
-TextMenuItem menuItemText(fnItemTextRtCall, 21, 10, &menuSaveItem);
-const SubMenuInfo minfoRomValues = { "Rom Values", 20, 0xFFFF, 0, NO_CALLBACK };
-RENDERING_CALLBACK_NAME_INVOKE(fnRomValuesRtCall, backSubItemRenderFn, "Rom Values", -1, NO_CALLBACK)
-BackMenuItem menuBackRomValues(fnRomValuesRtCall, &menuItemNo);
-SubMenuItem menuRomValues(&minfoRomValues, &menuBackRomValues, NULL);
+RENDERING_CALLBACK_NAME_INVOKE(fnRGBRtCall, rgbAlphaItemRenderFn, "RGB", 16, onRgbChanged)
+Rgb32MenuItem menuRGB(26, fnRGBRtCall, false,NULL);
 const BooleanMenuInfo minfoTempCheck = { "Temp Check", 13, 9, 1, NO_CALLBACK, NAMING_ON_OFF };
-BooleanMenuItem menuTempCheck(&minfoTempCheck, false, NULL);
+BooleanMenuItem menuTempCheck(&minfoTempCheck, false, &menuRGB);
 const AnyMenuInfo minfoHiddenItem = { "Hidden item", 16, 0xFFFF, 0, NO_CALLBACK };
 ActionMenuItem menuHiddenItem(&minfoHiddenItem, &menuTempCheck);
 const BooleanMenuInfo minfoSCircuitProtect = { "S-Circuit Protect", 12, 8, 1, NO_CALLBACK, NAMING_ON_OFF };
 BooleanMenuItem menuSCircuitProtect(&minfoSCircuitProtect, false, &menuHiddenItem);
 const SubMenuInfo minfoAdvanced = { "Advanced", 11, 0xFFFF, 0, NO_CALLBACK };
 RENDERING_CALLBACK_NAME_INVOKE(fnAdvancedRtCall, backSubItemRenderFn, "Advanced", -1, NO_CALLBACK)
 BackMenuItem menuBackAdvanced(fnAdvancedRtCall, &menuSCircuitProtect);
-SubMenuItem menuAdvanced(&minfoAdvanced, &menuBackAdvanced, &menuRGB);
+SubMenuItem menuAdvanced(&minfoAdvanced, &menuBackAdvanced, NULL);
 const AnyMenuInfo minfoSaveAll = { "Save all", 10, 0xFFFF, 0, onSaveRom };
 ActionMenuItem menuSaveAll(&minfoSaveAll, &menuAdvanced);
 const BooleanMenuInfo minfoPwrDelay = { "Pwr Delay", 5, 0xFFFF, 1, NO_CALLBACK, NAMING_YES_NO };
@@ -80,7 +85,7 @@ void setupMenu() {
 
 
     gfx.initR(INITR_BLACKTAB);
-    gfx.setRotation(0);
+    gfx.setRotation(1);
     renderer.setGraphicsDevice(&gfx, &colorConfig);
     switches.initialise(io8574, true);
     menuMgr.initForEncoder(&renderer, &menuVoltage, 7, 6, 5);