Merge pull request #462 from dbambus/main

Few Fixes for Release Candidate

Author: dbambus

include/Transitiontypes/Transition.hpp

@@ -352,8 +352,8 @@ void Transition::setMinute() {
         }
         for (uint8_t i = 0; i < 4; i++) {
             led.setPixel(minArray[i],
-                         HsbColor{m > i ? foreground : background});
-            // TODO: foregroundMinute
+                         HsbColor{m > i ? foregroundMinute : background});
+            // TODO: fading transition for Minutes
         }
     }
 }
@@ -1023,7 +1023,9 @@ bool Transition::isOverwrittenByTransition(WordclockChanges changesInWordMatrix,
                 initTransitionStart();
             }
             lastMinute = minute;
-            matrixChanged = true;
+            if (changesInWordMatrix != WordclockChanges::Minute) {
+                matrixChanged = true;
+            }
             return false;
         } else {
             if (changeBrightness()) {
@@ -1056,6 +1058,9 @@ void Transition::loop(struct tm &tm) {
 
         if (matrixChanged) {
             matrixChanged = false;
+            if (isColorization() && (G.transitionSpeed > 0)) {
+                copyMatrix(act, work);
+            }
             saveMatrix();
             copyMatrix(work, act);
         }
@@ -1130,6 +1135,10 @@ void Transition::loop(struct tm &tm) {
             copy2Stripe(work);
             if (!specialEvent) {
                 setMinute();
+                if (G.secondVariant != SecondVariant::Off) {
+                    led.setbySecondArray();
+                    // Workaround: setbySecoundArray not in 'work'
+                }
             }
             led.show();
         }

include/Uhr.h

@@ -92,7 +92,7 @@ enum class WordclockChanges {
 };
 
 struct GLOBAL {
-    uint8_t sernr;
+    uint16_t sernr;
     uint16_t prog;
     uint8_t param1;
     bool progInit;

include/clockWork.hpp

@@ -253,7 +253,8 @@ void ClockWork::scrollingText(const char *buf) {
     led.show();
 
     i++;
-    if (i >= pgm_read_byte(&(fontWidth[normalSizeASCII]))) {
+    if (i >= pgm_read_byte(&(fontWidth[normalSizeASCII])) + 1) // +1 for spacing
+    {
         i = 0;
         ii++;
         if (ii >= strlen(buf)) {

include/config.h

@@ -151,7 +151,7 @@
  * NeutralWhite (4300K) or ColdWhite (6500K)), in the case of RGB just leave it
  * at NeutralWhite.
  *
- * Valid values for DEFAULT_LEDTYPE [Brg, Grb, Rgb, Rbg, Grbw]
+ * Valid values for DEFAULT_LEDTYPE [Brg, Grb, Rgb, Rbg, Gbr, Grbw]
  *
  * Valid values for WHITE_LEDTYPE [WarmWhite, NeutralWhite, ColdWhite]
  */
@@ -198,9 +198,9 @@
 /*
  * To delete or initialize the EEPROM, enter another serial number here.
  *
- * Valid values [0 ... 255]
+ * Valid values [0 ... 65536]
  */
-#define SERNR 58
+#define SERNR 400
 //--------------------------------------------------------------------------
 // Toggle Serial DEBUG Output
 //--------------------------------------------------------------------------

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "multilayout-esp-wordclock",
-	"version": "3.4.0",
+	"version": "4.0.0",
 	"description": "For building a german layouted wordclock with an esp8266 module and WS2812/SK2812.",
 	"license": "BSD-3-Clause",
 	"contributors": [