Added new Layoutoption for "AlternativeFrame"

ESPWortuhr · Feb 19, 2023 · 42d2208 · 42d2208
1 parent c69d2fb
commit 42d2208
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 0 deletions.
diff --git a/include/Uhr.h b/include/Uhr.h
@@ -216,6 +216,7 @@ enum ClockType {
     Eng10x11 = 10,
     Ger10x11 = 1,
     Ger10x11Alternative = 2,
+    Ger10x11AlternativeFrame = 12,
     Ger10x11Clock = 6,
     Ger10x11Nero = 11,
     Ger11x11 = 3,

diff --git a/include/Uhrtypes/DE10x11.alternative.frame.hpp b/include/Uhrtypes/DE10x11.alternative.frame.hpp
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "DE10x11.alternative.hpp"
+
+/*
+ * Layout Front
+ *
+ * E S K I S T L F Ü N F
+ * Z E H N Z W A N Z I G
+ * D R E I V I E R T E L
+ * N A C H A P P Y V O R
+ * H A L B I R T H D A Y
+ * D R Z W Ö L F Ü N F X
+ * Z E H N E U N D R E I
+ * Z W E I N S I E B E N
+ * E L F V I E R A C H T
+ * S E C H S I U H R Y E
+ *
+ */
+
+#define USE_DREIVIERTEL
+
+class De10x11AlternativeFrame_t : public De10x11Alternative_t {
+public:
+    virtual const uint16_t NUM_PIXELS() override { return 169; };
+
+    //------------------------------------------------------------------------------
+
+    virtual inline const uint16_t NUM_RMATRIX() { return 48; }
+
+    //------------------------------------------------------------------------------
+
+    virtual const bool hasSecondsFrame() override { return true; }
+
+    //------------------------------------------------------------------------------
+
+    virtual const uint16_t getRMatrix(uint16_t index) override {
+        return 114 + index;
+    };
+
+    virtual const void getMinArr(uint16_t *returnArr, uint8_t col) override {
+        for (uint8_t i = 0; i < 4; i++) {
+            returnArr[i] = 114 - (4 - i);
+        }
+    };
+};
+
+De10x11AlternativeFrame_t _de10x11AlternativeFrame;
diff --git a/include/clockWork.hpp b/include/clockWork.hpp
@@ -658,6 +658,8 @@ iUhrType *ClockWork::getPointer(uint8_t type) {
         return &_de10x11;
     case Ger10x11Alternative:
         return &_de10x11Alternative;
+    case Ger10x11AlternativeFrame:
+        return &_de10x11AlternativeFrame;
     case Ger10x11Clock:
         return &_de10x11Clock;
     case Ger10x11Nero:

diff --git a/include/config.h b/include/config.h
@@ -17,6 +17,11 @@
 // 10 rows, each 11 LED's per row + 4 LED's for minutes, with modified
 // layout for extra words in the matrix from the Github user @dbambus
 //
+// #define DEFAULT_LAYOUT Ger10x11AlternativeFrame
+// 10 rows, each 11 LED's per row + 4 LED's (minutes)+ 48 LED's (seconds) in a
+// Frame around with modified layout for extra words in the matrix from the
+// Github user @dbambus
+//
 // #define DEFAULT_LAYOUT Ger10x11Clock
 // 10 rows, each 11 LED's per row + 4 LED's for minutes, with the layout
 // from the original manufacturer

diff --git a/webpage/index.html b/webpage/index.html
@@ -176,6 +176,7 @@ <h2>Frontoptionen</h2>
                                         <label for="front-layout">Wahl der Uhrvariante</label><select name="front-layout" id="front-layout" size="1">
                                         <option value="1" selected>DE 10x11</option>
                                         <option value="2">DE 10x11 Alternative</option>
+                                        <option value="12">DE 10x11 Alternative Frame</option>
                                         <option value="6">DE 10x11 Clock</option>
                                         <option value="11">DE 10x11 Nero</option>
                                         <option value="3">DE 11x11</option>