Prepare release 2.2

Author: dave

examples/nano33ble/nano33ble.emf

@@ -266,7 +266,7 @@
       },
       {
         "name": "SWITCH_IODEVICE",
-        "latestValue": "",
+        "latestValue": "devicePins",
         "subsystem": "INPUT"
       },
       {
@@ -329,6 +329,9 @@
     "saveToSrc": false,
     "useCppMain": false,
     "eepromDefinition": "",
-    "authenticatorDefinition": ""
+    "authenticatorDefinition": "",
+    "projectIoExpanders": [
+      "deviceIO:"
+    ]
   }
 }

examples/nano33ble/nano33ble.ino

@@ -11,6 +11,7 @@
 #include "SensorManager.h"
 #include "MotionDetection.h"
 #include <AnalogDeviceAbstraction.h>
+#include <tcMenuVersion.h>
 
 // on the analog menu, we both have an analog input and an analog output (PWM). You can configure those pins here.
 const int analogInputPin = A0;
@@ -44,6 +45,16 @@ void setup() {
     taskManager.registerEvent(&motionDetection);
     taskManager.scheduleFixedRate(1, &sensorManager, TIME_SECONDS);
 
+    setTitlePressedCallback([](int id) {
+        withMenuDialogIfAvailable([](MenuBasedDialog* dlg) {
+            dlg->setButtons(BTNTYPE_CLOSE, BTNTYPE_NONE);
+            dlg->showRam("Nano BLE Example", false);
+            char szVer[10];
+            tccore::copyTcMenuVersion(szVer, sizeof szVer);
+            dlg->copyIntoBuffer(szVer);
+        });
+    });
+
     // lastly we set up something simple to read from analog in
     taskManager.scheduleFixedRate(100, [] {
        menuAnalogReadingsInA0.setFloatValue(analogDevice.getCurrentFloat(analogInputPin));

examples/nano33ble/nano33ble_menu.h

@@ -14,12 +14,16 @@
 #include <Arduino.h>
 #include <tcMenu.h>
 #include "tcMenuU8g2.h"
+#include <IoAbstraction.h>
 
 // variables we declare that you may need to access
 extern const PROGMEM ConnectorLocalInfo applicationInfo;
 extern U8G2_SSD1306_128X64_NONAME_F_HW_I2C gfx;
 extern GraphicsDeviceRenderer renderer;
 
+// Any externals needed by IO expanders, EEPROMs etc
+
+
 // Global Menu Item exports
 extern AnalogMenuItem menuAnalogReadingsOutputPWM;
 extern FloatMenuItem menuAnalogReadingsInA0;

examples/stm32f4mbed/MBedEthernetTransport.cpp

@@ -28,8 +28,7 @@ void MBedEthernetTransport::flush() {
         if(written == NSAPI_ERROR_WOULD_BLOCK) continue;
         if(written <=0) {
             serdebugF2("socket error ", written);
-            socket->close();
-            socket = nullptr;
+            close();
             return;
         }
         if(written < sizeToGo) {
@@ -67,7 +66,6 @@ int MBedEthernetTransport::fillReadBuffer(uint8_t* dataBuffer, int maxData) {
 
 bool MBedEthernetTransport::available() {
     return (socket != nullptr && isOpen);
-
 }
 
 void MBedEthernetTransport::close() {

examples/stm32f4mbed/MBedEthernetTransport.h

@@ -31,7 +31,7 @@ namespace tcremote {
         InternetSocket* socket;
         bool isOpen;
     public:
-        MBedEthernetTransport() : BaseBufferedRemoteTransport(BUFFER_MESSAGES_TILL_FULL, 64, 250) {
+        MBedEthernetTransport() : BaseBufferedRemoteTransport(BUFFER_MESSAGES_TILL_FULL, 96, 128) {
             this->socket = nullptr;
             isOpen = false;
         }

examples/stm32f4mbed/stm32f4mbed.emf

@@ -360,7 +360,7 @@
       },
       {
         "name": "SWITCH_IODEVICE",
-        "latestValue": "",
+        "latestValue": "devicePins",
         "subsystem": "INPUT"
       },
       {
@@ -443,6 +443,9 @@
     "saveToSrc": false,
     "useCppMain": true,
     "eepromDefinition": "bsp:0",
-    "authenticatorDefinition": "rom:100:6"
+    "authenticatorDefinition": "rom:100:6",
+    "projectIoExpanders": [
+      "deviceIO:"
+    ]
   }
 }

examples/stm32f4mbed/stm32f4mbed_menu.cpp

@@ -83,11 +83,11 @@ void setupMenu() {
     authManager.initialise(menuMgr.getEepromAbstraction(), 100);
     menuMgr.setAuthenticator(&authManager);
     // Now add any readonly, non-remote and visible flags.
-    menuIP.setReadOnly(true);
     menuCommits.setReadOnly(true);
     menuEdit.setReadOnly(true);
-    menuIoTMonitor.setLocalOnly(true);
+    menuIP.setReadOnly(true);
     menuAuthenticator.setLocalOnly(true);
+    menuIoTMonitor.setLocalOnly(true);
 
     // Code generated by plugins.
     gfx.setRotation(0);

examples/stm32f4mbed/stm32f4mbed_menu.h

@@ -22,6 +22,7 @@
 #include <RemoteMenuItem.h>
 #include <ScrollChoiceMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
+#include <IoAbstraction.h>
 #include <mbed/HalStm32EepromAbstraction.h>
 #include <RemoteAuthentication.h>
 
@@ -34,6 +35,9 @@ extern AdafruitDrawable gfxDrawable;
 extern GraphicsDeviceRenderer renderer;
 extern MbedEthernetInitialiser mbedEthInitialisation;
 
+// Any externals needed by IO expanders, EEPROMs etc
+
+
 // Global Menu Item exports
 extern TextMenuItem menuEdit;
 extern AnalogMenuItem menuCommits;

examples/stm32f4mbed/tcmenu_main.cpp

@@ -13,6 +13,7 @@
 #include "mbed/HalStm32EepromAbstraction.h"
 #include <stockIcons/wifiAndConnectionIcons16x12.h>
 #include <RemoteMenuItem.h>
+#include <tcMenuVersion.h>
 
 #ifdef BUILD_FOR_MBED_6
 BufferedSerial serPort(USBTX, USBRX);
@@ -88,7 +89,9 @@ void setup() {
         if(dlg && !dlg->isInUse()) {
             dlg->setButtons(BTNTYPE_NONE, BTNTYPE_OK);
             dlg->show("Mbed demo", false);
-            dlg->copyIntoBuffer("//TheCodersCorner");
+            char szVer[10];
+            tccore::copyTcMenuVersion(szVer, sizeof szVer);
+            dlg->copyIntoBuffer(szVer);
         }
     });