#103 examples recompiled with designer 2.1, remove the legacy and out of date renderers, minor fix

Author: dave

examples/colorTftEthernet32/colorTftEthernet.emf

@@ -2,11 +2,6 @@
   "version": "1.00",
   "projectName": "/Users/dave/Documents/Arduino/tcLibraryDev/lib/tcMenu/examples/colorTftEthernet32/colorTftEthernet.emf",
   "author": "dave",
-  "lastEdited": {
-    "seconds": 1617353180,
-    "nanos": 147621000
-  },
-  "namingRecursive": false,
   "items": [
     {
       "parentId": 0,

examples/colorTftEthernet32/colorTftEthernet32.ino

@@ -267,15 +267,3 @@ int CALLBACK_FUNCTION fnRomLocationRtCall(RuntimeMenuItem * item, uint8_t row, R
     default: return false;
     }
 }
-
-
-
-
-
-
-
-
-
-
-
-

examples/colorTftEthernet32/colorTftEthernet32.ino.backup

@@ -277,3 +277,5 @@ int CALLBACK_FUNCTION fnRomLocationRtCall(RuntimeMenuItem * item, uint8_t row, R
 
 
 
+
+

examples/colorTftEthernet32/colorTftEthernet32_menu.cpp

@@ -15,7 +15,6 @@
 // Global variable declarations
 
 const  ConnectorLocalInfo applicationInfo = { "Ada32 Ethernet", "22813e5e-88b1-42d5-9601-4831b2be369b" };
-
 Adafruit_ST7735 gfx(6, 7, 3);
 AdafruitDrawable gfxDrawable(&gfx);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);

examples/colorTftEthernet32/colorTftEthernet32_menu.h

@@ -13,21 +13,25 @@
 
 #include <Arduino.h>
 #include <tcMenu.h>
-
 #include "tcMenuAdaFruitGfx.h"
 #include "EthernetTransport.h"
 #include <RemoteConnector.h>
 #include <RuntimeMenuItem.h>
 #include <ScrollChoiceMenuItem.h>
 
-// all variables that need exporting
+void setupMenu();  // forward reference of the menu setup function.
+extern const PROGMEM ConnectorLocalInfo applicationInfo;  // contains app name and ID
+
+// Global variables that need exporting
+
 extern Adafruit_ST7735 gfx;
 extern AdafruitDrawable gfxDrawable;
 extern GraphicsDeviceRenderer renderer;
 extern IoAbstractionRef io8574;
 extern EthernetServer server;
 
-// all menu item forward references.
+// Global Menu Item exports
+
 extern ActionMenuItem menuTakeDisplay;
 extern ActionMenuItem menuSaveItem;
 extern TextMenuItem menuRomText;
@@ -55,7 +59,9 @@ extern SubMenuItem menuSettings;
 extern EnumMenuItem menuLimit;
 extern AnalogMenuItem menuCurrent;
 extern AnalogMenuItem menuVoltage;
-extern const ConnectorLocalInfo applicationInfo;
+
+// Provide a wrapper to get hold of the root menu item
+inline MenuItem& rootMenuItem() { return menuVoltage; }
 
 // Callback functions must always include CALLBACK_FUNCTION after the return type
 #define CALLBACK_FUNCTION
@@ -69,6 +75,4 @@ void CALLBACK_FUNCTION onSaveRom(int id);
 void CALLBACK_FUNCTION onTakeDisplay(int id);
 void CALLBACK_FUNCTION onVoltageChange(int id);
 
-void setupMenu();
-
 #endif // MENU_GENERATED_CODE_H

examples/esp32SimHub/ESP32TouchKeysAbstraction.cpp

@@ -43,13 +43,13 @@ ESP32TouchKeysAbstraction::ESP32TouchKeysAbstraction(int defThreshold, touch_hig
     startedUp = false;
     pinThreshold = defThreshold;
     enabledPinMask = 0;
-    taskManager.scheduleFixedRate(5, [] {serdebugF2("intCount=", intCount);}, TIME_SECONDS);
 }
 
 void ESP32TouchKeysAbstraction::ensureInterruptRegistered() {
     if(!startedUp) {
         startedUp = true;
         touch_pad_filter_start(DEFAULT_TOUCHKEY_FILTER_FREQ);
+        touch_pad_set_filter_period(10);
     }
 
     if(interruptCodeNeeded) {

examples/esp32SimHub/esp32SimHub.emf

@@ -2,11 +2,6 @@
   "version": "1.00",
   "projectName": "/Users/dave/Documents/Arduino/tcLibraryDev/lib/tcMenu/examples/esp32SimHub/esp32SimHub.emf",
   "author": "dave",
-  "lastEdited": {
-    "seconds": 1616593214,
-    "nanos": 888722000
-  },
-  "namingRecursive": false,
   "items": [
     {
       "parentId": 0,
@@ -137,6 +132,36 @@
         "visible": true
       }
     },
+    {
+      "parentId": 4,
+      "type": "boolItem",
+      "item": {
+        "naming": "ON_OFF",
+        "name": "Overboost",
+        "variableName": "SettingsOverboost",
+        "id": 12,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
+    },
+    {
+      "parentId": 4,
+      "type": "largeNumItem",
+      "item": {
+        "digitsAllowed": 12,
+        "decimalPlaces": 4,
+        "negativeAllowed": true,
+        "name": "LargeTest",
+        "variableName": "SettingsLargeTest",
+        "id": 13,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
+    },
     {
       "parentId": 0,
       "type": "enumItem",

examples/esp32SimHub/esp32SimHub.ino

@@ -49,13 +49,16 @@ DashCustomDrawing* dashCustomDrawing;
 void setupDashboard();
 bool currentLedStatus = false;
 
+HardwareRotaryEncoder* secondEncoder;
+
 void setup() {
     SPI.begin(18, 19, 23);
     SPI.setFrequency(20000000);
 
     // we start the serial bus at 115200 so it's ready for our connector to use
     Serial.begin(115200);
 
+
     // initialise the menu library, the following line was automatically added to setup by tcMenu.
     setupMenu();
 
@@ -89,7 +92,7 @@ void setup() {
     // if you want to test your rendering without simhub connected, uncomment the below code, it will update all the
     // values a few times a second.
     //
-/*    taskManager.scheduleFixedRate(3000, [] {
+    taskManager.scheduleFixedRate(3000, [] {
         menuTyreTemp.setCurrentValue(random(50) + 40);
         auto gear = random(10);
         if(gear == 0) menuGear.setTextValue("N");
@@ -117,7 +120,8 @@ void setup() {
         rpm = min(16000, max(1500, rpm + (rand() % 100) - 25));
         menuRPM.setCurrentValue(rpm);
         menuSpeed.setCurrentValue(speed);
-    });*/
+    });
+    // end simulation code
 
     taskManager.scheduleFixedRate(250, [] {
         int rpm = menuRPM.getCurrentValue();
@@ -266,5 +270,3 @@ void CALLBACK_FUNCTION onShowDialogs(int id) {
         dlg->copyIntoBuffer("text 1");
     }
 }
-
-

examples/esp32SimHub/esp32SimHub_menu.cpp

@@ -17,7 +17,6 @@
 // Global variable declarations
 
 const PROGMEM  ConnectorLocalInfo applicationInfo = { "SimHub Link", "4db9fbfe-9fab-4759-b8ff-3e0c6700f475" };
-
 Adafruit_ILI9341 gfx(22, 17, 16);
 AdafruitDrawable gfxDrawable(&gfx);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
@@ -36,8 +35,12 @@ const char enumStrDashboard_2[] PROGMEM = "Custom";
 const char* const enumStrDashboard[] PROGMEM  = { enumStrDashboard_0, enumStrDashboard_1, enumStrDashboard_2 };
 const PROGMEM EnumMenuInfo minfoDashboard = { "Dashboard", 8, 0xffff, 2, onDashChanged, enumStrDashboard };
 EnumMenuItem menuDashboard(&minfoDashboard, 0, &menuLap);
+RENDERING_CALLBACK_NAME_INVOKE(fnSettingsLargeTestRtCall, largeNumItemRenderFn, "LargeTest", -1, NO_CALLBACK)
+EditableLargeNumberMenuItem menuSettingsLargeTest(fnSettingsLargeTestRtCall, 13, 12, 4, true, NULL);
+const PROGMEM BooleanMenuInfo minfoSettingsOverboost = { "Overboost", 12, 0xffff, 1, NO_CALLBACK, NAMING_ON_OFF };
+BooleanMenuItem menuSettingsOverboost(&minfoSettingsOverboost, false, &menuSettingsLargeTest);
 const PROGMEM AnyMenuInfo minfoSettingsShowDialogs = { "Show Dialogs", 11, 0xffff, 0, onShowDialogs };
-ActionMenuItem menuSettingsShowDialogs(&minfoSettingsShowDialogs, NULL);
+ActionMenuItem menuSettingsShowDialogs(&minfoSettingsShowDialogs, &menuSettingsOverboost);
 const PROGMEM AnalogMenuInfo minfoSettingsTestItem1 = { "Test Item 1", 5, 0xffff, 100, NO_CALLBACK, 0, 2, "" };
 AnalogMenuItem menuSettingsTestItem1(&minfoSettingsTestItem1, 0, &menuSettingsShowDialogs);
 RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRtCall, backSubItemRenderFn, "Settings", -1, NO_CALLBACK)
@@ -58,7 +61,6 @@ AnalogMenuItem menuSpeed(&minfoSpeed, 0, &menuRPM);
 // Set up code
 
 void setupMenu() {
-    // Read only and local only function calls
     menuTyreTemp.setReadOnly(true);
     menuSpeed.setReadOnly(true);
     menuRPM.setReadOnly(true);

examples/esp32SimHub/esp32SimHub_menu.h

@@ -13,24 +13,31 @@
 
 #include <Arduino.h>
 #include <tcMenu.h>
-
 #include "tcMenuAdaFruitGfx.h"
 #include "ESP32TouchKeysAbstraction.h"
 #include "SimhubConnector.h"
 #include <RuntimeMenuItem.h>
+#include <EditableLargeNumberMenuItem.h>
+
+void setupMenu();  // forward reference of the menu setup function.
+extern const PROGMEM ConnectorLocalInfo applicationInfo;  // contains app name and ID
+
+// Global variables that need exporting
 
-// all variables that need exporting
 extern Adafruit_ILI9341 gfx;
 extern AdafruitDrawable gfxDrawable;
 extern GraphicsDeviceRenderer renderer;
 extern ESP32TouchKeysAbstraction esp32Touch;
 extern const GFXfont FreeSans9pt7b;
 extern const GFXfont FreeSans12pt7b;
 
-// all menu item forward references.
+// Global Menu Item exports
+
 extern ActionMenuItem menuShowDashboard;
 extern AnalogMenuItem menuLap;
 extern EnumMenuItem menuDashboard;
+extern EditableLargeNumberMenuItem menuSettingsLargeTest;
+extern BooleanMenuItem menuSettingsOverboost;
 extern ActionMenuItem menuSettingsShowDialogs;
 extern AnalogMenuItem menuSettingsTestItem1;
 extern BackMenuItem menuBackSettings;
@@ -40,7 +47,9 @@ extern AnalogMenuItem menuTyreTemp;
 extern TextMenuItem menuGear;
 extern AnalogMenuItem menuRPM;
 extern AnalogMenuItem menuSpeed;
-extern const ConnectorLocalInfo applicationInfo;
+
+// Provide a wrapper to get hold of the root menu item
+inline MenuItem& rootMenuItem() { return menuSpeed; }
 
 // Callback functions must always include CALLBACK_FUNCTION after the return type
 #define CALLBACK_FUNCTION
@@ -50,6 +59,4 @@ void CALLBACK_FUNCTION onDashChanged(int id);
 void CALLBACK_FUNCTION onShowDash(int id);
 void CALLBACK_FUNCTION onShowDialogs(int id);
 
-void setupMenu();
-
 #endif // MENU_GENERATED_CODE_H