#161 fixes for large number and core renderer

Author: davetcc

examples/arduino32/simpleU8g2/ThemeMonoBordered.h

@@ -8,6 +8,7 @@ color_t defaultItemPaletteMono[] = {1, 0, 1, 1};
 
 void installMonoBorderedTheme(GraphicsDeviceRenderer& bgr, const MenuFontDef& itemFont, const MenuFontDef& titleFont, bool needEditingIcons) {
     bgr.setDisplayDimensions(bgr.getDeviceDrawable()->getDisplayDimensions().x, bgr.getDeviceDrawable()->getDisplayDimensions().y);
+
     auto& factory = bgr.getGraphicsPropertiesFactory();
 
     factory.setSelectedColors(0, 1);

examples/arduino32/simpleU8g2/simpleU8g2.emf

@@ -146,6 +146,83 @@
         "localOnly": false,
         "visible": true
       }
+    },
+    {
+      "parentId": 0,
+      "type": "subMenu",
+      "item": {
+        "secured": false,
+        "name": "Extras",
+        "variableName": "Extras",
+        "id": 10,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
+    },
+    {
+      "parentId": 10,
+      "type": "rgbItem",
+      "defaultValue": "#DD55EEFF",
+      "item": {
+        "includeAlphaChannel": false,
+        "name": "RGB",
+        "variableName": "ExtrasRGB",
+        "id": 11,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
+    },
+    {
+      "parentId": 10,
+      "type": "textItem",
+      "defaultValue": "192.168.0.0",
+      "item": {
+        "textLength": 5,
+        "itemType": "IP_ADDRESS",
+        "name": "Ip",
+        "variableName": "ExtrasIp",
+        "id": 12,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
+    },
+    {
+      "parentId": 10,
+      "type": "textItem",
+      "defaultValue": "14:00:00",
+      "item": {
+        "textLength": 5,
+        "itemType": "TIME_24H",
+        "name": "Time",
+        "variableName": "ExtrasTime",
+        "id": 13,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
+    },
+    {
+      "parentId": 10,
+      "type": "textItem",
+      "defaultValue": "2022/1/1",
+      "item": {
+        "textLength": 5,
+        "itemType": "GREGORIAN_DATE",
+        "name": "Date",
+        "variableName": "ExtrasDate",
+        "id": 14,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
     }
   ],
   "codeOptions": {

examples/arduino32/simpleU8g2/simpleU8g2.ino

@@ -22,6 +22,8 @@ void setup() {
     Wire.begin();
     Serial.begin(115200);
 
+    serlogF(SER_DEBUG, "Starting simple U8G2 demo");
+
     // here we initialise the EEPROM class to 512 bytes of storage
     // don't commit often to this, it's in FLASH
     EEPROM.begin(512);
@@ -75,10 +77,9 @@ void CALLBACK_FUNCTION onSaveSettings(int id) {
 
   // here is a brief example of how to show a dialog, usually for information
   // or yes/no answers.
-  auto* dlg = renderer.getDialog();
-  if(dlg && !dlg->isInUse()) {
-    dlg->setButtons(BTNTYPE_NONE, BTNTYPE_OK);
-    dlg->show(pgmCommittedToRom, false);
-    dlg->copyIntoBuffer("just so you know");
-  }
+    withMenuDialogIfAvailable([] (MenuBasedDialog* dlg) {
+        dlg->setButtons(BTNTYPE_NONE, BTNTYPE_OK);
+        dlg->show(pgmCommittedToRom, false);
+        dlg->copyIntoBuffer("just so you know");
+    });
 }

examples/arduino32/simpleU8g2/simpleU8g2_menu.cpp

@@ -20,18 +20,30 @@ U8g2Drawable gfxDrawable(&gfx, &Wire);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
 
 // Global Menu Item declarations
+RENDERING_CALLBACK_NAME_INVOKE(fnExtrasDateRtCall, dateItemRenderFn, "Date", -1, NO_CALLBACK)
+DateFormattedMenuItem menuExtrasDate(fnExtrasDateRtCall, DateStorage(1, 1, 2022), 14, NULL);
+RENDERING_CALLBACK_NAME_INVOKE(fnExtrasTimeRtCall, timeItemRenderFn, "Time", -1, NO_CALLBACK)
+TimeFormattedMenuItem menuExtrasTime(fnExtrasTimeRtCall, TimeStorage(14, 00, 00, 0), 13, (MultiEditWireType)2, &menuExtrasDate);
+RENDERING_CALLBACK_NAME_INVOKE(fnExtrasIpRtCall, ipAddressRenderFn, "Ip", -1, NO_CALLBACK)
+IpAddressMenuItem menuExtrasIp(fnExtrasIpRtCall, IpAddressStorage(192, 168, 0, 0), 12, &menuExtrasTime);
+RENDERING_CALLBACK_NAME_INVOKE(fnExtrasRGBRtCall, rgbAlphaItemRenderFn, "RGB", -1, NO_CALLBACK)
+Rgb32MenuItem menuExtrasRGB(fnExtrasRGBRtCall, RgbColor32(221, 85, 238), 11, false, &menuExtrasIp);
+RENDERING_CALLBACK_NAME_INVOKE(fnExtrasRtCall, backSubItemRenderFn, "Extras", -1, NO_CALLBACK)
+const PROGMEM SubMenuInfo minfoExtras = { "Extras", 10, 0xffff, 0, NO_CALLBACK };
+BackMenuItem menuBackExtras(fnExtrasRtCall, &menuExtrasRGB);
+SubMenuItem menuExtras(&minfoExtras, &menuBackExtras, NULL);
 const PROGMEM AnyMenuInfo minfoSettingsSaveSettings = { "SaveSettings", 9, 0xffff, 0, onSaveSettings };
 ActionMenuItem menuSettingsSaveSettings(&minfoSettingsSaveSettings, NULL);
 RENDERING_CALLBACK_NAME_INVOKE(fnSettingsSerialNumberRtCall, largeNumItemRenderFn, "Serial Number", 7, NO_CALLBACK)
-EditableLargeNumberMenuItem menuSettingsSerialNumber(fnSettingsSerialNumberRtCall, 8, 8, 0, true, LargeFixedNumber(0U, 0U, false), &menuSettingsSaveSettings);
+EditableLargeNumberMenuItem menuSettingsSerialNumber(fnSettingsSerialNumberRtCall, LargeFixedNumber(8, 0, 0U, 0U, false), 8, true, &menuSettingsSaveSettings);
 RENDERING_CALLBACK_NAME_INVOKE(fnSettingsUserNameRtCall, textItemRenderFn, "User Name", 16, onNameChanged)
 TextMenuItem menuSettingsUserName(fnSettingsUserNameRtCall, "", 7, 5, &menuSettingsSerialNumber);
 const PROGMEM BooleanMenuInfo minfoSettingsSafetyLock = { "Safety lock", 6, 15, 1, NO_CALLBACK, NAMING_TRUE_FALSE };
 BooleanMenuItem menuSettingsSafetyLock(&minfoSettingsSafetyLock, false, &menuSettingsUserName);
 RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRtCall, backSubItemRenderFn, "Settings", -1, NO_CALLBACK)
 const PROGMEM SubMenuInfo minfoSettings = { "Settings", 5, 0xffff, 0, NO_CALLBACK };
 BackMenuItem menuBackSettings(fnSettingsRtCall, &menuSettingsSafetyLock);
-SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, NULL);
+SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, &menuExtras);
 const PROGMEM AnyMenuInfo minfoStartToasting = { "Start toasting", 4, 0xffff, 0, onStartToasting };
 ActionMenuItem menuStartToasting(&minfoStartToasting, &menuSettings);
 const PROGMEM BooleanMenuInfo minfoFrozen = { "Frozen", 3, 6, 1, NO_CALLBACK, NAMING_YES_NO };

examples/arduino32/simpleU8g2/simpleU8g2_menu.h

@@ -15,6 +15,7 @@
 #include <tcMenu.h>
 #include "tcMenuU8g2.h"
 #include <RuntimeMenuItem.h>
+#include <ScrollChoiceMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
 #include <IoAbstraction.h>
 #include <ArduinoEEPROMAbstraction.h>
@@ -28,6 +29,12 @@ extern GraphicsDeviceRenderer renderer;
 
 
 // Global Menu Item exports
+extern DateFormattedMenuItem menuExtrasDate;
+extern TimeFormattedMenuItem menuExtrasTime;
+extern IpAddressMenuItem menuExtrasIp;
+extern Rgb32MenuItem menuExtrasRGB;
+extern BackMenuItem menuBackExtras;
+extern SubMenuItem menuExtras;
 extern ActionMenuItem menuSettingsSaveSettings;
 extern EditableLargeNumberMenuItem menuSettingsSerialNumber;
 extern TextMenuItem menuSettingsUserName;

src/BaseRenderers.cpp

@@ -83,7 +83,7 @@ void BaseMenuRenderer::exec() {
     // finally we render the menu if none of the above are true.
 	if(dialog!=nullptr && dialog->isRenderNeeded()) {
 		dialog->dialogRendering(menuMgr.getCurrentRangeValue(), renderFnPressType);
-    } else if(dialog->isInUse()) {
+    } else if(dialog!=nullptr && dialog->isInUse()) {
         displayTakenMode = NOT_TAKEN_OVER;
         render();
     }else if(displayTakenMode == NOT_TAKEN_OVER) {

src/EditableLargeNumberMenuItem.cpp

@@ -89,6 +89,12 @@ void LargeFixedNumber::setFromFloat(float value) {
     setValue(val, frc, neg);
 }
 
+LargeFixedNumber::LargeFixedNumber(int totalDigits, int decimalPointIndex, uint32_t whole, uint32_t fraction, bool negative) {
+    this->totalSize = totalDigits;
+    this->fractionDp = decimalPointIndex;
+    setValue(whole, fraction, negative);
+}
+
 void EditableLargeNumberMenuItem::setLargeNumberFromString(const char* val) {
 	int offset = 0;
 	bool negative = false;

src/EditableLargeNumberMenuItem.h

@@ -32,10 +32,21 @@ class LargeFixedNumber {
     uint8_t fractionDp = 0;
 public:
     /**
-     * Create a default instance with decimal places set to 4 and total size 12.
+     * Create a default instance which needs to be configured before use
      */
     LargeFixedNumber() = default;
-    LargeFixedNumber(uint32_t whole, uint32_t fraction, bool negative) {setValue(whole, fraction, negative);}
+
+    /**
+     * Create a fully populated LargeFixedNumber giving the number of digits and the initial value
+     * @param totalDigits the maximum digits to use
+     * @param decimalPointIndex the number of decimal places
+     * @param whole the whole value expressed as an unsigned integer
+     * @param fraction the fractional part expressed as a unsigned integer
+     * @param negative if the value is positive or negative
+     */
+    LargeFixedNumber(int totalDigits, int decimalPointIndex, uint32_t whole, uint32_t fraction, bool negative);
+
+    LargeFixedNumber(const LargeFixedNumber& other) = default;
     LargeFixedNumber& operator=(const LargeFixedNumber& other) = default;
 
     /**
@@ -48,6 +59,11 @@ class LargeFixedNumber {
 	 */
     int decimalPointIndex() const { return fractionDp; }
 
+    /**
+     * @return the total number of digits it can represent
+     */
+    int getTotalDigits() const { return totalSize; }
+
 	/**
 	 * Set the number of decimal places and optionally the total size then zero out any currently held value. When
 	 * setting this value you should ensure that: fractionDp is not larger than 9, the difference between fractionDp
@@ -167,10 +183,9 @@ class EditableLargeNumberMenuItem : public EditableMultiPartMenuItem {
     LargeFixedNumber data;
     bool negativeAllowed;
 public:
-    EditableLargeNumberMenuItem(RuntimeRenderingFn renderFn, uint16_t id, int maxDigits, int dps, bool allowNeg, const LargeFixedNumber& initial, MenuItem* next = nullptr)
-            : EditableMultiPartMenuItem(MENUTYPE_LARGENUM_VALUE, id, maxDigits + (allowNeg ? 1 : 0), renderFn, next) {
+    EditableLargeNumberMenuItem(RuntimeRenderingFn renderFn, const LargeFixedNumber& initial, uint16_t id, bool allowNeg, MenuItem* next = nullptr)
+            : EditableMultiPartMenuItem(MENUTYPE_LARGENUM_VALUE, id, initial.getTotalDigits() + (allowNeg ? 1 : 0), renderFn, next) {
         data = initial;
-        data.setPrecision(dps, maxDigits);
         negativeAllowed = allowNeg;
     }