examples rebuilt on latest code

Author: davetcc

examples/analogDfRobot/analogDfRobot.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1599491778,
+    "seconds": 1603018679,
     "nanos": 0
   },
   "codeOptions": {
@@ -12,6 +12,7 @@
     "embeddedPlatform": "ARDUINO_UNO",
     "namingRecursive": false,
     "saveToSrc": false,
+    "useCppMain": false,
     "lastProperties": []
   },
   "projectName": "Uses the DF Robot shield for both input and display",
@@ -104,6 +105,23 @@
         "textLength": 6
       }
     },
+    {
+      "parentId": 0,
+      "type": "scrollItem",
+      "item": {
+        "name": "Choose Item",
+        "eepromAddress": 18,
+        "id": 8,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "itemWidth": 10,
+        "numEntries": 20,
+        "variable": null,
+        "eepromOffset": 0,
+        "choiceMode": "CUSTOM_RENDERFN"
+      }
+    },
     {
       "parentId": 0,
       "type": "analogItem",

examples/analogDfRobot/analogDfRobot.ino

@@ -43,3 +43,25 @@ void CALLBACK_FUNCTION onLed2(int id) {
     // Called whenever you change the LED2 menu item..
 }
 
+
+// When dealing with custom rendering, either using lists or custom choices, we have to do everything from scratch. We need
+// to handle the EEPROM storage location, the item name, the value etc.
+// see tcMenu list documentation on thecoderscorner.com
+int CALLBACK_FUNCTION fnChooseItemRtCall(RuntimeMenuItem * item, uint8_t row, RenderFnMode mode, char * buffer, int bufferSize) {
+   switch(mode) {
+    case RENDERFN_INVOKE:
+        // we don't want to do anything on a selection, ignore it.
+        return true;
+    case RENDERFN_NAME:
+        // here we return the name for the scroll item        
+        strcpy(buffer, "Choose");
+        return true;
+    case RENDERFN_VALUE:
+        // here we define the text value for each possible setting, we just set it to V followed by the row
+        buffer[0] = 'V'; buffer[1]=0;
+        fastltoa(buffer, row, 3, NOT_PADDED, bufferSize);
+        return true;
+    case RENDERFN_EEPROM_POS: return 18; // Choices are saved to rom, we copy the value from the designer. 
+    default: return false;
+    }
+}

examples/analogDfRobot/analogDfRobot_menu.cpp

@@ -22,8 +22,9 @@ LiquidCrystalRenderer renderer(lcd, 16, 2);
 
 const AnalogMenuInfo PROGMEM minfoCommits = { "Commits", 7, 0xFFFF, 65000, NO_CALLBACK, 0, 0, "" };
 AnalogMenuItem menuCommits(&minfoCommits, 0, NULL);
+ScrollChoiceMenuItem menuChooseItem(8, fnChooseItemRtCall, 0, 20, &menuCommits);
 RENDERING_CALLBACK_NAME_INVOKE(fnTextRtCall, textItemRenderFn, "Text", 4, NO_CALLBACK)
-TextMenuItem menuText(fnTextRtCall, 6, 6, &menuCommits);
+TextMenuItem menuText(fnTextRtCall, 6, 6, &menuChooseItem);
 RENDERING_CALLBACK_NAME_INVOKE(fnLgeNumRtCall, largeNumItemRenderFn, "LgeNum", 10, NO_CALLBACK)
 EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, 5, 8, 4, &menuText);
 const BooleanMenuInfo PROGMEM minfoLED2 = { "LED 2", 4, 3, 1, onLed2, NAMING_ON_OFF };

examples/analogDfRobot/analogDfRobot_menu.h

@@ -17,6 +17,7 @@
 #include <LiquidCrystalIO.h>
 #include "tcMenuLiquidCrystal.h"
 #include <DfRobotInputAbstraction.h>
+#include <ScrollChoiceMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
 
 void setupMenu();  // forward reference of the menu setup function.
@@ -33,6 +34,8 @@ extern LiquidCrystalRenderer renderer;
 // Global Menu Item exports
 
 extern AnalogMenuItem menuCommits;
+int fnChooseItemRtCall(RuntimeMenuItem * item, uint8_t row, RenderFnMode mode, char * buffer, int bufferSize);
+extern ScrollChoiceMenuItem menuChooseItem;
 extern TextMenuItem menuText;
 extern EditableLargeNumberMenuItem menuLgeNum;
 void CALLBACK_FUNCTION onLed2(int id);

examples/analogDfRobot/tcMenuLiquidCrystal.cpp

@@ -13,6 +13,7 @@
  */
 
 #include "tcMenuLiquidCrystal.h"
+#include "tcUtil.h"
 
 extern const ConnectorLocalInfo applicationInfo;
 
@@ -35,7 +36,7 @@ void LiquidCrystalRenderer::initialise() {
         serdebugF2("Title widget present max=", wid->getMaxValue());
         for(int i = 0; i < wid->getMaxValue(); i++) {
             serdebugF2("Creating char ", charNo);
-            lcd->createCharPgm((byte)charNo, wid->getIcon(i));
+            lcd->createCharPgm((uint8_t)charNo, wid->getIcon(i));
             charNo++;
         }
         wid = wid->getNext();
@@ -81,7 +82,7 @@ void LiquidCrystalRenderer::renderTitle(bool forceDraw) {
         strcpy_P(buffer, applicationInfo.name);
         serdebugF2("print app name", buffer);
         uint8_t bufSz = bufferSize;
-        uint8_t last = min(bufSz, strlen(buffer));
+        uint8_t last = min(bufSz, (uint8_t)strlen(buffer));
         for(uint8_t i = last; i < bufSz; i++) {
             buffer[i] = ' ';
         }

examples/esp8266WifiOled/Greenhouse.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1601464775,
+    "seconds": 1603022031,
     "nanos": 0
   },
   "codeOptions": {
@@ -229,6 +229,37 @@
         "naming": "TRUE_FALSE"
       }
     },
+    {
+      "parentId": 5,
+      "type": "scrollItem",
+      "item": {
+        "name": "File",
+        "eepromAddress": -1,
+        "id": 14,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "functionName": "onFileChoice",
+        "itemWidth": 10,
+        "numEntries": 1,
+        "variable": "fileChoicesArray",
+        "eepromOffset": 200,
+        "choiceMode": "ARRAY_IN_RAM"
+      }
+    },
+    {
+      "parentId": 5,
+      "type": "actionMenu",
+      "item": {
+        "name": "Load Files",
+        "eepromAddress": -1,
+        "id": 15,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "functionName": "onLoadFiles"
+      }
+    },
     {
       "parentId": 0,
       "type": "subMenu",

examples/esp8266WifiOled/esp8266WifiOled.ino

@@ -24,6 +24,7 @@
 // contains the graphical widget title components.
 #include "stockIcons/wifiAndConnectionIcons16x12.h"
 
+char fileChoicesArray[255]{};
 
 // here we define the heater and window pins on the PCF8574
 // 0, 1 are A and B from encoder, 2 is OK button.
@@ -286,22 +287,19 @@ void CALLBACK_FUNCTION onSaveAll(int id) {
 
 }
 
+void CALLBACK_FUNCTION onFileChoice(int id) {
+    Serial.print("file chosen: ");
+    auto entryNum = menuFile.getCurrentValue();
+    char sz[12];
+    menuFile.valueAtPosition(sz, sizeof(sz), entryNum);
+    Serial.println(sz);
+}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+void CALLBACK_FUNCTION onLoadFiles(int id) {
+    strcpy(fileChoicesArray, "MyDocument");
+    strcpy(&fileChoicesArray[10], "SecretFile");
+    strcpy(&fileChoicesArray[20], "AnotherFle");
+    strcpy(&fileChoicesArray[30], "MenuItem");
+    strcpy(&fileChoicesArray[40], "MyDocument");
+    menuFile.setNumberOfRows(5);
+}

examples/esp8266WifiOled/esp8266WifiOled_menu.cpp

@@ -32,8 +32,13 @@ const SubMenuInfo PROGMEM minfoConnectivity = { "Connectivity", 9, 0xFFFF, 0, NO
 RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
 BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuSSID);
 SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, NULL);
+const AnyMenuInfo PROGMEM minfoLoadFiles = { "Load Files", 15, 0xFFFF, 0, onLoadFiles };
+ActionMenuItem menuLoadFiles(&minfoLoadFiles, NULL);
+extern const char* fileChoicesArray;
+RENDERING_CALLBACK_NAME_INVOKE(fnFileRtCall, enumItemRenderFn, "File", -1, onFileChoice)
+ScrollChoiceMenuItem menuFile(14, fnFileRtCall, 0, fileChoicesArray, 10, 1, &menuLoadFiles);
 const BooleanMenuInfo PROGMEM minfoSecretEntry = { "Secret Entry", 13, 0xFFFF, 1, NO_CALLBACK, NAMING_TRUE_FALSE };
-BooleanMenuItem menuSecretEntry(&minfoSecretEntry, false, NULL);
+BooleanMenuItem menuSecretEntry(&minfoSecretEntry, false, &menuFile);
 const AnyMenuInfo PROGMEM minfoSaveAll = { "Save All", 8, 0xFFFF, 0, onSaveAll };
 ActionMenuItem menuSaveAll(&minfoSaveAll, &menuSecretEntry);
 const char enumStrWinOpening_0[] PROGMEM  = "NARROW";

examples/esp8266WifiOled/esp8266WifiOled_menu.h

@@ -17,6 +17,7 @@
 #include "tcMenuU8g2.h"
 #include "EthernetTransport.h"
 #include <RemoteConnector.h>
+#include <ScrollChoiceMenuItem.h>
 
 void setupMenu();  // forward reference of the menu setup function.
 extern const PROGMEM ConnectorLocalInfo applicationInfo;  // defines the app info to the linker.
@@ -37,6 +38,10 @@ extern IpAddressMenuItem menuIpAddress;
 extern TextMenuItem menuPwd;
 extern TextMenuItem menuSSID;
 extern SubMenuItem menuConnectivity;
+void CALLBACK_FUNCTION onLoadFiles(int id);
+extern ActionMenuItem menuLoadFiles;
+void CALLBACK_FUNCTION onFileChoice(int id);
+extern ScrollChoiceMenuItem menuFile;
 extern BooleanMenuItem menuSecretEntry;
 void CALLBACK_FUNCTION onSaveAll(int id);
 extern ActionMenuItem menuSaveAll;