Merge pull request #428 from dbambus/main

Minor Fixes for Fr10x11 and Ru10x11
ESPWortuhr · Aug 21, 2024 · c03e327 · c03e327
2 parents 2dbc158 + f6be476
commit c03e327
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/include/Uhrtypes/RO10x11.hpp b/include/Uhrtypes/RO10x11.hpp
@@ -27,7 +27,7 @@ class RO10x11_t : public iUhrType {
 
     //------------------------------------------------------------------------------
 
-    // virtual const bool hasZwanzig() override { return true; }
+    virtual const bool hasZwanzig() override { return true; }
 
     //------------------------------------------------------------------------------
 

diff --git a/include/clockWork.hpp b/include/clockWork.hpp
@@ -549,11 +549,11 @@ void ClockWork::setMinute(uint8_t min, uint8_t &offsetHour, bool &fullHour) {
             usedUhrType->show(FrontWord::nach);
             break;
         case 20:
-            if (hasTwentyAndCheckForUsage() && G.UhrtypeDef == Fr10x11) {
+            if (hasTwentyAndCheckForUsage()) {
                 usedUhrType->show(FrontWord::min_20);
-                } else if (hasTwentyAndCheckForUsage() && G.UhrtypeDef != Fr10x11) {
-                usedUhrType->show(FrontWord::min_20);
-                usedUhrType->show(FrontWord::nach);
+                if (G.UhrtypeDef != Fr10x11) {
+                    usedUhrType->show(FrontWord::nach);
+                }
             } else {
                 usedUhrType->show(FrontWord::min_10);
                 usedUhrType->show(FrontWord::vor);
@@ -566,11 +566,11 @@ void ClockWork::setMinute(uint8_t min, uint8_t &offsetHour, bool &fullHour) {
         case 23:
         case 24:
         case 25:
-            if (usedUhrType->hasTwentyfive()&& G.UhrtypeDef == Fr10x11) {
+            if (usedUhrType->hasTwentyfive()) {
                 usedUhrType->show(FrontWord::min_25);
-                } else if (usedUhrType->hasTwentyfive() && G.UhrtypeDef != Fr10x11) {
-                usedUhrType->show(FrontWord::min_25);
-                usedUhrType->show(FrontWord::nach);
+                if (G.UhrtypeDef != Fr10x11) {
+                    usedUhrType->show(FrontWord::nach);
+                }
             } else {
                 usedUhrType->show(FrontWord::min_5);
                 usedUhrType->show(FrontWord::vor);