feat: add option to display numerals on clock face

Author: tobiasguyer

eez-ui/gaggimate.eez-project

@@ -186,7 +186,7 @@
         "objID": "61244af5-fae6-4b75-c201-48a56eb93a44",
         "name": "time_container",
         "type": "struct:time_struct",
-        "defaultValue": "{hour : 1, min : 20, sec : 45, analog_numerals : true, time_in_minutes : 120}",
+        "defaultValue": "{hour : 1, min : 20, sec : 45, analog_numerals : false, time_in_minutes : 120}",
         "persistent": false,
         "native": false
       },
@@ -1126,7 +1126,7 @@
                 "conditionalStyles": [],
                 "childStyles": []
               },
-              "hiddenInEditor": true,
+              "hiddenInEditor": false,
               "timeline": [],
               "eventHandlers": [],
               "leftUnit": "px",
@@ -2600,10 +2600,10 @@
             {
               "objID": "dae38c01-474f-419d-d926-11b60701797c",
               "type": "LVGLLabelWidget",
-              "left": 18,
+              "left": 0,
               "top": 92,
-              "width": 241,
-              "height": 15,
+              "width": 260,
+              "height": 14,
               "customInputs": [],
               "customOutputs": [],
               "style": {
@@ -2636,7 +2636,7 @@
                 "definition": {
                   "MAIN": {
                     "DEFAULT": {
-                      "text_font": "rolblox_18",
+                      "text_font": "rolblox _16",
                       "align": "CENTER",
                       "text_color": "NiceWhite"
                     }
@@ -2649,7 +2649,7 @@
               "textType": "expression",
               "longMode": "WRAP",
               "recolor": false,
-              "previewValue": "MONDAY 17.04.2025"
+              "previewValue": "WEDNESDAY 17.04.2025"
             }
           ],
           "widgetFlags": "CLICKABLE|PRESS_LOCK|CLICK_FOCUSABLE|GESTURE_BUBBLE|SNAPPABLE|SCROLL_ELASTIC|SCROLL_MOMENTUM|SCROLL_CHAIN_HOR|SCROLL_CHAIN_VER",
@@ -24967,6 +24967,35 @@
         "symbols": "0123456789 :./-MONDAYTUESWHRFImodayntueswhrfi"
       },
       "embeddedFontFileIndex": 1
+    },
+    {
+      "objID": "81740e94-00f5-4795-e22b-087448f28251",
+      "name": "rolblox _16",
+      "renderingEngine": "LVGL",
+      "source": {
+        "objID": "278d9662-66fb-4162-d483-bad64b7011f1",
+        "filePath": "..\\src\\display\\ui\\default\\RollboxRegular-jE2lv.ttf",
+        "size": 16
+      },
+      "bpp": 8,
+      "threshold": 128,
+      "height": 14,
+      "ascent": 11,
+      "descent": 3,
+      "glyphs": [],
+      "lvglRanges": "",
+      "lvglSymbols": "a0123456789 :./-MONDAYTUESWNHRFFImodayntueswnhrffi",
+      "lvglAdditionalSources": [],
+      "lvglGlyphs": {
+        "encodings": [
+          {
+            "from": 32,
+            "to": 127
+          }
+        ],
+        "symbols": ""
+      },
+      "embeddedFontFileIndex": 1
     }
   ],
   "bitmaps": [

src/display/core/Settings.cpp

@@ -281,6 +281,10 @@ void Settings::setStandbyBinaryClock(bool standby_binary_clock) {
     standbyBinaryClock.set(standby_binary_clock);
 }
 
+void Settings::setStandbyAnalogClockNumerals(bool standby_analog_clock_numerals) {
+    standbyAnalogClockNumerals.set(standby_analog_clock_numerals);
+}
+
 
 void Settings::setDisplayDate(bool display_date){
     displayDate.set(display_date);

src/display/core/Settings.h

@@ -139,6 +139,7 @@ class Settings {
     int getStandbyAnalogClock() const { return standbyAnalogClock.get(); }
     int getStandbyDigitalClock() const { return standbyDigitalClock.get(); }
     bool getStandbyBinaryClock() const { return standbyBinaryClock.get(); }
+    bool getAnalogClockNumerals() const { return standbyAnalogClockNumerals.get(); }
     int getHistoryIndex() const { return historyIndex.get(); }
 
     [[deprecated]]
@@ -246,6 +247,7 @@ class Settings {
     void setStandbyAnalogClock(int standby_analog_clock);
     void setStandbyDigitalClock(int standby_digital_clock);
     void setStandbyBinaryClock(bool standby_binary_clock);
+    void setStandbyAnalogClockNumerals(bool standby_analog_clock_numerals);
     void setDisplayDate(bool display_date);
     void setHistoryIndex(int history_index);
     [[deprecated]]
@@ -349,6 +351,7 @@ class Settings {
     Property<int> standbyAnalogClock{registry, "standby_analog_clock", 1};
     Property<int> standbyDigitalClock{registry, "standby_digital_clock", 1};
     Property<bool> standbyBinaryClock{registry, "standby_binary_clock", false};
+    Property<bool> standbyAnalogClockNumerals{registry, "standby_analog_clock_numerals", false};
     Property<bool> displayDate{registry, "display_date", true};
     // Sunrise settings (r/g/b/w are legacy load-only values that seed the idle color default)
     int sunriseR = 0;

src/display/plugins/WebUIPlugin.cpp

@@ -767,6 +767,7 @@ void WebUIPlugin::handleSettings(AsyncWebServerRequest *request) const {
             if(request->hasArg("standbyAnalogClock"))
                 settings->setStandbyAnalogClock(request->arg("standbyAnalogClock").toInt());
             settings->setStandbyBinaryClock(request->hasArg("standbyBinaryClock"));
+            settings->setStandbyAnalogClockNumerals(request->hasArg("analogClockNumerals"));
             if (request->hasArg("sunriseIdle"))
                 settings->setSunriseIdle(request->arg("sunriseIdle"));
             if (request->hasArg("sunriseActive"))
@@ -905,6 +906,7 @@ void WebUIPlugin::handleSettings(AsyncWebServerRequest *request) const {
     doc["standbyDigitalClock"] = settings.getStandbyDigitalClock();
     doc["standbyAnalogClock"] = settings.getStandbyAnalogClock();
     doc["standbyBinaryClock"] = settings.getStandbyBinaryClock();
+    doc["analogClockNumerals"] = settings.getAnalogClockNumerals();
     doc["displayDate"] = settings.getDisplayDate();
     doc["sunriseIdle"] = settings.getSunriseIdle();
     doc["sunriseActive"] = settings.getSunriseActive();

src/display/ui/default/DefaultUI.cpp

@@ -619,7 +619,7 @@ void DefaultUI::updateSystemStatus() {
     systemStatus.standby_analog_clock(settings.getStandbyAnalogClock());
     systemStatus.standby_digital_clock(settings.getStandbyDigitalClock());
     systemStatus.standby_binary_clock(settings.getStandbyBinaryClock());
-
+    time_container.analog_numerals(settings.getAnalogClockNumerals());
 
     char timeBuf[40] = "";
     struct tm timeinfo;

src/display/ui/default/eez/.eez-project-build

@@ -6,6 +6,7 @@
     "fonts.h",
     "fonts/ui_font_montserrat_b_120.c",
     "fonts/ui_font_rolblox_18.c",
+    "fonts/ui_font_rolblox__16.c",
     "fonts/ui_font_rolbox_90.c",
     "fonts/ui_font_seg7_80.c",
     "images.c",

src/display/ui/default/eez/fonts.h

@@ -11,6 +11,7 @@ extern const lv_font_t ui_font_seg7_80;
 extern const lv_font_t ui_font_rolbox_90;
 extern const lv_font_t ui_font_montserrat_b_120;
 extern const lv_font_t ui_font_rolblox_18;
+extern const lv_font_t ui_font_rolblox__16;
 
 #ifndef EXT_FONT_DESC_T
 #define EXT_FONT_DESC_T