Merge pull request #196 from dbambus/main

Updates for Version 2.7.0
ESPWortuhr · Feb 5, 2023 · f2e6414 · f2e6414
2 parents 5e3240a + 3e6cc98
commit f2e6414
Show file tree

Hide file tree

Showing 96 changed files with 46,374 additions and 13,391 deletions.
diff --git a/include/Animation.h b/include/Animation.h
@@ -167,6 +167,7 @@ class Animation {
     void saveMatrix();
     void analyzeColors(RgbfColor **dest, RgbfColor **source,
                        RgbfColor &foreground, RgbfColor &background);
+    uint8_t determineWhichMinuteVariant();
     void set_minutes(void);
     void copy2Stripe(RgbfColor **source);
     void copyMatrix(RgbfColor **dest, RgbfColor **source);

diff --git a/include/Animation.hpp b/include/Animation.hpp
@@ -289,11 +289,28 @@ void Animation::analyzeColors(RgbfColor **dest, RgbfColor **source,
 
 //------------------------------------------------------------------------------
 
+uint8_t Animation::determineWhichMinuteVariant() {
+    switch (G.minuteVariant) {
+    case MinuteVariant::Row:
+        return 0;
+        break;
+    case MinuteVariant::Corners:
+        return 1;
+        break;
+    default:
+        Serial.println("[ERROR] G.minuteVariant undefined");
+        return 0;
+        break;
+    }
+}
+
+//------------------------------------------------------------------------------
+
 void Animation::set_minutes() {
-    if (G.minuteVariant > 0) {
+    if (G.minuteVariant != MinuteVariant::Off) {
         uint8_t m = lastMinute % 5;
         uint16_t minArray[4];
-        usedUhrType->getMinArr(minArray, G.minuteVariant - 1);
+        usedUhrType->getMinArr(minArray, determineWhichMinuteVariant());
         if (G.layoutVariant[ReverseMinDirection]) {
             std::reverse(std::begin(minArray), std::end(minArray));
         }
@@ -954,7 +971,7 @@ uint16_t Animation::animFade() {
 
 uint16_t Animation::animMatrixRain() {
     uint16_t frames = 100;
-    uint8_t row, col;
+    int8_t row, col;
     RgbfColor fadeColor;
     RgbaColor rainColor;
 

diff --git a/include/Uhr.h b/include/Uhr.h
@@ -48,6 +48,13 @@ struct OpenWeatherMapData {
     char cityid[8];
 };
 
+enum class MinuteVariant {
+    Off = 0,
+    Corners = 1,
+    Row = 2,
+    InWords = 3,
+};
+
 struct GLOBAL {
     uint8_t sernr;
     uint16_t prog;
@@ -63,7 +70,7 @@ struct GLOBAL {
     uint8_t effectSpeed;
     uint8_t client_nr;
     uint8_t secondVariant;
-    uint8_t minuteVariant;
+    MinuteVariant minuteVariant;
     bool languageVariant[6];
     bool layoutVariant[1];
     char timeserver[PAYLOAD_LENGTH];
@@ -144,7 +151,7 @@ enum LanguageDialects {
     ItIs40 = 2,
     ItIs45 = 3,
     NotShowItIs = 4,
-    ENG_Aquarter = 5,
+    EN_ShowAQuarter = 5,
 };
 
 enum LayoutVariants {
@@ -204,7 +211,7 @@ enum ClockType {
     Nl10x11 = 9,
     Ger11x11 = 3,
     Ger11x11V2 = 8,
-    Ger10x11Frame = 4,
+    Ger11x11Frame = 4,
     Ger21x11Weather = 5,
     Ger17x17 = 7,
     Eng10x11 = 10,