Merge branch 'ESPWortuhr:main' into Add-options-for-vertical,-extra-led-and-meander-layout

Author: BastiMu

include/Transitiontypes/Transition.h

@@ -198,7 +198,7 @@ class Transition {
     //------------------------------------------------------------------------------
     // Loop Helper Functions
     //------------------------------------------------------------------------------
-    void demoMode(uint8_t &_minute, uint8_t _second);
+    void demoMode(uint8_t &_hour, uint8_t &_minute, uint8_t _second);
     void initTransitionStart();
     bool hasMinuteChanged();
     bool isOverwrittenByTransition(WordclockChanges flag, uint8_t minute);

include/Transitiontypes/Transition.hpp

@@ -1110,16 +1110,34 @@ uint16_t Transition::transitionSnake() {
 // Loop Helper Functions
 //------------------------------------------------------------------------------
 
-void Transition::demoMode(uint8_t &_minute, uint8_t _second) {
-    static uint8_t test_second = 0;
-    static uint8_t test_minute = 45;
+void Transition::demoMode(uint8_t &_hour, uint8_t &_minute, uint8_t _second) {
+    static uint8_t test_second = _second;
+    static uint8_t test_minute = _minute;
+    static uint8_t test_hour = _hour;
     if (G.transitionDemo) {
-        if (isIdle() && ((_second % 10) == 0) && (test_second != _second)) {
-            test_minute += 5;
+        // increment every second
+        // by checking isIdle transitions are completely done
+        if (isIdle() && ((_second % 2) == 0) && (test_second != _second)) {
+            // select increment by clock type
+            if (usedUhrType != nullptr) {
+                if (usedUhrType->hasOnlyQuarterLayout()) {
+                    test_minute += 15;
+                } else if (usedUhrType->has60MinuteLayout()) {
+                    test_minute += 1;
+                } else {
+                    test_minute += 5;
+                }
+            }
+            // add one hour every 60 minutes
             if (test_minute >= 60) {
-                test_minute = _minute % 5;
+                test_minute %= 60;
+                test_hour = (test_hour + 1) % 24;
             }
+            // log demo time
+            Serial.printf("Demo time: %02d:%02d\n", test_hour, test_minute);
         }
+        // set to time variables
+        _hour = test_hour;
         _minute = test_minute;
         test_second = _second;
     }

include/Uhr.h

@@ -286,6 +286,7 @@ enum ClockType {
     Ger11x11 = 3,
     Ger11x11V2 = 8,
     Ger11x11V3 = 14,
+    Ger13x13 = 31,
     Ger22x11Weather = 5,
     Ger16x8 = 13,
     Ger16x18 = 7,

include/Uhrtypes/DE11x11.v2.hpp

@@ -22,6 +22,12 @@
 
 class De11x11V2_t : public De11x11_t {
 public:
+    //------------------------------------------------------------------------------
+
+    virtual const bool hasZwanzig() override { return false; }
+
+    //------------------------------------------------------------------------------
+
     void show(FrontWord word) override {
         switch (word) {