Merge pull request #209 from dbambus/main

Changed filenames of Weather and 24h layout
ESPWortuhr · Mar 1, 2023 · b7d9c95 · b7d9c95
2 parents d1fb4f5 + 9c18f64
commit b7d9c95
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/include/Uhr.h b/include/Uhr.h
@@ -224,8 +224,8 @@ enum ClockType {
     Ger11x11 = 3,
     Ger11x11V2 = 8,
     Ger11x11Frame = 4,
-    Ger21x11Weather = 5,
-    Ger17x17 = 7,
+    Ger22x11Weather = 5,
+    Ger16x18 = 7,
     Nl10x11 = 9,
 };
 

diff --git a/include/Uhrtypes/DE17x17.hpp → include/Uhrtypes/DE16x18.hpp b/include/Uhrtypes/DE17x17.hpp → include/Uhrtypes/DE16x18.hpp
@@ -24,7 +24,7 @@
  *
  */
 
-class De17x17_t : public iUhrType {
+class De16x18_t : public iUhrType {
 public:
     virtual LanguageAbbreviation usedLang() override {
         return LanguageAbbreviation::DE;
@@ -486,4 +486,4 @@ class De17x17_t : public iUhrType {
     };
 };
 
-De17x17_t _de17x17;
+De16x18_t _de16x18;
diff --git a/include/Uhrtypes/DE21x11.weather.hpp → include/Uhrtypes/DE22x11.weather.hpp b/include/Uhrtypes/DE21x11.weather.hpp → include/Uhrtypes/DE22x11.weather.hpp
@@ -30,7 +30,7 @@
  * D R E I ẞ I G O ° C X
  */
 
-class De21x11Weather_t : public iUhrType {
+class De22x11Weather_t : public iUhrType {
 public:
     virtual LanguageAbbreviation usedLang() override {
         return LanguageAbbreviation::DE;
@@ -600,4 +600,4 @@ class De21x11Weather_t : public iUhrType {
     };
 };
 
-De21x11Weather_t _de21x11Weather;
+De22x11Weather_t _de22x11Weather;
diff --git a/include/clockWork.hpp b/include/clockWork.hpp
@@ -676,10 +676,10 @@ iUhrType *ClockWork::getPointer(uint8_t type) {
         return &_de11x11V2;
     case Ger11x11Frame:
         return &_de11x11frame;
-    case Ger21x11Weather:
-        return &_de21x11Weather;
-    case Ger17x17:
-        return &_de17x17;
+    case Ger22x11Weather:
+        return &_de22x11Weather;
+    case Ger16x18:
+        return &_de16x18;
     case Eng10x11:
         return &_en10x11;
     default:

diff --git a/include/config.h b/include/config.h
@@ -40,11 +40,14 @@
 // Same Layout as Ger11x11, but with additional LED's to illuminate the frame
 // from the side
 //
-// #define DEFAULT_LAYOUT Ger21x11Weather
-// clock with weather forecast 242 LED's
+// #define DEFAULT_LAYOUT Ger22x11Weather
+// 22 rows, each 11 LED's per row, with weather forecast on overall 242 LED's
+// based on design of Github user @Eisbaeeer
+//
+// #define DEFAULT_LAYOUT Ger16x18
+// 16 rows, each 18 LED's per row, with the layout WordClock24h of
+// mikrocontroller.net
 //
-// #define DEFAULT_LAYOUT Ger17x17
-// Clock with 24 hours display 18x16
 //
 /**********************/
 /*       Dutch        */

diff --git a/webpage/index.html b/webpage/index.html
@@ -183,8 +183,8 @@ <h2>Front</h2>
                                 <option value="3">DE 11x11</option>
                                 <option value="8">DE 11x11 v2</option>
                                 <option value="4">DE 11x11 Frame</option>
-                                <option value="5">DE 21x11 Weather</option>
-                                <option value="7">DE 17x17 </option>
+                                <option value="5">DE 22x11 Weather</option>
+                                <option value="7">DE 16x18 </option>
                                 <option value="10">EN 10x11</option>
                                 <option value="9">NL 10x11</option>
                             </select>