#134 ensure that 1dp large numbers work as expected

Author: dave

examples/esp32SimHub/esp32SimHub.emf

@@ -105,12 +105,12 @@
       "parentId": 4,
       "type": "analogItem",
       "item": {
-        "maxValue": 100,
-        "offset": 0,
+        "maxValue": 255,
+        "offset": -180,
         "divisor": 2,
-        "unitName": "",
+        "unitName": "dB",
         "name": "Test Item 1",
-        "variableName": "",
+        "variableName": "SettingsTestItem1",
         "id": 5,
         "eepromAddress": -1,
         "readOnly": false,
@@ -175,6 +175,22 @@
         "visible": true
       }
     },
+    {
+      "parentId": 4,
+      "type": "largeNumItem",
+      "item": {
+        "digitsAllowed": 4,
+        "decimalPlaces": 1,
+        "negativeAllowed": true,
+        "name": "New Large Number",
+        "variableName": "SettingsNewLargeNumber",
+        "id": 15,
+        "eepromAddress": -1,
+        "readOnly": false,
+        "localOnly": false,
+        "visible": true
+      }
+    },
     {
       "parentId": 0,
       "type": "enumItem",
@@ -283,6 +299,11 @@
         "latestValue": "-1",
         "subsystem": "DISPLAY"
       },
+      {
+        "name": "ST7735_TAB_TYPE",
+        "latestValue": "INITR_BLACKTAB",
+        "subsystem": "DISPLAY"
+      },
       {
         "name": "DISPLAY_ROTATION",
         "latestValue": "1",

examples/esp32SimHub/esp32SimHub.ino

@@ -28,6 +28,7 @@
  * Touch Up=5, Down=7, Sel=6
  */
 
+#include <Adafruit_ILI9341.h>
 #include "esp32SimHub_menu.h"
 #include <Wire.h>
 #include <IoLogging.h>
@@ -72,6 +73,13 @@ void setup() {
 
     menuGear.setTextValue("N");
 
+    //menuSettingsNewLargeNumber.setLargeNumberFromString("12.1");
+    auto largeNum = menuSettingsNewLargeNumber.getLargeNumber();
+    //largeNum->setFromFloat(12.1f);
+    largeNum->setValue(12, 1, false);
+    //menuSettingsNewLargeNumber.setLargeNumberFromString("12.1");
+    menuSettingsTestItem1.setFromFloatingPointValue(21.5F);
+
     analogDevice.initPin(dacPin, DIR_OUT);
     taskManager.scheduleFixedRate(10, [] {
         ledLevel += ledAdjustment;

examples/esp32SimHub/esp32SimHub_menu.cpp

@@ -35,15 +35,17 @@ const char enumStrDashboard_2[] PROGMEM = "Custom";
 const char* const enumStrDashboard[] PROGMEM  = { enumStrDashboard_0, enumStrDashboard_1, enumStrDashboard_2 };
 const PROGMEM EnumMenuInfo minfoDashboard = { "Dashboard", 8, 0xffff, 2, onDashChanged, enumStrDashboard };
 EnumMenuItem menuDashboard(&minfoDashboard, 0, &menuLap);
+RENDERING_CALLBACK_NAME_INVOKE(fnSettingsNewLargeNumberRtCall, largeNumItemRenderFn, "New Large Number", -1, NO_CALLBACK)
+EditableLargeNumberMenuItem menuSettingsNewLargeNumber(fnSettingsNewLargeNumberRtCall, 15, 4, 1, true, NULL);
 const PROGMEM char pgmStrSettingsIoTMonitorText[] = { "IoT Monitor" };
-RemoteMenuItem menuSettingsIoTMonitor(pgmStrSettingsIoTMonitorText, 14, NULL);
+RemoteMenuItem menuSettingsIoTMonitor(pgmStrSettingsIoTMonitorText, 14, &menuSettingsNewLargeNumber);
 RENDERING_CALLBACK_NAME_INVOKE(fnSettingsLargeTestRtCall, largeNumItemRenderFn, "LargeTest", -1, NO_CALLBACK)
 EditableLargeNumberMenuItem menuSettingsLargeTest(fnSettingsLargeTestRtCall, 13, 12, 4, true, &menuSettingsIoTMonitor);
 const PROGMEM BooleanMenuInfo minfoSettingsOverboost = { "Overboost", 12, 0xffff, 1, NO_CALLBACK, NAMING_ON_OFF };
 BooleanMenuItem menuSettingsOverboost(&minfoSettingsOverboost, false, &menuSettingsLargeTest);
 const PROGMEM AnyMenuInfo minfoSettingsShowDialogs = { "Show Dialogs", 11, 0xffff, 0, onShowDialogs };
 ActionMenuItem menuSettingsShowDialogs(&minfoSettingsShowDialogs, &menuSettingsOverboost);
-const PROGMEM AnalogMenuInfo minfoSettingsTestItem1 = { "Test Item 1", 5, 0xffff, 100, NO_CALLBACK, 0, 2, "" };
+const PROGMEM AnalogMenuInfo minfoSettingsTestItem1 = { "Test Item 1", 5, 0xffff, 255, NO_CALLBACK, -180, 2, "dB" };
 AnalogMenuItem menuSettingsTestItem1(&minfoSettingsTestItem1, 0, &menuSettingsShowDialogs);
 RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRtCall, backSubItemRenderFn, "Settings", -1, NO_CALLBACK)
 const PROGMEM SubMenuInfo minfoSettings = { "Settings", 4, 0xffff, 0, NO_CALLBACK };

examples/esp32SimHub/esp32SimHub_menu.h

@@ -16,9 +16,9 @@
 #include "tcMenuAdaFruitGfx.h"
 #include "ESP32TouchKeysAbstraction.h"
 #include "SimhubConnector.h"
-#include <RemoteMenuItem.h>
 #include <RuntimeMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
+#include <RemoteMenuItem.h>
 #include <IoAbstraction.h>
 
 // variables we declare that you may need to access
@@ -38,6 +38,7 @@ extern const GFXfont FreeSans12pt7b;
 extern ActionMenuItem menuShowDashboard;
 extern AnalogMenuItem menuLap;
 extern EnumMenuItem menuDashboard;
+extern EditableLargeNumberMenuItem menuSettingsNewLargeNumber;
 extern RemoteMenuItem menuSettingsIoTMonitor;
 extern EditableLargeNumberMenuItem menuSettingsLargeTest;
 extern BooleanMenuItem menuSettingsOverboost;

src/tcUtil.cpp

@@ -28,6 +28,7 @@ long dpToDivisor(int dp) {
         case 3: return 1000;
         case 2: return 100;
         case 1: return 10;
+        case 0: return 1;
         default:
         case 9: return 1000000000L;
     }

tests/tcMenuCoreTests/LargeNumberItemTests.cpp

@@ -282,4 +282,25 @@ test(LargeNumWithNegativeNotAllowed) {
     assertStringCaseEqual("15265", sz);
 }
 
+test(LargeNumberWithOneDecimalPlace) {
+    EditableLargeNumberMenuItem editable(largeNumTestCb, 101, 4, 1, false);
+    editable.setLargeNumberFromString("12.1");
+    assertEqual(editable.getLargeNumber()->getWhole(), (uint32_t)12);
+    assertEqual(editable.getLargeNumber()->getFraction(), (uint32_t)1);
+    assertNear(editable.getLargeNumber()->getAsFloat(), 12.1F, 0.00001);
+    assertFalse(editable.getLargeNumber()->isNegative());
+
+    editable.getLargeNumber()->setFromFloat(14.1F);
+    assertEqual(editable.getLargeNumber()->getWhole(), (uint32_t)14);
+    assertEqual(editable.getLargeNumber()->getFraction(), (uint32_t)1);
+    assertNear(editable.getLargeNumber()->getAsFloat(), 14.1F, 0.00001);
+    assertFalse(editable.getLargeNumber()->isNegative());
+
+    editable.getLargeNumber()->setValue(13, 5, false);
+    assertEqual(editable.getLargeNumber()->getWhole(), (uint32_t)13);
+    assertEqual(editable.getLargeNumber()->getFraction(), (uint32_t)5);
+    assertNear(editable.getLargeNumber()->getAsFloat(), 13.5F, 0.00001);
+    assertFalse(editable.getLargeNumber()->isNegative());
+}
+
 #endif // LARGE_NUMBER_ITEM_TESTS_H