Prepare release 2.2

dave · dave · commit 8dc06699b8fa · 2021-09-19T09:22:45.000+01:00
diff --git a/examples/analogDfRobot/analogDfRobot.emf b/examples/analogDfRobot/analogDfRobot.emf
@@ -180,6 +180,9 @@
     "saveToSrc": false,
     "useCppMain": false,
     "eepromDefinition": "",
-    "authenticatorDefinition": ""
+    "authenticatorDefinition": "",
+    "projectIoExpanders": [
+      "deviceIO:"
+    ]
   }
 }
diff --git a/examples/analogDfRobot/analogDfRobot_menu.h b/examples/analogDfRobot/analogDfRobot_menu.h
@@ -19,12 +19,16 @@
 #include <ScrollChoiceMenuItem.h>
 #include <RuntimeMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
+#include <IoAbstraction.h>
 
 // variables we declare that you may need to access
 extern const PROGMEM ConnectorLocalInfo applicationInfo;
 extern LiquidCrystal lcd;
 extern LiquidCrystalRenderer renderer;
 
+// Any externals needed by IO expanders, EEPROMs etc
+
+
 // Global Menu Item exports
 extern AnalogMenuItem menuCommits;
 extern ScrollChoiceMenuItem menuChooseItem;
diff --git a/examples/esp32Amplifier/EthernetTransport.cpp b/examples/esp32Amplifier/EthernetTransport.cpp
@@ -30,9 +30,10 @@ void EthernetTagValTransport::flush() {
     if((int)client.write(writeBuffer, writeBufferPos) == writeBufferPos) {
         serdebugF2("Buffer written ", writeBufferPos);
         writeBufferPos = 0;
-    client.flush();
-}
+        client.flush();
+    }
     else {
+        writeBufferPos = 0;
         close();
     }
 }
diff --git a/examples/esp32Amplifier/ThemeCoolBlueModern.h b/examples/esp32Amplifier/ThemeCoolBlueModern.h
@@ -1,9 +1,13 @@
+/**
+ * Cool blue modern theme by TheCodersCorner.com. This is part of the standard themes shipped with TcMenu.
+ * This file will not be updated by the designer, you can edit.
+ */
 #ifndef THEME_COOL_BLUE
 #define THEME_COOL_BLUE
 
 #include <graphics/BaseGraphicalRenderer.h>
 
-const color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(0,133,255)};
+const color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(64, 64, 64)};
 const color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20,133,255), RGB(31,100,178)};
 const color_t coolBlueActionPalette[] = {RGB(255, 255, 255), RGB(0,45,120), RGB(20,133,255), RGB(31,100,178)};
 
diff --git a/examples/esp32Amplifier/esp32Amplifier.emf b/examples/esp32Amplifier/esp32Amplifier.emf
@@ -511,6 +511,9 @@
     "saveToSrc": false,
     "useCppMain": true,
     "eepromDefinition": "eeprom:",
-    "authenticatorDefinition": "rom:200:6"
+    "authenticatorDefinition": "rom:200:6",
+    "projectIoExpanders": [
+      "deviceIO:"
+    ]
   }
 }
diff --git a/examples/esp32Amplifier/esp32Amplifier_menu.h b/examples/esp32Amplifier/esp32Amplifier_menu.h
@@ -20,6 +20,7 @@
 #include <RemoteMenuItem.h>
 #include <RuntimeMenuItem.h>
 #include <ScrollChoiceMenuItem.h>
+#include <IoAbstraction.h>
 #include <ArduinoEEPROMAbstraction.h>
 #include <RemoteAuthentication.h>
 
@@ -36,6 +37,9 @@ extern EthernetInitialisation ethernetInitialisation;
 extern WiFiServer server2;
 extern EthernetInitialisation ethernetInitialisation2;
 
+// Any externals needed by IO expanders, EEPROMs etc
+
+
 // Global Menu Item exports
 extern EepromAuthenticationInfoMenuItem menuConnectivityAuthenticator;
 extern RemoteMenuItem menuConnectivityIoTMonitor;
diff --git a/examples/esp32Amplifier/tcMenuTfteSpi.cpp b/examples/esp32Amplifier/tcMenuTfteSpi.cpp
@@ -14,7 +14,7 @@
 
 
 #include "tcMenuTfteSpi.h"
-#include <TfT_eSPI.h>
+#include <TFT_eSPI.h>
 
 TfteSpiDrawable::TfteSpiDrawable(TFT_eSPI *tft, int spriteHeight) : tft(tft), spriteWithConfig(nullptr), spriteHeight(spriteHeight) {}
 
diff --git a/examples/esp32SimHub/ThemeCoolBlueTraditional.h b/examples/esp32SimHub/ThemeCoolBlueTraditional.h
@@ -7,8 +7,8 @@
 
 // tcMenu drawing properties take a 4 color palette for items, titles and actions.
 // this renderer shares the color configuration for items and actions.
-color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(0,133,255)};
-color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20,133,255), RGB(31,100,178)};
+const color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(64, 64, 64)};
+const color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20,133,255), RGB(31,100,178)};
 
 void installCoolBlueTraditionalTheme(GraphicsDeviceRenderer& bgr, const MenuFontDef& itemFont, const MenuFontDef& titleFont, bool needEditingIcons) {
     // first we keep a reference to the screen size, and set the dimensions on the renderer.
diff --git a/examples/esp32SimHub/esp32SimHub.emf b/examples/esp32SimHub/esp32SimHub.emf
@@ -388,6 +388,9 @@
     "saveToSrc": false,
     "useCppMain": false,
     "eepromDefinition": "",
-    "authenticatorDefinition": ""
+    "authenticatorDefinition": "",
+    "projectIoExpanders": [
+      "deviceIO:"
+    ]
   }
 }
diff --git a/examples/esp32SimHub/esp32SimHub.ino b/examples/esp32SimHub/esp32SimHub.ino
@@ -35,6 +35,7 @@
 #include "DashCustomDrawing.h"
 #include "RobotoMonoBold60pt.h"
 #include <Fonts/FreeSans18pt7b.h>
+#include <tcMenuVersion.h>
 
 // here we pulsate an LED using the ESP32's DAC
 const int dacPin = 32;
@@ -80,12 +81,13 @@ void setup() {
     });
 
     setTitlePressedCallback([](int id) {
-        auto* dlg = renderer.getDialog();
-        if(dlg && !dlg->isInUse()) {
-            dlg->setButtons(BTNTYPE_NONE, BTNTYPE_OK);
+        withMenuDialogIfAvailable([](MenuBasedDialog* dlg) {
+            dlg->setButtons(BTNTYPE_OK, BTNTYPE_NONE);
             dlg->show(applicationInfo.name, true);
-            dlg->copyIntoBuffer("by theCodersCorner");
-        }
+            char szVersion[10];
+            tccore::copyTcMenuVersion(szVersion, sizeof szVersion);
+            dlg->copyIntoBuffer(szVersion);
+        });
     });
 
     //
diff --git a/examples/esp32SimHub/esp32SimHub_menu.h b/examples/esp32SimHub/esp32SimHub_menu.h
@@ -19,6 +19,7 @@
 #include <RemoteMenuItem.h>
 #include <RuntimeMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
+#include <IoAbstraction.h>
 
 // variables we declare that you may need to access
 extern const PROGMEM ConnectorLocalInfo applicationInfo;
@@ -30,6 +31,9 @@ extern ESP32TouchKeysAbstraction esp32Touch;
 extern const GFXfont FreeSans9pt7b;
 extern const GFXfont FreeSans12pt7b;
 
+// Any externals needed by IO expanders, EEPROMs etc
+
+
 // Global Menu Item exports
 extern ActionMenuItem menuShowDashboard;
 extern AnalogMenuItem menuLap;
diff --git a/examples/esp8266WifiOled/Greenhouse.emf b/examples/esp8266WifiOled/Greenhouse.emf
@@ -325,7 +325,7 @@
       },
       {
         "name": "SWITCH_IODEVICE",
-        "latestValue": "io8574",
+        "latestValue": "devicePins",
         "subsystem": "INPUT"
       },
       {
diff --git a/examples/esp8266WifiOled/esp8266WifiOled.ino b/examples/esp8266WifiOled/esp8266WifiOled.ino
@@ -142,10 +142,10 @@ void setup() {
     // Now we configure our simulated heater and window.. We use inverse
     // logic on the 8574 because it's better at pulling down to GND than up.
     //
-    ioDevicePinMode(io8574, WINDOW_PIN, OUTPUT);
-    ioDevicePinMode(io8574, HEATER_PIN, OUTPUT);
-    ioDeviceDigitalWrite(io8574, WINDOW_PIN, HIGH);
-    ioDeviceDigitalWriteS(io8574, HEATER_PIN, HIGH);
+    ioDevicePinMode(ioexp_io8574, WINDOW_PIN, OUTPUT);
+    ioDevicePinMode(ioexp_io8574, HEATER_PIN, OUTPUT);
+    ioDeviceDigitalWrite(ioexp_io8574, WINDOW_PIN, HIGH);
+    ioDeviceDigitalWriteS(ioexp_io8574, HEATER_PIN, HIGH);
 }
 
 //
@@ -176,7 +176,7 @@ void windowOpenFn() {
     }
     else windowOpen = false;
 
-    ioDeviceDigitalWriteS(io8574, WINDOW_PIN, windowOpen);
+    ioDeviceDigitalWriteS(ioexp_io8574, WINDOW_PIN, windowOpen);
 }
 
 // we are using a simulated low speed PWM to control the heater
@@ -193,7 +193,7 @@ void heaterOnFn() {
     }
     else heaterOn = false;
 
-    ioDeviceDigitalWriteS(io8574, HEATER_PIN, heaterOn);
+    ioDeviceDigitalWriteS(ioexp_io8574, HEATER_PIN, heaterOn);
 }
 
 //
diff --git a/examples/esp8266WifiOled/esp8266WifiOled_menu.cpp b/examples/esp8266WifiOled/esp8266WifiOled_menu.cpp
@@ -81,17 +81,17 @@ void setupMenu() {
     authManager.initialise(menuMgr.getEepromAbstraction(), 100);
     menuMgr.setAuthenticator(&authManager);
     // Now add any readonly, non-remote and visible flags.
-    menuIpAddress.setReadOnly(true);
     menuTomatoTemp.setReadOnly(true);
+    menuIpAddress.setReadOnly(true);
     menuCucumberTemp.setReadOnly(true);
-    menuSSID.setLocalOnly(true);
     menuPwd.setLocalOnly(true);
+    menuSSID.setLocalOnly(true);
     menuSecretEntry.setVisible(false);
 
     // Code generated by plugins.
     gfx.begin();
     renderer.setUpdatesPerSecond(10);
-    switches.initialise(ioexp_io8574, true);
+    switches.initialise(internalDigitalIo(), true);
     menuMgr.initForEncoder(&renderer, &menuTomatoTemp, 13, 12, 14);
     remoteServer.addConnection(&ethernetConnection);
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
diff --git a/examples/keyboardEthernetShield/keyboardEthernetShield.emf b/examples/keyboardEthernetShield/keyboardEthernetShield.emf
@@ -614,8 +614,8 @@
     "eepromDefinition": "avr:",
     "authenticatorDefinition": "rom:100:6",
     "projectIoExpanders": [
-      "deviceIO:",
-      "mcp23017:io23017:32:2"
+      "mcp23017:io23017:32:2",
+      "deviceIO:"
     ]
   }
 }
diff --git a/examples/keyboardEthernetShield/keyboardEthernetShield.ino.backup b/examples/keyboardEthernetShield/keyboardEthernetShield.ino.backup
@@ -99,7 +99,7 @@ void setup() {
 
 	// Here you could have a button internal to the device somewhere that reset the pins and remotes, in this case
 	// if the button is held at start up it trigger a key reset.
-    if(ioDeviceDigitalReadS(io23017, 5) == LOW) {
+    if(ioDeviceDigitalReadS(ioexp_io23017, 5) == LOW) {
         Serial.println("Resetting all keys and pin");
         authenticator->resetAllKeys();
     }
diff --git a/examples/keyboardEthernetShield/keyboardEthernetShield_menu.h b/examples/keyboardEthernetShield/keyboardEthernetShield_menu.h
@@ -20,8 +20,8 @@
 #include <ScrollChoiceMenuItem.h>
 #include <RemoteMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
-#include <IoAbstraction.h>
 #include <IoAbstractionWire.h>
+#include <IoAbstraction.h>
 #include <EepromAbstraction.h>
 #include <RemoteAuthentication.h>
 #include "tcMenuLiquidCrystal.h"
diff --git a/examples/stm32f429FrameBuffer/ThemeCoolBlueModern.h b/examples/stm32f429FrameBuffer/ThemeCoolBlueModern.h
@@ -7,7 +7,7 @@
 
 #include <graphics/BaseGraphicalRenderer.h>
 
-const color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(0,133,255)};
+const color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(64, 64, 64)};
 const color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20,133,255), RGB(31,100,178)};
 const color_t coolBlueActionPalette[] = {RGB(255, 255, 255), RGB(0,45,120), RGB(20,133,255), RGB(31,100,178)};
 
diff --git a/examples/stm32f429FrameBuffer/stm32f429FrameBuffer.emf b/examples/stm32f429FrameBuffer/stm32f429FrameBuffer.emf
@@ -234,6 +234,9 @@
     "saveToSrc": false,
     "useCppMain": true,
     "eepromDefinition": "",
-    "authenticatorDefinition": ""
+    "authenticatorDefinition": "",
+    "projectIoExpanders": [
+      "deviceIO:"
+    ]
   }
 }
diff --git a/examples/stm32f429FrameBuffer/stm32f429FrameBuffer_menu.h b/examples/stm32f429FrameBuffer/stm32f429FrameBuffer_menu.h
@@ -18,6 +18,7 @@
 #include "tcMenuStChromaArt.h"
 #include <graphics/MenuTouchScreenEncoder.h>
 #include <RuntimeMenuItem.h>
+#include <IoAbstraction.h>
 
 // variables we declare that you may need to access
 extern const PROGMEM ConnectorLocalInfo applicationInfo;
@@ -27,6 +28,9 @@ extern StBspTouchInterrogator touchInterrogator;
 extern MenuTouchScreenManager touchScreen;
 extern const GFXfont FreeSans12pt7b;
 
+// Any externals needed by IO expanders, EEPROMs etc
+
+
 // Global Menu Item exports
 extern BooleanMenuItem menuConnectivityEnableUSB;
 extern BackMenuItem menuBackConnectivity;
diff --git a/examples/takeOverDisplay/takeOverDisplay.emf b/examples/takeOverDisplay/takeOverDisplay.emf
@@ -454,8 +454,8 @@
     "eepromDefinition": "at24:80:PAGESIZE_AT24C128",
     "authenticatorDefinition": "rom:100:6",
     "projectIoExpanders": [
-      "deviceIO:",
-      "customIO:io23017"
+      "customIO:io23017",
+      "deviceIO:"
     ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,9 @@`
`180`	`180`	`"saveToSrc": false,`
`181`	`181`	`"useCppMain": false,`
`182`	`182`	`"eepromDefinition": "",`
`183`		`- "authenticatorDefinition": ""`
	`183`	`+ "authenticatorDefinition": "",`
	`184`	`+ "projectIoExpanders": [`
	`185`	`+ "deviceIO:"`
	`186`	`+ ]`
`184`	`187`	`}`
`185`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,10 @@ void EthernetTagValTransport::flush() {`
`30`	`30`	`if((int)client.write(writeBuffer, writeBufferPos) == writeBufferPos) {`
`31`	`31`	`serdebugF2("Buffer written ", writeBufferPos);`
`32`	`32`	`writeBufferPos = 0;`
`33`		`- client.flush();`
`34`		`-}`
	`33`	`+ client.flush();`
	`34`	`+ }`
`35`	`35`	`else {`
	`36`	`+ writeBufferPos = 0;`
`36`	`37`	`close();`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -511,6 +511,9 @@`
`511`	`511`	`"saveToSrc": false,`
`512`	`512`	`"useCppMain": true,`
`513`	`513`	`"eepromDefinition": "eeprom:",`
`514`		`- "authenticatorDefinition": "rom:200:6"`
	`514`	`+ "authenticatorDefinition": "rom:200:6",`
	`515`	`+ "projectIoExpanders": [`
	`516`	`+ "deviceIO:"`
	`517`	`+ ]`
`515`	`518`	`}`
`516`	`519`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,9 @@`
`388`	`388`	`"saveToSrc": false,`
`389`	`389`	`"useCppMain": false,`
`390`	`390`	`"eepromDefinition": "",`
`391`		`- "authenticatorDefinition": ""`
	`391`	`+ "authenticatorDefinition": "",`
	`392`	`+ "projectIoExpanders": [`
	`393`	`+ "deviceIO:"`
	`394`	`+ ]`
`392`	`395`	`}`
`393`	`396`	`}`