extract timeService, add basic dashboard functionality

Author: ModischFabrications

src/controller.h

@@ -1,9 +1,12 @@
 #pragma once
 
 #include "display.h"
+
 #include "modes/clock.h"
 #include "modes/colorwave.h"
+#include "modes/dashboard.h"
 #include "modes/fire.h"
+
 #include "shared/network/WiFiLoginManager.h"
 #include "shared/persistence/persistenceManager.h"
 #include "shared/serialWrapper.h"
@@ -40,19 +43,19 @@ void _toMode(Mode new_mode) {
         break;
     case CLOCK:
         println(F("CLOCK"));
-        Display::clear();
+        Modes_Clock::updateScreen();
         break;
     case DASHBOARD:
         println(F("DASHBOARD"));
-        Display::clear();
+        Modes_Dashboard::updateScreen();
         break;
     case COLORWAVE:
         println(F("COLORWAVE"));
-        Display::clear();
+        Modes_Colorwave::updateScreen();
         break;
     case FIRE:
         println(F("FIRE"));
-        Display::clear();
+        Modes_Fire::updateScreen();
         break;
     default:
         println(F("UNKNOWN, discarding..."));
@@ -120,7 +123,7 @@ void setup() {
     PersistenceManager::registerListener(updateConfig);
 
     Modes_Clock::setup();
-    // TODO DASHBOARD
+    Modes_Dashboard::setup();
     Modes_Colorwave::setup();
     Modes_Fire::setup();
 }
@@ -140,9 +143,7 @@ void loop() {
         Modes_Clock::loop();
         break;
     case DASHBOARD:
-        // TODO pass to dashboard extension
-        Display::printText("Too Cold!\n (TODO)");
-        delay(1000);
+        Modes_Dashboard::loop();
         break;
     case COLORWAVE:
         Modes_Colorwave::loop();

src/main.cpp

@@ -5,17 +5,18 @@
 
 #include "pinout.h"
 
-#include "shared/serialWrapper.h"
 #include "shared/fileServer.h"
 #include "shared/network/WiFiLoginManager.h"
 #include "shared/persistence/persistenceManager.h"
+#include "shared/serialWrapper.h"
+#include "shared/timeService.h"
 
 //#include "inputs/telegram.h"
 #include "inputs/touch.h"
 #include "inputs/website.h"
 
-#include "display.h"
 #include "controller.h"
+#include "display.h"
 
 void setup() {
     delay(0); // watchdog timer (WDT)
@@ -29,14 +30,15 @@ void setup() {
 
     println(F(".prepare outputs."));
     Display::setup();
-    Display::colorDot(Display::blue);   // asap
+    Display::colorDot(Display::blue); // asap
 
     println(F(".prepare connections."));
-    WiFiLoginManager::onConfigNeeded = [] {Display::colorDot(Display::orange);};
+    WiFiLoginManager::onConfigNeeded = [] { Display::colorDot(Display::orange); };
     WiFiLoginManager::setup("ModischMatrix");
     delay(10);
 
     println(F(".prepare inputs."));
+    TimeService::setup();
     Website::setup();
     Input_Touch::setup();
     // Input_Telegram::setup();
@@ -50,11 +52,10 @@ void setup() {
     digitalWrite(Pinout::STATUS_LED, false);
     Display::colorDot(Display::black);
     delay(10);
-    //Controller::showLogin();
 }
 
 void loop() {
-    // impossible to align loop times with variable length web calls!
+    TimeService::loop();
     Input_Touch::loop();
     Controller::loop();
 

src/modes/clock.h

@@ -2,48 +2,35 @@
 
 #include "display.h"
 #include "shared/serialWrapper.h"
-#include "time.h"
+#include "shared/timeService.h"
 #include <Arduino.h>
 
 // maybe morph using https://github.com/hwiguna/HariFun_166_Morphing_Clock/blob/master/Latest/MorphingClock/Digit.cpp
 
 namespace Modes_Clock {
 namespace {
-const char* ntpServer = "pool.ntp.org";
-const long gmtOffset_sec = 3600;
-const int daylightOffset_sec = 3600;
-
 const uint16_t UPDATE_DELAY = 30 * 1000;
 
-struct tm timeinfo;
-void updateLocalTime() {
-    if (!getLocalTime(&timeinfo)) {
-        logError(F("Failed to obtain time"));
-    }
-}
-
 char out[10];
-uint32_t nextUpdate = 0;
-void displayLocalTime() {
-    uint32_t now = millis();
-    if (now < nextUpdate) return;
-    nextUpdate = now + UPDATE_DELAY;
-    strftime(out, sizeof(out), "%H:%M", &timeinfo);
+void updateScreen() {
+    strftime(out, sizeof(out), "%H:%M", &TimeService::timeinfo);
     Display::screen->setTextSize(2);
     Display::screen->setCursor(3, 8);
     Display::screen->clearScreen();
     Display::screen->print(out);
-    print(F("C:"));
-    printlnRaw(out);
+    print(F("."));
 }
 } // namespace
 
-void setup() { configTime(gmtOffset_sec, daylightOffset_sec, ntpServer); }
+void setup() {}
 
+uint32_t nextUpdate = 0;
 void loop() {
-    updateLocalTime();
-    displayLocalTime();
-    delay(100);
+    uint32_t now = millis();
+    if (now < nextUpdate)
+        return;
+    nextUpdate = now + UPDATE_DELAY;
+    updateScreen();
 }
 
 } // namespace Modes_Clock

src/modes/dashboard.h

@@ -0,0 +1,47 @@
+#pragma once
+
+#include "display.h"
+#include "shared/serialWrapper.h"
+#include "shared/timeService.h"
+#include <Arduino.h>
+
+// maybe morph using https://github.com/hwiguna/HariFun_166_Morphing_Clock/blob/master/Latest/MorphingClock/Digit.cpp
+
+namespace Modes_Dashboard {
+namespace {
+const uint16_t UPDATE_DELAY = 30 * 1000;
+
+char out[16];
+void updateScreen() {
+    MatrixPanel_I2S_DMA* s = Display::screen;
+    s->clearScreen();
+    // TODO draw all static background elements as icon
+
+    s->setTextSize(1);
+
+    s->setCursor(4, 4);
+    strftime(out, sizeof(out), "%H:%M", &TimeService::timeinfo);
+    s->print(out);
+
+    s->setCursor(2, 24);
+    strftime(out, sizeof(out), "%d.%m.%Y", &TimeService::timeinfo);
+    s->print(out);
+
+    // TODO weather
+
+    print(F("."));
+}
+} // namespace
+
+void setup() {}
+
+uint32_t nextUpdate = 0;
+void loop() {
+    uint32_t now = millis();
+    if (now < nextUpdate)
+        return;
+    nextUpdate = now + UPDATE_DELAY;
+    updateScreen();
+}
+
+} // namespace Modes_Dashboard

src/shared/timeService.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include "shared/serialWrapper.h"
+#include <Arduino.h>
+#include <time.h>
+
+namespace TimeService {
+// see https://www.cplusplus.com/reference/ctime/strftime/ for formatting hints
+struct tm timeinfo;
+
+namespace {
+const uint16_t UPDATE_DELAY = 30 * 1000;
+
+const char* ntpServer = "pool.ntp.org";
+const long gmtOffset_sec = 3600;
+const int daylightOffset_sec = 3600;
+
+void updateLocalTime() {
+    if (!getLocalTime(&timeinfo)) {
+        logError(F("Failed to obtain time"));
+    }
+}
+} // namespace
+
+void setup() { configTime(gmtOffset_sec, daylightOffset_sec, ntpServer); }
+
+uint32_t nextUpdate = 0;
+void loop() {
+    uint32_t now = millis();
+    if (now < nextUpdate)
+        return;
+    nextUpdate = now + UPDATE_DELAY;
+    updateLocalTime();
+}
+
+} // namespace TimeService