Small fix to method name

Author: davetcc

examples/esp8266WifiOled/Greenhouse.emf

@@ -251,6 +251,23 @@
         "localOnly": true,
         "visible": true
       }
+    },
+    {
+      "parentId": 9,
+      "type": "enumItem",
+      "item": {
+        "enumEntries": [
+          "Station",
+          "Access Point"
+        ],
+        "name": "WiFi Mode",
+        "variableName": "WiFiMode",
+        "id": 19,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
     }
   ],
   "codeOptions": {
@@ -316,13 +333,8 @@
         "subsystem": "DISPLAY"
       },
       {
-        "name": "PULLUP_LOGIC",
-        "latestValue": "true",
-        "subsystem": "INPUT"
-      },
-      {
-        "name": "INTERRUPT_SWITCHES",
-        "latestValue": "false",
+        "name": "SW_POLLING_MODE",
+        "latestValue": "SWITCHES_POLL_KEYS_ONLY",
         "subsystem": "INPUT"
       },
       {
@@ -355,6 +367,11 @@
         "latestValue": "-1",
         "subsystem": "INPUT"
       },
+      {
+        "name": "PULLUP_LOGIC",
+        "latestValue": "true",
+        "subsystem": "INPUT"
+      },
       {
         "name": "ENCODER_IS_QUARTER_CYCLE",
         "latestValue": "false",
@@ -417,8 +434,12 @@
     "eepromDefinition": "eeprom:",
     "authenticatorDefinition": "rom:100:6",
     "projectIoExpanders": [
-      "pcf8574:io8574:32:12",
-      "deviceIO:"
-    ]
+      "deviceIO:",
+      "pcf8574:io8574:32:12"
+    ],
+    "menuInMenuCollection": {
+      "menuDefinitions": []
+    },
+    "packageNamespace": ""
   }
 }

examples/esp8266WifiOled/esp8266WifiOled.ino

@@ -54,11 +54,9 @@ void onCommsChange(CommunicationInfo info) {
 }
 
 void startWiFi() {
-    serdebugF3("Starting WiFi", menuSSID.getTextValue(), menuPwd.getTextValue());
-
-    // this sketch assumes you've successfully connected to the Wifi before, does not
-    // call begin.. You can initialise the wifi whichever way you wish here.
-    if(strlen(menuSSID.getTextValue())==0) {
+    // You can choose between station and access point mode by setting the connectivity/Wifi Mode option to your
+    // own choice
+    if(menuWiFiMode.getCurrentValue() == 0) {
         // no SSID come up as an access point
         WiFi.mode(WIFI_AP);
         WiFi.softAP("tcmenu", "secret");

examples/esp8266WifiOled/esp8266WifiOled_menu.cpp

@@ -27,8 +27,13 @@ EthernetTagValTransport ethernetTransport;
 TagValueRemoteServerConnection ethernetConnection(ethernetTransport, ethernetInitialisation);
 
 // Global Menu Item declarations
+const char enumStrWiFiMode_0[] PROGMEM = "Station";
+const char enumStrWiFiMode_1[] PROGMEM = "Access Point";
+const char* const enumStrWiFiMode[] PROGMEM  = { enumStrWiFiMode_0, enumStrWiFiMode_1 };
+const PROGMEM EnumMenuInfo minfoWiFiMode = { "WiFi Mode", 19, 0xffff, 1, NO_CALLBACK, enumStrWiFiMode };
+EnumMenuItem menuWiFiMode(&minfoWiFiMode, 0, NULL);
 const PROGMEM char pgmStrAuthenticatorText[] = { "Authenticator" };
-EepromAuthenticationInfoMenuItem menuAuthenticator(pgmStrAuthenticatorText, NO_CALLBACK, 18, NULL);
+EepromAuthenticationInfoMenuItem menuAuthenticator(pgmStrAuthenticatorText, NO_CALLBACK, 18, &menuWiFiMode);
 const PROGMEM char pgmStrIoTMonitorText[] = { "IoT Monitor" };
 RemoteMenuItem menuIoTMonitor(pgmStrIoTMonitorText, 17, &menuAuthenticator);
 RENDERING_CALLBACK_NAME_INVOKE(fnIpAddressRtCall, ipAddressRenderFn, "IpAddress", -1, NO_CALLBACK)
@@ -84,16 +89,16 @@ void setupMenu() {
     menuIpAddress.setReadOnly(true);
     menuTomatoTemp.setReadOnly(true);
     menuCucumberTemp.setReadOnly(true);
-    menuPwd.setLocalOnly(true);
     menuSSID.setLocalOnly(true);
+    menuPwd.setLocalOnly(true);
     menuAuthenticator.setLocalOnly(true);
     menuIoTMonitor.setLocalOnly(true);
     menuSecretEntry.setVisible(false);
 
     // Code generated by plugins.
     gfx.begin();
     renderer.setUpdatesPerSecond(10);
-    switches.initialise(internalDigitalIo(), true);
+    switches.init(internalDigitalIo(), SWITCHES_POLL_KEYS_ONLY, true);
     menuMgr.initForEncoder(&renderer, &menuTomatoTemp, 13, 12, 14);
     remoteServer.addConnection(&ethernetConnection);
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);

examples/esp8266WifiOled/esp8266WifiOled_menu.h

@@ -19,8 +19,8 @@
 #include <RemoteMenuItem.h>
 #include <RuntimeMenuItem.h>
 #include <ScrollChoiceMenuItem.h>
-#include <IoAbstractionWire.h>
 #include <IoAbstraction.h>
+#include <IoAbstractionWire.h>
 #include <ArduinoEEPROMAbstraction.h>
 #include <RemoteAuthentication.h>
 
@@ -36,6 +36,7 @@ extern EthernetInitialisation ethernetInitialisation;
 extern IoAbstractionRef ioexp_io8574;
 
 // Global Menu Item exports
+extern EnumMenuItem menuWiFiMode;
 extern EepromAuthenticationInfoMenuItem menuAuthenticator;
 extern RemoteMenuItem menuIoTMonitor;
 extern IpAddressMenuItem menuIpAddress;

examples/keyboardEthernetShield/keyboardEthernetShield.emf

@@ -508,13 +508,8 @@
         "subsystem": "DISPLAY"
       },
       {
-        "name": "PULLUP_LOGIC",
-        "latestValue": "true",
-        "subsystem": "INPUT"
-      },
-      {
-        "name": "INTERRUPT_SWITCHES",
-        "latestValue": "false",
+        "name": "SW_POLLING_MODE",
+        "latestValue": "SWITCHES_POLL_EVERYTHING",
         "subsystem": "INPUT"
       },
       {
@@ -547,6 +542,11 @@
         "latestValue": "-1",
         "subsystem": "INPUT"
       },
+      {
+        "name": "PULLUP_LOGIC",
+        "latestValue": "true",
+        "subsystem": "INPUT"
+      },
       {
         "name": "ENCODER_IS_QUARTER_CYCLE",
         "latestValue": "false",
@@ -616,6 +616,10 @@
     "projectIoExpanders": [
       "deviceIO:",
       "mcp23017:io23017:32:2"
-    ]
+    ],
+    "menuInMenuCollection": {
+      "menuDefinitions": []
+    },
+    "packageNamespace": ""
   }
 }

examples/keyboardEthernetShield/keyboardEthernetShield_menu.cpp

@@ -117,12 +117,15 @@ void setupMenu() {
     lcd.setIoAbstraction(ioexp_io23017);
     lcd.begin(20, 4);
     renderer.setUpdatesPerSecond(4);
-    switches.initialise(ioexp_io23017, true);
+    switches.init(ioexp_io23017, SWITCHES_POLL_EVERYTHING, true);
     menuMgr.initForEncoder(&renderer, &menuTime, 6, 7, 5);
     remoteServer.addConnection(&ethernetConnection);
     remoteServer.addConnection(&ethernetConnection2);
 
     // We have an IoT monitor, register the server
     menuConnectivityIoTMonitor.setRemoteServer(remoteServer);
+
+    // We have an EEPROM authenticator, it needs initialising
+    menuConnectivityAuthenticator.init();
 }
 

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"