feat: Add Display Date option to Standby settings

Author: tobiasguyer

eez-ui/gaggimate.eez-project

@@ -108,6 +108,7 @@ Settings::Settings() {
     standbyAnalogClock = preferences.getInt("sanalog", 1);
     standbyDigitalClock = preferences.getInt("sdigital", 1);
     standbyBinaryClock = preferences.getBool("sbinary", false);
+    displayDate = preferences.getBool("sdate", false);
 
     // Sunrise settings
     sunriseR = preferences.getInt("sr_r", 0);
@@ -459,6 +460,12 @@ void Settings::setStandbyBinaryClock(bool standby_binary_clock) {
     save();
 }
 
+
+void Settings::setDisplayDate(bool display_date){
+    displayDate = display_date;
+    save();
+}
+
 void Settings::setHistoryIndex(int history_index) {
     historyIndex = history_index;
     save();
@@ -648,6 +655,7 @@ void Settings::doSave() {
     preferences.putInt("sanalog", standbyAnalogClock);
     preferences.putBool("sdigital", standbyDigitalClock);
     preferences.putBool("sbinary", standbyBinaryClock);
+    preferences.putInt("sdate", displayDate);
 
     // Sunrise Settings
     preferences.putString("sr_i", sunriseIdle);

src/display/core/Settings.cpp

@@ -94,6 +94,7 @@ class Settings {
     bool isMomentaryButtons() const { return momentaryButtons; }
     String getTimezone() const { return timezone; }
     bool isClock24hFormat() const { return clock24hFormat; }
+    bool getDisplayDate() const { return displayDate; }
     String getSelectedProfile() const { return selectedProfile; }
     String getStartupProfile() const { return startupProfile; }
     const std::vector<String> &getFavoritedProfiles() const { return favoritedProfiles; }
@@ -211,6 +212,7 @@ class Settings {
     void setStandbyAnalogClock(int standby_analog_clock);
     void setStandbyDigitalClock(int standby_digital_clock);
     void setStandbyBinaryClock(bool standby_binary_clock);
+    void setDisplayDate(bool display_date);
     void setHistoryIndex(int history_index);
     [[deprecated]]
     void setSunriseR(int sunrise_r);
@@ -304,6 +306,7 @@ class Settings {
     int standbyAnalogClock = 1;
     int standbyDigitalClock = 1;
     bool standbyBinaryClock = false;
+    bool displayDate = true;
     // Sunrise settings
     int sunriseR = 0;
     int sunriseG = 0;

src/display/core/Settings.h

@@ -689,6 +689,7 @@ void WebUIPlugin::handleSettings(AsyncWebServerRequest *request) const {
             settings->setStandbyLogo(request->hasArg("standbyLogo"));
             settings->setStandbyStatus(request->hasArg("standbyStatus"));
             settings->setStandbyTouchIcon(request->hasArg("standbyTouchIcon"));
+            settings->setDisplayDate(request->hasArg("displayDate"));
             if(request->hasArg("standbyDigitalClock"))
                 settings->setStandbyDigitalClock(request->arg("standbyDigitalClock").toInt());
             if(request->hasArg("standbyAnalogClock"))
@@ -824,6 +825,7 @@ void WebUIPlugin::handleSettings(AsyncWebServerRequest *request) const {
     doc["standbyDigitalClock"] = settings.getStandbyDigitalClock();
     doc["standbyAnalogClock"] = settings.getStandbyAnalogClock();
     doc["standbyBinaryClock"] = settings.getStandbyBinaryClock();
+    doc["displayDate"] = settings.getDisplayDate();
     doc["sunriseIdle"] = settings.getSunriseIdle();
     doc["sunriseActive"] = settings.getSunriseActive();
     doc["sunriseFinished"] = settings.getSunriseFinished();

src/display/plugins/WebUIPlugin.cpp

@@ -567,12 +567,14 @@ void DefaultUI::updateSystemStatus() {
     systemStatus.standby_binary_clock(settings.getStandbyBinaryClock());
 
 
-    //char timeBuf[12] = "";
+    char timeBuf[40] = "";
     struct tm timeinfo;
     int hour, min, sec;
     if (getLocalTime(&timeinfo, 5)) {
-        //const ::Settings &settings = controller->getSettings();
-        //strftime(timeBuf, sizeof(timeBuf), settings.isClock24hFormat() ? "%H:%M" : "%I:%M %p", &timeinfo);
+        const ::Settings &settings = controller->getSettings();
+        if(settings.getDisplayDate())
+            strftime(timeBuf, sizeof(timeBuf), "%A %d.%m.%Y", &timeinfo);
+
         hour = timeinfo.tm_hour % 12;
         min = timeinfo.tm_min;
         sec = timeinfo.tm_sec;
@@ -581,6 +583,7 @@ void DefaultUI::updateSystemStatus() {
     time_container.min(min);
     time_container.sec(sec);
     time_container.time_in_minutes(hour * 60 + min);
+    time_container.date(timeBuf);
 }
 
 static void populateProfileInfo(ProfileInfoValue &info, const Profile &profile, bool isCurrent) {

src/display/ui/default/DefaultUI.cpp

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

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

@@ -10,6 +10,7 @@ extern "C" {
 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;
 
 #ifndef EXT_FONT_DESC_T
 #define EXT_FONT_DESC_T