More example updates for 2.2 release

Author: dave

examples/esp8266WifiOled/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();
     }
 }

examples/esp8266WifiOled/Greenhouse.emf

@@ -325,7 +325,7 @@
       },
       {
         "name": "SWITCH_IODEVICE",
-        "latestValue": "",
+        "latestValue": "io8574",
         "subsystem": "INPUT"
       },
       {
@@ -413,6 +413,10 @@
     "saveToSrc": false,
     "useCppMain": false,
     "eepromDefinition": "eeprom:",
-    "authenticatorDefinition": "rom:100:6"
+    "authenticatorDefinition": "rom:100:6",
+    "projectIoExpanders": [
+      "deviceIO:",
+      "pcf8574:io8574:32:12"
+    ]
   }
 }

examples/esp8266WifiOled/esp8266WifiOled.ino

@@ -34,20 +34,9 @@ char fileChoicesArray[255]{};
 #define WINDOW_PIN 3
 #define HEATER_PIN 4
 
-// this is the interrupt pin connection from the PCF8574 back to the ESP8266 board.
-#define IO_INTERRUPT_PIN 12
-
-
-//
-// ESP boards tend to have few pins available for general purpose use, to make things easier
-// this sketch assumes the rotary encoder and switch are attached to a PCF8574 IO Expander.
-// Change in menu designer's code generator to remove this if you prefer to use device pins.
-//
-//IoAbstractionRef io8574 = new LoggingIoAbstraction(ioFrom8574(0x20, IO_INTERRUPT_PIN), 8);
-IoAbstractionRef io8574 = ioFrom8574(0x20, IO_INTERRUPT_PIN);
-
 // we add two widgets that show both the connection status and wifi signal strength
 // these are added to the renderer and rendered upon any change.
+// https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/rendering-with-tcmenu-lcd-tft-oled/#titlewidget-for-presenting-state-in-icon-form
 TitleWidget connectedWidget(iconsConnection, 2, 16, 12);
 TitleWidget wifiWidget(iconsWifi, 5, 16, 12, &connectedWidget);
 

examples/esp8266WifiOled/esp8266WifiOled_menu.cpp

@@ -15,6 +15,7 @@
 // Global variable declarations
 const PROGMEM  ConnectorLocalInfo applicationInfo = { "ESP8266 Greenhouse", "01b9cb76-c108-4be3-a133-6159f8f1c9c1" };
 TcMenuRemoteServer remoteServer(applicationInfo);
+IoAbstractionRef ioexp_io8574 = ioFrom8574(0x20, 12);
 ArduinoEEPROMAbstraction glArduinoEeprom(&EEPROM);
 EepromAuthenticatorManager authManager(6);
 U8G2_SH1106_128X64_NONAME_F_HW_I2C gfx(U8G2_R0, 16, U8X8_PIN_NONE, U8X8_PIN_NONE);
@@ -80,17 +81,17 @@ void setupMenu() {
     authManager.initialise(menuMgr.getEepromAbstraction(), 100);
     menuMgr.setAuthenticator(&authManager);
     // Now add any readonly, non-remote and visible flags.
-    menuTomatoTemp.setReadOnly(true);
     menuIpAddress.setReadOnly(true);
+    menuTomatoTemp.setReadOnly(true);
     menuCucumberTemp.setReadOnly(true);
-    menuPwd.setLocalOnly(true);
     menuSSID.setLocalOnly(true);
+    menuPwd.setLocalOnly(true);
     menuSecretEntry.setVisible(false);
 
     // Code generated by plugins.
     gfx.begin();
     renderer.setUpdatesPerSecond(10);
-    switches.initialise(internalDigitalIo(), true);
+    switches.initialise(ioexp_io8574, true);
     menuMgr.initForEncoder(&renderer, &menuTomatoTemp, 13, 12, 14);
     remoteServer.addConnection(&ethernetConnection);
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);

examples/esp8266WifiOled/esp8266WifiOled_menu.h

@@ -19,6 +19,8 @@
 #include <RemoteMenuItem.h>
 #include <RuntimeMenuItem.h>
 #include <ScrollChoiceMenuItem.h>
+#include <IoAbstraction.h>
+#include <IoAbstractionWire.h>
 #include <ArduinoEEPROMAbstraction.h>
 #include <RemoteAuthentication.h>
 
@@ -30,6 +32,9 @@ extern GraphicsDeviceRenderer renderer;
 extern WiFiServer server;
 extern EthernetInitialisation ethernetInitialisation;
 
+// Any externals needed by IO expanders, EEPROMs etc
+extern IoAbstractionRef ioexp_io8574;
+
 // Global Menu Item exports
 extern EepromAuthenticationInfoMenuItem menuAuthenticator;
 extern RemoteMenuItem menuIoTMonitor;