All examples compile on 2.2

Author: dave

examples/nano33ble/nano33ble.emf

@@ -327,6 +327,8 @@
     ],
     "namingRecursive": true,
     "saveToSrc": false,
-    "useCppMain": false
+    "useCppMain": false,
+    "eepromDefinition": "",
+    "authenticatorDefinition": ""
   }
 }

examples/nano33ble/nano33ble_menu.cpp

@@ -14,6 +14,7 @@
 
 // Global variable declarations
 const  ConnectorLocalInfo applicationInfo = { "Nano 33 BLE Sense", "e95fcf8a-8a03-4043-9313-01fd8b8e8707" };
+
 U8G2_SSD1306_128X64_NONAME_F_HW_I2C gfx(U8G2_R0, U8X8_PIN_NONE, U8X8_PIN_NONE, U8X8_PIN_NONE);
 U8g2Drawable gfxDrawable(&gfx, &Wire);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
@@ -51,10 +52,14 @@ const AnalogMenuInfo minfoTemp = { "Temp", 1, 0xffff, 2000, NO_CALLBACK, 0, 10,
 AnalogMenuItem menuTemp(&minfoTemp, 0, &menuHumidity);
 
 void setupMenu() {
+    // First we set up eeprom and authentication (if needed).
+
+    // Now add any readonly, non-remote and visible flags.
     menuTemp.setReadOnly(true);
     menuHumidity.setReadOnly(true);
     menuBPressure.setReadOnly(true);
 
+    // Code generated by plugins.
     gfx.begin();
     renderer.setUpdatesPerSecond(10);
     switches.initialise(internalDigitalIo(), true);

examples/nano33ble/tcMenuBLERemoteConnector.cpp

@@ -12,7 +12,8 @@
 
 using namespace tcremote;
 
-BLETagValTransport::BLETagValTransport() : fromApiCharacteristic(), readBuffer{}, readBufferPos(0), writeBuffer{}, writeBufferPos(0) {
+BLETagValTransport::BLETagValTransport() : TagValueTransport(TVAL_BUFFERED), fromApiCharacteristic(), readBuffer{},
+                                           readBufferPos(0), writeBuffer{}, writeBufferPos(0) {
 }
 
 int BLETagValTransport::writeChar(char data) {
@@ -94,7 +95,7 @@ bool BLEDeviceInitialisation::attemptInitialisation() {
     return true;
 }
 
-bool BLEDeviceInitialisation::attemptNewConnection(TagValueTransport *transport) {
+bool BLEDeviceInitialisation::attemptNewConnection(BaseRemoteServerConnection *transport) {
     BLE.poll();
     if(BLE.connected()) {
         auto central = BLE.central();

examples/nano33ble/tcMenuBLERemoteConnector.h

@@ -35,7 +35,7 @@ namespace tcremote {
 
         bool attemptInitialisation() override;
 
-        bool attemptNewConnection(TagValueTransport *transport) override;
+        bool attemptNewConnection(BaseRemoteServerConnection *connection) override;
     };
 
     class BLETagValTransport : public TagValueTransport {

examples/stm32f429FrameBuffer/stm32f429FrameBuffer.emf

@@ -167,6 +167,9 @@
     "lastDisplayUuid": "fc7b8f22-6553-43d6-9968-df4ee2562aaf",
     "lastInputUuid": "89cd7f70-0457-4884-97c2-0db904ccb0ba",
     "lastRemoteUuid": "2c101fec-1f7d-4ff3-8d2b-992ad41e7fcb",
+    "lastRemoteUuids": [
+      "2c101fec-1f7d-4ff3-8d2b-992ad41e7fcb"
+    ],
     "lastThemeUuid": "850dc0a3-f534-47c2-94d8-1e64ff368a54",
     "applicationUUID": "4df3d784-674a-4a3d-bcee-54a49693788e",
     "applicationName": "Factory",
@@ -229,6 +232,8 @@
     ],
     "namingRecursive": true,
     "saveToSrc": false,
-    "useCppMain": true
+    "useCppMain": true,
+    "eepromDefinition": "",
+    "authenticatorDefinition": ""
   }
 }

examples/stm32f429FrameBuffer/stm32f429FrameBuffer_menu.cpp

@@ -14,15 +14,14 @@
 #include "Fonts/FreeSans12pt7b.h"
 
 // Global variable declarations
-
 const  ConnectorLocalInfo applicationInfo = { "Factory", "4df3d784-674a-4a3d-bcee-54a49693788e" };
+
 StChromaArtDrawable Drawable;
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &Drawable);
 StBspTouchInterrogator touchInterrogator(240, 320);
 MenuTouchScreenManager touchScreen(&touchInterrogator, &renderer, iotouch::TouchInterrogator::PORTRAIT);
 
 // Global Menu Item declarations
-
 const BooleanMenuInfo minfoConnectivityEnableUSB = { "Enable USB", 10, 8, 1, NO_CALLBACK, NAMING_TRUE_FALSE };
 BooleanMenuItem menuConnectivityEnableUSB(&minfoConnectivityEnableUSB, false, NULL);
 RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
@@ -52,12 +51,14 @@ EnumMenuItem menuBeltStatus(&minfoBeltStatus, 0, &menuBeltSpeed);
 const BooleanMenuInfo minfoPower = { "Power", 6, 0xffff, 1, NO_CALLBACK, NAMING_ON_OFF };
 BooleanMenuItem menuPower(&minfoPower, false, &menuBeltStatus);
 
-// Set up code
-
 void setupMenu() {
+    // First we set up eeprom and authentication (if needed).
+
+    // Now add any readonly, non-remote and visible flags.
     menuBeltSpeed.setReadOnly(true);
     menuBeltStatus.setReadOnly(true);
 
+    // Code generated by plugins.
     renderer.setUpdatesPerSecond(10);
     touchScreen.start();
     menuMgr.initWithoutInput(&renderer, &menuPower);

examples/stm32f429FrameBuffer/stm32f429FrameBuffer_menu.h

@@ -19,19 +19,15 @@
 #include <graphics/MenuTouchScreenEncoder.h>
 #include <RuntimeMenuItem.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
-
+// variables we declare that you may need to access
+extern const PROGMEM ConnectorLocalInfo applicationInfo;
 extern StChromaArtDrawable Drawable;
 extern GraphicsDeviceRenderer renderer;
 extern StBspTouchInterrogator touchInterrogator;
 extern MenuTouchScreenManager touchScreen;
 extern const GFXfont FreeSans12pt7b;
 
 // Global Menu Item exports
-
 extern BooleanMenuItem menuConnectivityEnableUSB;
 extern BackMenuItem menuBackConnectivity;
 extern SubMenuItem menuConnectivity;
@@ -45,8 +41,9 @@ extern AnalogMenuItem menuBeltSpeed;
 extern EnumMenuItem menuBeltStatus;
 extern BooleanMenuItem menuPower;
 
-// Provide a wrapper to get hold of the root menu item
+// Provide a wrapper to get hold of the root menu item and export setupMenu
 inline MenuItem& rootMenuItem() { return menuPower; }
+void setupMenu();
 
 // Callback functions must always include CALLBACK_FUNCTION after the return type
 #define CALLBACK_FUNCTION