#103 all examples now recompiled with 2.1

Author: dave

examples/colorTftEthernet32/colorTftEthernet.emf

@@ -339,7 +339,7 @@
     "lastDisplayUuid": "4dcb12ec-13d8-4466-b8b6-bd575eae4612",
     "lastInputUuid": "6dd87e7d-e751-4912-a70d-91793b1d3d87",
     "lastRemoteUuid": "0877131c-e03e-426b-8eaf-228e01f5e7f1",
-    "lastThemeUuid": "e4524028-edd8-4e0a-ae15-a1f2ba05354f",
+    "lastThemeUuid": "03c6b25f-db63-402a-8447-a5ce1484c14d",
     "applicationUUID": "22813e5e-88b1-42d5-9601-4831b2be369b",
     "applicationName": "Ada32 Ethernet",
     "lastProperties": [

examples/colorTftEthernet32/colorTftEthernet32.ino.backup

@@ -267,15 +267,3 @@ int CALLBACK_FUNCTION fnRomLocationRtCall(RuntimeMenuItem * item, uint8_t row, R
     default: return false;
     }
 }
-
-
-
-
-
-
-
-
-
-
-
-

examples/colorTftEthernet32/colorTftEthernet32_menu.cpp

@@ -88,7 +88,7 @@ void setupMenu() {
     switches.initialiseInterrupt(io8574, true);
     menuMgr.initForEncoder(&renderer, &menuVoltage, 7, 6, 5);
     remoteServer.begin(&server, &applicationInfo);
-    renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
+    renderer.setTitleMode(BaseGraphicalRenderer::TITLE_ALWAYS);
     renderer.setUseSliderForAnalog(true);
     installCoolBlueTraditionalTheme(renderer, MenuFontDef(nullptr, 1), MenuFontDef(nullptr, 1), true);
 }

examples/unoSsd1306Ascii/src/unoSsd1306Ascii_menu.cpp

@@ -6,53 +6,54 @@
 
     All the variables you may need access to are marked extern in this file for easy
     use elsewhere.
-*/
+ */
 
-#include <Arduino.h>
 #include <tcMenu.h>
 #include "unoSsd1306Ascii_menu.h"
 
 // Global variable declarations
 
-const PROGMEM ConnectorLocalInfo applicationInfo = { "Uno1306Ascii", "c4858c2f-4134-4597-a7a0-b6719631a99b" };
+const PROGMEM  ConnectorLocalInfo applicationInfo = { "Uno1306Ascii", "c4858c2f-4134-4597-a7a0-b6719631a99b" };
 SSD1306AsciiRenderer renderer(20, Arial14, System5x7);
 
 // Global Menu Item declarations
 
 ListRuntimeMenuItem menuListItem(11, 10, fnListItemRtCall, NULL);
-const AnalogMenuInfo PROGMEM minfoStatusTemprature = { "Temprature", 9, 0xFFFF, 255, NO_CALLBACK, -40, 2, "C" };
+const PROGMEM AnalogMenuInfo minfoStatusTemprature = { "Temprature", 9, 0xffff, 255, NO_CALLBACK, -40, 2, "C" };
 AnalogMenuItem menuStatusTemprature(&minfoStatusTemprature, 0, NULL);
-const FloatMenuInfo PROGMEM minfoStatusVoltageIn = { "Voltage In", 8, 0xFFFF, 0, NO_CALLBACK };
+const PROGMEM FloatMenuInfo minfoStatusVoltageIn = { "Voltage In", 8, 0xffff, 0, NO_CALLBACK };
 FloatMenuItem menuStatusVoltageIn(&minfoStatusVoltageIn, &menuStatusTemprature);
-const FloatMenuInfo PROGMEM minfoStatusPowerUse = { "Power Use", 7, 0xFFFF, 2, NO_CALLBACK };
+const PROGMEM FloatMenuInfo minfoStatusPowerUse = { "Power Use", 7, 0xffff, 2, NO_CALLBACK };
 FloatMenuItem menuStatusPowerUse(&minfoStatusPowerUse, &menuStatusVoltageIn);
-const SubMenuInfo PROGMEM minfoStatus = { "Status", 6, 0xFFFF, 0, NO_CALLBACK };
 RENDERING_CALLBACK_NAME_INVOKE(fnStatusRtCall, backSubItemRenderFn, "Status", -1, NO_CALLBACK)
+const PROGMEM SubMenuInfo minfoStatus = { "Status", 6, 0xffff, 0, NO_CALLBACK };
 BackMenuItem menuBackStatus(fnStatusRtCall, &menuStatusPowerUse);
 SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuListItem);
-const AnyMenuInfo PROGMEM minfoPressMe = { "Press me", 10, 0xFFFF, 0, onActionPressed };
+const PROGMEM AnyMenuInfo minfoPressMe = { "Press me", 10, 0xffff, 0, onActionPressed };
 ActionMenuItem menuPressMe(&minfoPressMe, &menuStatus);
-const BooleanMenuInfo PROGMEM minfoStandby = { "Standby", 5, 10, 1, NO_CALLBACK, NAMING_YES_NO };
+const PROGMEM BooleanMenuInfo minfoStandby = { "Standby", 5, 10, 1, NO_CALLBACK, NAMING_YES_NO };
 BooleanMenuItem menuStandby(&minfoStandby, false, &menuPressMe);
-const AnalogMenuInfo PROGMEM minfoBlue = { "Blue", 4, 8, 100, NO_CALLBACK, 0, 1, "%" };
+const PROGMEM AnalogMenuInfo minfoBlue = { "Blue", 4, 8, 100, NO_CALLBACK, 0, 1, "%" };
 AnalogMenuItem menuBlue(&minfoBlue, 0, &menuStandby);
-const AnalogMenuInfo PROGMEM minfoGreen = { "Green", 3, 6, 100, NO_CALLBACK, 0, 1, "%" };
+const PROGMEM AnalogMenuInfo minfoGreen = { "Green", 3, 6, 100, NO_CALLBACK, 0, 1, "%" };
 AnalogMenuItem menuGreen(&minfoGreen, 0, &menuBlue);
-const AnalogMenuInfo PROGMEM minfoRed = { "Red", 2, 4, 100, NO_CALLBACK, 0, 1, "%" };
+const PROGMEM AnalogMenuInfo minfoRed = { "Red", 2, 4, 100, NO_CALLBACK, 0, 1, "%" };
 AnalogMenuItem menuRed(&minfoRed, 0, &menuGreen);
-const AnalogMenuInfo PROGMEM minfoBrightness = { "Brightness", 1, 2, 100, NO_CALLBACK, 0, 1, "%" };
+const PROGMEM AnalogMenuInfo minfoBrightness = { "Brightness", 1, 2, 100, NO_CALLBACK, 0, 1, "%" };
 AnalogMenuItem menuBrightness(&minfoBrightness, 0, &menuRed);
 
-
 // Set up code
 
 void setupMenu() {
-    menuStatusPowerUse.setReadOnly(true);
-    menuStatusVoltageIn.setReadOnly(true);
     menuStatusTemprature.setReadOnly(true);
+    menuStatusVoltageIn.setReadOnly(true);
+    menuStatusPowerUse.setReadOnly(true);
 
     renderer.setGraphicsDevice(&gfx);
     pinMode(A0, INPUT);
     switches.initialise(inputFromDfRobotShield(), false);
     menuMgr.initForUpDownOk(&renderer, &menuBrightness, DF_KEY_DOWN, DF_KEY_UP, DF_KEY_SELECT);
+    menuMgr.setBackButton(DF_KEY_LEFT);
+    menuMgr.setNextButton(DF_KEY_RIGHT);
 }
+

examples/unoSsd1306Ascii/src/unoSsd1306Ascii_menu.h

@@ -6,44 +6,49 @@
 
     All the variables you may need access to are marked extern in this file for easy
     use elsewhere.
-*/
+ */
 
 #ifndef MENU_GENERATED_CODE_H
 #define MENU_GENERATED_CODE_H
 
 #include <Arduino.h>
 #include <tcMenu.h>
 #include <SSD1306Ascii.h>
-#include <RuntimeMenuItem.h>
 #include <SSD1306AsciiAvrI2c.h>
 #include "ssd1306asciiRenderer.h"
 #include <DfRobotInputAbstraction.h>
+#include <RuntimeMenuItem.h>
 
 void setupMenu();  // forward reference of the menu setup function.
-extern const PROGMEM ConnectorLocalInfo applicationInfo;  // defines the app info to the linker.
+extern const PROGMEM ConnectorLocalInfo applicationInfo;  // contains app name and ID
 
 // Global variables that need exporting
 
 extern SSD1306AsciiAvrI2c gfx;
 extern SSD1306AsciiRenderer renderer;
 
-// Callback functions must always include CALLBACK_FUNCTION after the return type
-#define CALLBACK_FUNCTION
-
 // Global Menu Item exports
 
-int fnListItemRtCall(RuntimeMenuItem * item, uint8_t row, RenderFnMode mode, char * buffer, int bufferSize);
 extern ListRuntimeMenuItem menuListItem;
 extern AnalogMenuItem menuStatusTemprature;
 extern FloatMenuItem menuStatusVoltageIn;
 extern FloatMenuItem menuStatusPowerUse;
+extern BackMenuItem menuBackStatus;
 extern SubMenuItem menuStatus;
-void CALLBACK_FUNCTION onActionPressed(int id);
 extern ActionMenuItem menuPressMe;
 extern BooleanMenuItem menuStandby;
 extern AnalogMenuItem menuBlue;
 extern AnalogMenuItem menuGreen;
 extern AnalogMenuItem menuRed;
 extern AnalogMenuItem menuBrightness;
 
+// Provide a wrapper to get hold of the root menu item
+inline MenuItem& rootMenuItem() { return menuBrightness; }
+
+// Callback functions must always include CALLBACK_FUNCTION after the return type
+#define CALLBACK_FUNCTION
+
+int fnListItemRtCall(RuntimeMenuItem* item, uint8_t row, RenderFnMode mode, char* buffer, int bufferSize);
+void CALLBACK_FUNCTION onActionPressed(int id);
+
 #endif // MENU_GENERATED_CODE_H