#74 #55 addition of scroll, rgb and runtime sub menus

Submenus can now be created at runtime, and their names can be changed. Scroll provides for enums in EEPROM, RAM and by CUSTOM delegate. RGB items can edit 24 bit colours with optional alpha channel. In progress, tested on AVR.

Author: dave

examples/colorTftEthernet32/colorTftEthernet.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1601464065,
+    "seconds": 1602516900,
     "nanos": 0
   },
   "codeOptions": {
@@ -256,6 +256,61 @@
         "naming": "ON_OFF"
       }
     },
+    {
+      "parentId": 4,
+      "type": "",
+      "item": null
+    },
+    {
+      "parentId": 4,
+      "type": "",
+      "item": null
+    },
+    {
+      "parentId": 4,
+      "type": "subMenu",
+      "item": {
+        "name": "Rom Values",
+        "eepromAddress": -1,
+        "id": 20,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "secured": false
+      }
+    },
+    {
+      "parentId": 20,
+      "type": "",
+      "item": null
+    },
+    {
+      "parentId": 20,
+      "type": "textItem",
+      "item": {
+        "name": "Item Text",
+        "eepromAddress": -1,
+        "id": 21,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "itemType": "PLAIN_TEXT",
+        "textLength": 10
+      }
+    },
+    {
+      "parentId": 20,
+      "type": "actionMenu",
+      "item": {
+        "name": "Save item",
+        "eepromAddress": -1,
+        "id": 23,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true,
+        "functionName": "onSaveItem"
+      }
+    },
     {
       "parentId": 0,
       "type": "subMenu",

examples/colorTftEthernet32/colorTftEthernet32.ino

@@ -223,3 +223,11 @@ void CALLBACK_FUNCTION onTakeDisplay(int id) {
     starting = true;
     renderer.takeOverDisplay(myRenderCallback);
 }
+
+void CALLBACK_FUNCTION onRgbChanged(int id) {
+    // TODO - your menu change code
+}
+
+void CALLBACK_FUNCTION onSaveItem(int id) {
+    // TODO - your menu change code
+}

examples/colorTftEthernet32/colorTftEthernet32.ino.backup

@@ -6,6 +6,7 @@
 #include <RemoteMenuItem.h>
 #include <Fonts/FreeSans9pt7b.h>
 #include <Ethernet.h>
+#include <SPI.h>
 
 // contains the graphical widget title components.
 #include "stockIcons/wifiAndConnectionIcons16x12.h"
@@ -24,13 +25,7 @@ byte mac[] = {
   0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED
 };
 
-  #define TFT_CS        6
-  #define TFT_RST       3
-  #define TFT_DC        7
-
-Adafruit_ST7735 gfx = Adafruit_ST7735(TFT_CS, TFT_DC, TFT_RST);
-
-// we also want to customise the colours and menu spacing. So we create this config object too
+// we want to customise the colours and menu spacing. So we create this config object too
 // which we initialise during the setup method.
 AdaColorGfxMenuConfig colorConfig;
 
@@ -48,8 +43,6 @@ IoAbstractionRef io8574 = ioFrom8574(0x20, 0); // on addr 0x20 and interrupt pin
 // and we create an analog device with enhanced range because we are using a 32bit board.
 ArduinoAnalogDevice analogDevice(12, 10);
 
-float fractionsPerUnit;
-
 // Here we create two additional menus, that will be added manually to handle the connectivity
 // status and authentication keys. In a future version these will be added to th desinger.
 RemoteMenuItem menuRemoteMonitor(1001, 2);
@@ -109,10 +102,6 @@ void onCommsChange(CommunicationInfo info) {
 }
 
 void setup() {
-    // we are responsible for setting up the initial graphics
-    gfx.initR(INITR_BLACKTAB);
-    gfx.setRotation(1);
-
     // we used an i2c device (io8574) so must initialise wire too
     Wire.begin();
 
@@ -133,7 +122,6 @@ void setup() {
     // and set up the dac on the 32 bit board.
     analogDevice.initPin(A0, DIR_OUT);
     analogDevice.initPin(A1, DIR_IN);
-    fractionsPerUnit = ((float)analogDevice.getMaximumRange(DIR_IN, A1)) / 5.0;
 
     // we have our own graphics configuration. it must be initialised
     // before calling setupMenu..
@@ -165,8 +153,8 @@ void setup() {
 
     taskManager.scheduleFixedRate(2250, [] {
         Serial.print(".");
-        float a1Value = analogDevice.getCurrentValue(A1);
-        menuVoltA1.setFloatValue(a1Value / fractionsPerUnit);
+        float a1Value = analogDevice.getCurrentFloat(A1);
+        menuVoltA1.setFloatValue(a1Value * 3.3);
     });
 }
 
@@ -175,10 +163,11 @@ void loop() {
 }
 
 void writeToDac() {
-    float volts = menuVoltage.getCurrentValue() / 2.0;
-    float curr = menuCurrent.getCurrentValue() / 100.0;
-    float total = volts * curr;
-    analogDevice.setCurrentValue(A0, (unsigned int)total);
+    float volts = menuVoltage.getAsFloatingPointValue();
+    float curr = menuCurrent.getAsFloatingPointValue();
+    
+    float total = (volts / 64.0) * (curr / 2.0);
+    analogDevice.setCurrentFloat(A0, (unsigned int)total);
     menuVoltA0.setFloatValue(total);
 }
 
@@ -199,12 +188,38 @@ void CALLBACK_FUNCTION onSaveRom(int /*id*/) {
     menuMgr.save(eeprom);
 }
 
+bool starting = true;
 
+void myRenderCallback(unsigned int encoderVal, RenderPressMode pressType) {
+    if(pressType == RPRESS_HELD)
+    {
+        // if the encoder / select button is held, we go back to the menu.
+        renderer.giveBackDisplay();
+    }
+    else if(starting)
+    {
+        // you need to handle the clearing and preparation of the display when you're first called.
+        // the easiest way is to set a flag such as this and then prepare the display.
+        starting = false;
+        switches.getEncoder()->changePrecision(1000, 500);
+        gfx.setCursor(0, 0);
+        gfx.fillRect(0, 0, gfx.width(), gfx.height(), BLACK);
+        gfx.setFont(nullptr);
+        gfx.setTextSize(2);
+        gfx.print("Encoder ");
+    }
+    else
+    {
+        GFXcanvas1 canvas(100, 20);
+        canvas.fillScreen(BLACK);
+        canvas.setCursor(0,0);
+        canvas.print(encoderVal);
+        canvas.setTextSize(2);
+        gfx.drawBitmap(0, 35, canvas.getBuffer(), 100, 20, WHITE, BLACK);
+    }
+}
 
-
-
-
-
-
-
-
+void CALLBACK_FUNCTION onTakeDisplay(int id) {
+    starting = true;
+    renderer.takeOverDisplay(myRenderCallback);
+}

examples/colorTftEthernet32/colorTftEthernet32_menu.cpp

@@ -37,6 +37,14 @@ const SubMenuInfo minfoStatus = { "Status", 7, 0xFFFF, 0, NO_CALLBACK };
 RENDERING_CALLBACK_NAME_INVOKE(fnStatusRtCall, backSubItemRenderFn, "Status", -1, NO_CALLBACK)
 BackMenuItem menuBackStatus(fnStatusRtCall, &menuVoltA0);
 SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuConnectivity);
+const AnyMenuInfo minfoSaveItem = { "Save item", 23, 0xFFFF, 0, onSaveItem };
+ActionMenuItem menuSaveItem(&minfoSaveItem, NULL);
+RENDERING_CALLBACK_NAME_INVOKE(fnItemTextRtCall, textItemRenderFn, "Item Text", -1, NO_CALLBACK)
+TextMenuItem menuItemText(fnItemTextRtCall, 21, 10, &menuSaveItem);
+const SubMenuInfo minfoRomValues = { "Rom Values", 20, 0xFFFF, 0, NO_CALLBACK };
+RENDERING_CALLBACK_NAME_INVOKE(fnRomValuesRtCall, backSubItemRenderFn, "Rom Values", -1, NO_CALLBACK)
+BackMenuItem menuBackRomValues(fnRomValuesRtCall, &menuItemNo);
+SubMenuItem menuRomValues(&minfoRomValues, &menuBackRomValues, NULL);
 const BooleanMenuInfo minfoTempCheck = { "Temp Check", 13, 9, 1, NO_CALLBACK, NAMING_ON_OFF };
 BooleanMenuItem menuTempCheck(&minfoTempCheck, false, NULL);
 const AnyMenuInfo minfoHiddenItem = { "Hidden item", 16, 0xFFFF, 0, NO_CALLBACK };
@@ -46,7 +54,7 @@ BooleanMenuItem menuSCircuitProtect(&minfoSCircuitProtect, false, &menuHiddenIte
 const SubMenuInfo minfoAdvanced = { "Advanced", 11, 0xFFFF, 0, NO_CALLBACK };
 RENDERING_CALLBACK_NAME_INVOKE(fnAdvancedRtCall, backSubItemRenderFn, "Advanced", -1, NO_CALLBACK)
 BackMenuItem menuBackAdvanced(fnAdvancedRtCall, &menuSCircuitProtect);
-SubMenuItem menuAdvanced(&minfoAdvanced, &menuBackAdvanced, NULL);
+SubMenuItem menuAdvanced(&minfoAdvanced, &menuBackAdvanced, &menuRGB);
 const AnyMenuInfo minfoSaveAll = { "Save all", 10, 0xFFFF, 0, onSaveRom };
 ActionMenuItem menuSaveAll(&minfoSaveAll, &menuAdvanced);
 const BooleanMenuInfo minfoPwrDelay = { "Pwr Delay", 5, 0xFFFF, 1, NO_CALLBACK, NAMING_YES_NO };

examples/colorTftEthernet32/colorTftEthernet32_menu.h

@@ -41,6 +41,10 @@ extern SubMenuItem menuConnectivity;
 extern FloatMenuItem menuVoltA1;
 extern FloatMenuItem menuVoltA0;
 extern SubMenuItem menuStatus;
+void CALLBACK_FUNCTION onSaveItem(int id);
+extern ActionMenuItem menuSaveItem;
+extern TextMenuItem menuItemText;
+extern SubMenuItem menuRomValues;
 extern BooleanMenuItem menuTempCheck;
 extern ActionMenuItem menuHiddenItem;
 extern BooleanMenuItem menuSCircuitProtect;

examples/colorTftEthernet32/tcMenuAdaFruitGfx.h

@@ -99,6 +99,16 @@ class AdaGfxDialog : public BaseDialog {
     void drawButton(Adafruit_GFX* gfx, AdaColorGfxMenuConfig* config, const char* title, uint8_t num, bool active);
 };
 
+/**
+ * Provides the extents of the text as a Coord which is easier to work with.
+ * @param graphics the graphics object as a pointer
+ * @param text the text to measure
+ * @param x starting location X
+ * @param y starting location Y
+ * @return the coord object containing width and height
+ */
+Coord textExtents(Adafruit_GFX* graphics, const char* text, int16_t x, int16_t y);
+
 /**
  * The default graphics configuration for Ada GFX that needs no fonts and uses reasonable spacing options
  * for 100 - 150 dpi displays.