From 20a866dc2c2f544374ebe34e99497997043c7163 Mon Sep 17 00:00:00 2001
From: Techniccontroller <techniccontroller@gmail.com>
Date: Mon, 30 Dec 2024 16:58:43 +0100
Subject: [PATCH 1/8] add dyn color shift + small refactoring for EEPROM
 handling

---
 data/index.html       |  42 ++++++++-
 ledmatrix.cpp         |  16 ++++
 ledmatrix.h           |   2 +
 wordclock_esp8266.ino | 209 +++++++++++++++++++++++++-----------------
 4 files changed, 182 insertions(+), 87 deletions(-)

diff --git a/data/index.html b/data/index.html
index 595dfb8..e5dd720 100644
--- a/data/index.html
+++ b/data/index.html
@@ -276,6 +276,10 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 				<label for="brightness">Brightness:</label>
 				<input type="range" id="brightness" name="volume" min="10" max="255">
 			</div>
+			<div class="number-container">
+				<label for="colorshiftspeed">Color shift speed:</label>
+				<input type="range" id="colorshiftspeed" name="volume" min="0" max="50">
+			</div>
 			<div class="number-container">
 				<label for="nm_start" style="align-self: flex-start">Nightmode start time: </label> 
 				<input type="time" id="nm_start" name="nm_start" min="00:00" max="23:59">
@@ -317,7 +321,12 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 			<div>
 				<input name= "AutoChange" id="AutoChange" type="checkbox" class="toggle">
 			</div>
-			
+		</div>
+		<div class="checkbox-container" id = "colorshiftcontainer">
+			<label for="ColorShift" style="align-self: flex-start">DynamicColorShift</label>
+			<div>
+				<input name= "ColorShift" id="ColorShift" type="checkbox" class="toggle">
+			</div>
 		</div>
 		
 		<div class="main-container hidden" id="colorcontainer">
@@ -480,10 +489,28 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 							sendCommand("./cmd?stateautochange=0");
 						}
 					});
+
+					var ckb_colorshift = document.querySelector('input[id="ColorShift"]');
+					if(myVar.colorshift == "1") {
+						console.log("colorshift == 1");
+						ckb_colorshift.checked = true;
+					}
+					else {
+						console.log("colorshift == 0");
+						ckb_colorshift.checked = false;
+					}
+					ckb_colorshift.addEventListener('change', () => {
+						if(ckb_colorshift.checked) {
+							sendCommand("./cmd?colorshift=1");
+						} else {
+							sendCommand("./cmd?colorshift=0");
+						}
+					});
 					
 					document.getElementById("nm_start").value = myVar.nightModeStart.replace("-", ":");
 					document.getElementById("nm_end").value = myVar.nightModeEnd.replace("-", ":");
 					document.getElementById("brightness").value = parseInt(myVar.brightness);
+					document.getElementById("colorshiftspeed").value = parseInt(myVar.colorshiftspeed);
 
 					updateDisplay(parseInt(myVar.modeid));
 					console.log(myVar);
@@ -513,20 +540,26 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 					switch(modeid){
 						case 0: // clock
 							document.getElementById("colorcontainer").classList.remove("hidden");
+							document.getElementById("colorshiftcontainer").classList.remove("hidden");
 							break;
 						case 1: // diclock
 							document.getElementById("colorcontainer").classList.remove("hidden");
+							document.getElementById("colorshiftcontainer").classList.add("hidden");
 							break;
 						case 2: // spiral
+							document.getElementById("colorshiftcontainer").classList.add("hidden");
 							break;
 						case 3: // tetris
 							document.getElementById("tetriscontainer").classList.remove("hidden");
+							document.getElementById("colorshiftcontainer").classList.add("hidden");
 							break;
 						case 4: // snake
 							document.getElementById("snakecontainer").classList.remove("hidden");
+							document.getElementById("colorshiftcontainer").classList.add("hidden");
 							break;
 						case 5: // pingping
 							document.getElementById("pongcontainer").classList.remove("hidden");
+							document.getElementById("colorshiftcontainer").classList.add("hidden");
 							break;
 
 					}
@@ -543,14 +576,17 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 			function saveSettings(){
 				var nmStart = document.getElementById("nm_start");
 				var nmEnd = document.getElementById("nm_end");
-				var brightnessElmt = document.getElementById("brightness");
+				var sld_brightness = document.getElementById("brightness");
+				var sld_colorshiftspeed = document.getElementById("colorshiftspeed");
 				var ckb_resetWifi = document.querySelector('input[id="ResetWifi"]');
 				var cmdstr = "./cmd?setting=";
 				cmdstr += nmStart.value.replace(":", "-");
 				cmdstr += "-";
 				cmdstr += nmEnd.value.replace(":", "-");
 				cmdstr += "-";
-				cmdstr += brightnessElmt.value;
+				cmdstr += sld_brightness.value;
+				cmdstr += "-";
+				cmdstr += sld_colorshiftspeed.value;
 				console.log(cmdstr);
 				sendCommand(cmdstr);
 				if(ckb_resetWifi.checked) {
diff --git a/ledmatrix.cpp b/ledmatrix.cpp
index 28935cf..67ffc41 100644
--- a/ledmatrix.cpp
+++ b/ledmatrix.cpp
@@ -104,6 +104,9 @@ void LEDMatrix::setupMatrix()
  */
 void LEDMatrix::setMinIndicator(uint8_t pattern, uint32_t color)
 {
+  if(dynamicColorShiftActivePhase >= 0){
+    color = Wheel(dynamicColorShiftActivePhase);
+  }
   // pattern:
   // 15 -> 1111
   // 14 -> 1110
@@ -134,6 +137,9 @@ void LEDMatrix::setMinIndicator(uint8_t pattern, uint32_t color)
  */
 void LEDMatrix::gridAddPixel(uint8_t x, uint8_t y, uint32_t color)
 {
+  if(dynamicColorShiftActivePhase >= 0){
+    color = Wheel((uint16_t(x + y) * 256 * 2 / (WIDTH*HEIGHT) + dynamicColorShiftActivePhase) % 256);
+  }
   // limit ranges of x and y
   if(x < WIDTH && y < HEIGHT){
     targetgrid[y][x] = color;
@@ -298,4 +304,14 @@ uint16_t LEDMatrix::calcEstimatedLEDCurrent(uint32_t color){
  */
 void LEDMatrix::setCurrentLimit(uint16_t mycurrentLimit){
   currentLimit = mycurrentLimit;
+}
+
+/**
+ * @brief Set dynamic color shift phase (0-255)
+ * 
+ * @param phase phase of the color shift
+ */
+void LEDMatrix::setDynamicColorShiftPhase(int16_t phase)
+{
+  dynamicColorShiftActivePhase = phase;
 }
\ No newline at end of file
diff --git a/ledmatrix.h b/ledmatrix.h
index e30fa75..e130512 100644
--- a/ledmatrix.h
+++ b/ledmatrix.h
@@ -30,6 +30,7 @@ class LEDMatrix{
         void printChar(uint8_t xpos, uint8_t ypos, char character, uint32_t color);
         void setBrightness(uint8_t mybrightness);
         void setCurrentLimit(uint16_t mycurrentLimit);
+        void setDynamicColorShiftPhase(int16_t phase);
 
     private:
 
@@ -38,6 +39,7 @@ class LEDMatrix{
 
         uint8_t brightness;
         uint16_t currentLimit;
+        int16_t dynamicColorShiftActivePhase = -1; // -1: not active, 0-255: active phase shift
 
         // target representation of matrix as 2D array
         uint32_t targetgrid[HEIGHT][WIDTH] = {0};
diff --git a/wordclock_esp8266.ino b/wordclock_esp8266.ino
index 00472e9..26f9792 100644
--- a/wordclock_esp8266.ino
+++ b/wordclock_esp8266.ino
@@ -58,6 +58,8 @@
 #define ADR_MC_GREEN 22
 #define ADR_MC_BLUE 24
 #define ADR_STATE 26
+#define ADR_COLSHIFTSPEED 28
+#define ADR_COLSHIFTACTIVE 29
 
 
 #define NEOPIXELPIN 5       // pin to which the NeoPixels are attached
@@ -102,19 +104,6 @@ enum direction {right, left, up, down};
 #define NUM_STATES 6
 enum ClockState {st_clock, st_diclock, st_spiral, st_tetris, st_snake, st_pingpong};
 const String stateNames[] = {"Clock", "DiClock", "Sprial", "Tetris", "Snake", "PingPong"};
-// PERIODS for each state (different for stateAutoChange or Manual mode)
-const uint16_t PERIODS[2][NUM_STATES] = { { PERIOD_TIMEVISUUPDATE, // stateAutoChange = 0
-                                            PERIOD_TIMEVISUUPDATE, 
-                                            PERIOD_ANIMATION,
-                                            PERIOD_TETRIS, 
-                                            PERIOD_SNAKE,  
-                                            PERIOD_PONG},
-                                          { PERIOD_TIMEVISUUPDATE, // stateAutoChange = 1
-                                            PERIOD_TIMEVISUUPDATE, 
-                                            PERIOD_ANIMATION,
-                                            PERIOD_ANIMATION, 
-                                            PERIOD_ANIMATION,  
-                                            PERIOD_PONG}};
 
 // ports
 const unsigned int localPort = 2390;
@@ -180,6 +169,7 @@ long lastNTPUpdate = millis() - (PERIOD_NTPUPDATE-3000);  // time of last NTP up
 long lastAnimationStep = millis();  // time of last Matrix update
 long lastNightmodeCheck = millis()  - (PERIOD_NIGHTMODECHECK-3000); // time of last nightmode check
 long buttonPressStart = 0;          // time of push button press start 
+uint16_t behaviorUpdatePeriod = PERIOD_TIMEVISUUPDATE; // holdes the period in which the behavior should be updated
 
 // Create necessary global objects
 UDPLogger logger;
@@ -197,12 +187,15 @@ bool nightMode = false;                       // stores state of nightmode
 uint32_t maincolor_clock = colors24bit[2];    // color of the clock and digital clock
 uint32_t maincolor_snake = colors24bit[1];    // color of the random snake animation
 bool apmode = false;                          // stores if WiFi AP mode is active
+bool dynColorShiftActive = true;              // stores if dynamic color shift is active
+uint8_t dynColorShiftPhase = 0;               // stores the phase of the dynamic color shift
+uint8_t dynColorShiftSpeed = 1;               // stores the speed of the dynamic color shift -> used to calc update period
 
 // nightmode settings
-int nightModeStartHour = 22;
-int nightModeStartMin = 0;
-int nightModeEndHour = 7;
-int nightModeEndMin = 0;
+uint8_t nightModeStartHour = 22;
+uint8_t nightModeStartMin = 0;
+uint8_t nightModeEndHour = 7;
+uint8_t nightModeEndMin = 0;
 
 // Watchdog counter to trigger restart if NTP update was not possible 30 times in a row (5min)
 int watchdogCounter = 30;
@@ -224,9 +217,6 @@ void setup() {
   //Init EEPROM
   EEPROM.begin(EEPROM_SIZE);
 
-  // Load color for clock from EEPROM
-  loadMainColor();
-
   // configure button pin as input
   pinMode(BUTTONPIN, INPUT_PULLUP);
 
@@ -353,31 +343,13 @@ void setup() {
   logger.logString("Time: " +  ntp.getFormattedTime());
   logger.logString("TimeOffset (seconds): " + String(ntp.getTimeOffset()));
 
-  // Read nightmode setting from EEPROM
-  nightModeStartHour = readIntEEPROM(ADR_NM_START_H);
-  nightModeStartMin = readIntEEPROM(ADR_NM_START_M);
-  nightModeEndHour = readIntEEPROM(ADR_NM_END_H);
-  nightModeEndMin = readIntEEPROM(ADR_NM_END_M);
-  if(nightModeStartHour < 0 || nightModeStartHour > 23) nightModeStartHour = 22;
-  if(nightModeStartMin < 0 || nightModeStartMin > 59) nightModeStartMin = 0;
-  if(nightModeEndHour < 0 || nightModeEndHour > 23) nightModeEndHour = 7;
-  if(nightModeEndMin < 0 || nightModeEndMin > 59) nightModeEndMin = 0;
-  logger.logString("Nightmode starts at: " + String(nightModeStartHour) + ":" + String(nightModeStartMin));
-  logger.logString("Nightmode ends at: " + String(nightModeEndHour) + ":" + String(nightModeEndMin));
-
-  // Read brightness setting from EEPROM, lower limit is 10 so that the LEDs are not completely off
-  brightness = readIntEEPROM(ADR_BRIGHTNESS);
-  if(brightness < 10) brightness = 10;
-  logger.logString("Brightness: " + String(brightness));
-  ledmatrix.setBrightness(brightness);
-
-  // Read state from EEPROM
-  currentState = readIntEEPROM(ADR_STATE);
-  if(currentState >= NUM_STATES){
-    currentState = st_clock;
-    writeIntEEPROM(ADR_STATE, currentState);
-  }
-
+  // load persistent variables from EEPROM
+  loadMainColorFromEEPROM();
+  loadCurrentStateFromEEPROM();
+  loadNightmodeSettingsFromEEPROM();
+  loadBrightnessSettingsFromEEPROM();
+  loadColorShiftStateFromEEPROM();
+  
   if(!ESP.getResetReason().equals("Software/System restart")){
     // test quickly each LED
     for(int r = 0; r < HEIGHT; r++){
@@ -407,15 +379,13 @@ void setup() {
     // clear matrix
     ledmatrix.gridFlush();
     ledmatrix.drawOnMatrixInstant();
-
-    entryAction(currentState);
   }
   else {
     waitForTimeAfterReboot = true;
   }
 
-  
-  
+  // run the entry action for the initial state
+  entryAction(currentState);
 }
 
 
@@ -444,7 +414,7 @@ void loop() {
   }
 
   // handle state behaviours (trigger loopCycles of different states depending on current state)
-  if(!nightMode && (millis() - lastStep > PERIODS[stateAutoChange][currentState]) && (millis() - lastLEDdirect > TIMEOUT_LEDDIRECT)){
+  if(!nightMode && (millis() - lastStep > behaviorUpdatePeriod) && (millis() - lastLEDdirect > TIMEOUT_LEDDIRECT)){
     updateStateBehavior(currentState);    
     lastStep = millis();
   }
@@ -540,6 +510,16 @@ void updateStateBehavior(uint8_t state){
     // state clock
     case st_clock:
       {
+        if(dynColorShiftActive){
+          dynColorShiftPhase = (dynColorShiftPhase + 1) % 256;
+          ledmatrix.setDynamicColorShiftPhase(dynColorShiftPhase);
+          filterFactor = 1.0; // no smoothing
+          behaviorUpdatePeriod = PERIOD_TIMEVISUUPDATE / dynColorShiftSpeed;
+        } else {
+          ledmatrix.setDynamicColorShiftPhase(-1);
+          filterFactor = DEFAULT_SMOOTHING_FACTOR;
+          behaviorUpdatePeriod = PERIOD_TIMEVISUUPDATE;
+        }
         int hours = ntp.getHours24();
         int minutes = ntp.getMinutes();
         showStringOnClock(timeToString(hours, minutes), maincolor_clock);
@@ -644,32 +624,49 @@ void checkNightmode(){
  * @param state 
  */
 void entryAction(uint8_t state){
-  filterFactor = 0.5;
+  filterFactor = DEFAULT_SMOOTHING_FACTOR;
   switch(state){
+    case st_clock:
+      behaviorUpdatePeriod = PERIOD_TIMEVISUUPDATE;
+      break;
+    case st_diclock:
+      behaviorUpdatePeriod = PERIOD_TIMEVISUUPDATE;
+      ledmatrix.setDynamicColorShiftPhase(-1); // disable dyn. color shift
+      break;
     case st_spiral:
+      behaviorUpdatePeriod = PERIOD_ANIMATION;
+      ledmatrix.setDynamicColorShiftPhase(-1); // disable dyn. color shift
       // Init spiral with normal drawing mode
       sprialDir = 0;
       spiral(true, sprialDir, WIDTH-6);
       break;
     case st_tetris:
+      ledmatrix.setDynamicColorShiftPhase(-1); // disable dyn. color shift
       filterFactor = 1.0; // no smoothing
       if(stateAutoChange){
+        behaviorUpdatePeriod = PERIOD_ANIMATION;
         randomtetris(true);
       }
       else{
+        behaviorUpdatePeriod = PERIOD_TETRIS;
         mytetris.ctrlStart();
       }
       break;
     case st_snake:
+      ledmatrix.setDynamicColorShiftPhase(-1); // disable dyn. color shift
       if(stateAutoChange){
+        behaviorUpdatePeriod = PERIOD_ANIMATION;
         randomsnake(true, 8, colors24bit[1], -1);
       }
       else{
+        behaviorUpdatePeriod = PERIOD_SNAKE;
         filterFactor = 1.0; // no smoothing
         mysnake.initGame();
       }
       break;
     case st_pingpong:
+      behaviorUpdatePeriod = PERIOD_PONG;
+      ledmatrix.setDynamicColorShiftPhase(-1); // disable dyn. color shift
       if(stateAutoChange){
         mypong.initGame(2);
       }
@@ -700,7 +697,8 @@ void stateChange(uint8_t newState, bool persistant){
   logger.logString("State change to: " + stateNames[currentState]);
   if(persistant){
     // save state to EEPROM
-    writeIntEEPROM(ADR_STATE, currentState);
+    EEPROM.write(ADR_STATE, currentState);
+    EEPROM.commit();
   }
 }
 
@@ -799,7 +797,6 @@ void handleButton(){
  * @brief Set main color
  * 
  */
-
 void setMainColor(uint8_t red, uint8_t green, uint8_t blue){
   maincolor_clock = LEDMatrix::Color24bit(red, green, blue);
   EEPROM.put(ADR_MC_RED, red);
@@ -812,8 +809,7 @@ void setMainColor(uint8_t red, uint8_t green, uint8_t blue){
  * @brief Load maincolor from EEPROM
  * 
 */
-
-void loadMainColor(){
+void loadMainColorFromEEPROM(){
   uint8_t red = EEPROM.read(ADR_MC_RED);
   uint8_t green = EEPROM.read(ADR_MC_GREEN);
   uint8_t blue = EEPROM.read(ADR_MC_BLUE);
@@ -824,6 +820,62 @@ void loadMainColor(){
   }
 }
 
+/**
+ * @brief Load the current state from EEPROM
+ * 
+ */
+void loadCurrentStateFromEEPROM(){
+  currentState = EEPROM.read(ADR_STATE);
+  if(currentState >= NUM_STATES){
+    currentState = st_clock;
+    EEPROM.write(ADR_STATE, currentState);
+    EEPROM.commit();
+  }
+}
+
+/**
+ * @brief Load the nightmode settings from EEPROM
+ */
+void loadNightmodeSettingsFromEEPROM()
+{
+  nightModeStartHour = EEPROM.read(ADR_NM_START_H);
+  nightModeStartMin = EEPROM.read(ADR_NM_START_M);
+  nightModeEndHour = EEPROM.read(ADR_NM_END_H);
+  nightModeEndMin = EEPROM.read(ADR_NM_END_M);
+  if(nightModeStartHour < 0 || nightModeStartHour > 23) nightModeStartHour = 22;
+  if(nightModeStartMin < 0 || nightModeStartMin > 59) nightModeStartMin = 0;
+  if(nightModeEndHour < 0 || nightModeEndHour > 23) nightModeEndHour = 7;
+  if(nightModeEndMin < 0 || nightModeEndMin > 59) nightModeEndMin = 0;
+  logger.logString("Nightmode starts at: " + String(nightModeStartHour) + ":" + String(nightModeStartMin));
+  logger.logString("Nightmode ends at: " + String(nightModeEndHour) + ":" + String(nightModeEndMin));
+}
+
+/**
+ * @brief Load the brightness settings from EEPROM
+ *
+ * lower limit is 10 so that the LEDs are not completely off
+ */
+void loadBrightnessSettingsFromEEPROM()
+{
+  brightness = EEPROM.read(ADR_BRIGHTNESS);
+  if(brightness < 10) brightness = 10;
+  logger.logString("Brightness: " + String(brightness));
+  ledmatrix.setBrightness(brightness);
+}
+
+/**
+ * @brief load the color shift speed from EEPROM
+ *
+ */
+void loadColorShiftStateFromEEPROM()
+{
+  dynColorShiftSpeed = EEPROM.read(ADR_COLSHIFTSPEED);
+  if (dynColorShiftSpeed == 0) dynColorShiftSpeed = 1;
+  logger.logString("ColorShiftSpeed: " + String(dynColorShiftSpeed));
+  dynColorShiftActive = EEPROM.read(ADR_COLSHIFTACTIVE);
+  logger.logString("ColorShiftActive: " + String(dynColorShiftActive));
+}
+
 /**
  * @brief Handler for handling commands sent to "/cmd" url
  * 
@@ -886,16 +938,20 @@ void handleCommand() {
     nightModeEndHour = split(timestr, '-', 2).toInt();
     nightModeEndMin = split(timestr, '-', 3).toInt();
     brightness = split(timestr, '-', 4).toInt();
-    if(brightness < 10) brightness = 10;
+    dynColorShiftSpeed = split(timestr, '-', 5).toInt();
     if(nightModeStartHour < 0 || nightModeStartHour > 23) nightModeStartHour = 22;
     if(nightModeStartMin < 0 || nightModeStartMin > 59) nightModeStartMin = 0;
     if(nightModeEndHour < 0 || nightModeEndHour > 23) nightModeEndHour = 7;
     if(nightModeEndMin < 0 || nightModeEndMin > 59) nightModeEndMin = 0;
-    writeIntEEPROM(ADR_NM_START_H, nightModeStartHour);
-    writeIntEEPROM(ADR_NM_START_M, nightModeStartMin);
-    writeIntEEPROM(ADR_NM_END_H, nightModeEndHour);
-    writeIntEEPROM(ADR_NM_END_M, nightModeEndMin);
-    writeIntEEPROM(ADR_BRIGHTNESS, brightness);
+    if(brightness < 10) brightness = 10;
+    if(dynColorShiftSpeed == 0) dynColorShiftSpeed = 1;
+    EEPROM.write(ADR_NM_START_H, nightModeStartHour);
+    EEPROM.write(ADR_NM_START_M, nightModeStartMin);
+    EEPROM.write(ADR_NM_END_H, nightModeEndHour);
+    EEPROM.write(ADR_NM_END_M, nightModeEndMin);
+    EEPROM.write(ADR_BRIGHTNESS, brightness);
+    EEPROM.write(ADR_COLSHIFTSPEED, dynColorShiftSpeed);
+    EEPROM.commit();
     logger.logString("Nightmode starts at: " + String(nightModeStartHour) + ":" + String(nightModeStartMin));
     logger.logString("Nightmode ends at: " + String(nightModeEndHour) + ":" + String(nightModeEndMin));
     logger.logString("Brightness: " + String(brightness));
@@ -985,6 +1041,12 @@ void handleCommand() {
     delay(1000);
     ESP.restart();
   }
+  else if(server.argName(0) == "colorshift"){
+    Serial.println("ColorShift change via Webserver");
+    String str = server.arg(0);
+    if(str == "1") dynColorShiftActive = true;
+    else dynColorShiftActive = false;
+  }
   server.send(204, "text/plain", "No Content"); // this page doesn't send back content --> 204
 }
 
@@ -1041,6 +1103,8 @@ void handleDataRequest() {
       message += "\"nightModeEnd\":\"" + leadingZero2Digit(nightModeEndHour) + "-" + leadingZero2Digit(nightModeEndMin) + "\"";
       message += ",";
       message += "\"brightness\":\"" + String(brightness) + "\"";
+      message += ",";
+      message += "\"colorshift\":\"" + String(dynColorShiftActive) + "\"";
     }
     message += "}";
     server.send(200, "application/json", message);
@@ -1059,29 +1123,6 @@ void setNightmode(bool on){
   nightMode = on;
 }
 
-/**
- * @brief Write value to EEPROM
- * 
- * @param address address to write the value
- * @param value value to write
- */
-void writeIntEEPROM(int address, int value){
-  EEPROM.put(address, value);
-  EEPROM.commit();
-}
-
-/**
- * @brief Read value from EEPROM
- * 
- * @param address address
- * @return int value
- */
-int readIntEEPROM(int address){
-  int value;
-  EEPROM.get(address, value);
-  return value;
-}
-
 /**
  * @brief Convert Integer to String with leading zero
  * 

From 6c5e7ffd8d3bb288830b6c0984a14fc7c5e5a7cc Mon Sep 17 00:00:00 2001
From: Edgar W <techniccontroller@gmail.com>
Date: Thu, 2 Jan 2025 18:01:57 +0100
Subject: [PATCH 2/8] only convert time to string when time changes

---
 wordclock_esp8266.ino | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/wordclock_esp8266.ino b/wordclock_esp8266.ino
index 26f9792..2c231df 100644
--- a/wordclock_esp8266.ino
+++ b/wordclock_esp8266.ino
@@ -520,9 +520,15 @@ void updateStateBehavior(uint8_t state){
           filterFactor = DEFAULT_SMOOTHING_FACTOR;
           behaviorUpdatePeriod = PERIOD_TIMEVISUUPDATE;
         }
-        int hours = ntp.getHours24();
-        int minutes = ntp.getMinutes();
-        showStringOnClock(timeToString(hours, minutes), maincolor_clock);
+        uint8_t hours = ntp.getHours24();
+        uint8_t minutes = ntp.getMinutes();
+        static uint8_t lastMinutes = 0;
+        static String timeAsString = "";
+        if(lastMinutes != minutes){
+          timeAsString = timeToString(hours, minutes);
+          lastMinutes = minutes;
+        }
+        showStringOnClock(timeAsString, maincolor_clock);
         drawMinuteIndicator(minutes, maincolor_clock);
       }
       break;

From 215f57fc082bbb16334f856c7f446b4844c73ba8 Mon Sep 17 00:00:00 2001
From: Edgar W <techniccontroller@gmail.com>
Date: Thu, 2 Jan 2025 18:02:48 +0100
Subject: [PATCH 3/8] fix style of settings menu height

---
 data/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/index.html b/data/index.html
index e5dd720..9fda0be 100644
--- a/data/index.html
+++ b/data/index.html
@@ -243,7 +243,7 @@
 	}
 
 	.show{
-		height: 200px;
+		height: 230px;
 		transition: height 1s;
 	}
 

From 4a73ae4b37e078ada024262cd19f4d216a309229 Mon Sep 17 00:00:00 2001
From: Edgar W <techniccontroller@gmail.com>
Date: Thu, 2 Jan 2025 18:03:06 +0100
Subject: [PATCH 4/8] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cb174af..a529b45 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ MCAST_IF_IP = '192.168.0.7'
 4. Execute the script with following command: 
 
 ```bash
-python multicastUDP_receiver_analyzer.py
+python multicastUDP_receiver.py
 ```
 
 5. Now you should see the log messages of the word clock (every 5 seconds a heartbeat message and the currently displayed time). 

From 2891a0e75b0ac4e4850b029381413a3ba03f47c1 Mon Sep 17 00:00:00 2001
From: Edgar W <techniccontroller@gmail.com>
Date: Thu, 2 Jan 2025 18:17:19 +0100
Subject: [PATCH 5/8] Log color shift speed and save dynamic color shift state
 to EEPROM

---
 wordclock_esp8266.ino | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wordclock_esp8266.ino b/wordclock_esp8266.ino
index 2c231df..a5d99e5 100644
--- a/wordclock_esp8266.ino
+++ b/wordclock_esp8266.ino
@@ -961,6 +961,7 @@ void handleCommand() {
     logger.logString("Nightmode starts at: " + String(nightModeStartHour) + ":" + String(nightModeStartMin));
     logger.logString("Nightmode ends at: " + String(nightModeEndHour) + ":" + String(nightModeEndMin));
     logger.logString("Brightness: " + String(brightness));
+    logger.logString("ColorShiftSpeed: " + String(dynColorShiftSpeed));
     ledmatrix.setBrightness(brightness);
     lastNightmodeCheck = millis()  - PERIOD_NIGHTMODECHECK;
   }
@@ -1052,6 +1053,8 @@ void handleCommand() {
     String str = server.arg(0);
     if(str == "1") dynColorShiftActive = true;
     else dynColorShiftActive = false;
+    EEPROM.write(ADR_COLSHIFTACTIVE, dynColorShiftActive);
+    EEPROM.commit();
   }
   server.send(204, "text/plain", "No Content"); // this page doesn't send back content --> 204
 }

From 468c5ceebdbec3dc21f6e92d096aee87bcc2e8f4 Mon Sep 17 00:00:00 2001
From: Edgar W <techniccontroller@gmail.com>
Date: Thu, 2 Jan 2025 18:21:20 +0100
Subject: [PATCH 6/8] Add colorshift speed to data request response

---
 wordclock_esp8266.ino | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wordclock_esp8266.ino b/wordclock_esp8266.ino
index a5d99e5..e563f2b 100644
--- a/wordclock_esp8266.ino
+++ b/wordclock_esp8266.ino
@@ -1114,6 +1114,8 @@ void handleDataRequest() {
       message += "\"brightness\":\"" + String(brightness) + "\"";
       message += ",";
       message += "\"colorshift\":\"" + String(dynColorShiftActive) + "\"";
+      message += ",";
+      message += "\"colorshiftspeed\":\"" + String(dynColorShiftSpeed) + "\"";
     }
     message += "}";
     server.send(200, "application/json", message);

From 078400e3375f483ca00f37bfcb155b7c91a74498 Mon Sep 17 00:00:00 2001
From: Edgar W <techniccontroller@gmail.com>
Date: Thu, 2 Jan 2025 18:29:57 +0100
Subject: [PATCH 7/8] Fix color calculation in gridAddPixel for dynamic color
 shifting

---
 ledmatrix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ledmatrix.cpp b/ledmatrix.cpp
index 67ffc41..49f1faa 100644
--- a/ledmatrix.cpp
+++ b/ledmatrix.cpp
@@ -138,7 +138,7 @@ void LEDMatrix::setMinIndicator(uint8_t pattern, uint32_t color)
 void LEDMatrix::gridAddPixel(uint8_t x, uint8_t y, uint32_t color)
 {
   if(dynamicColorShiftActivePhase >= 0){
-    color = Wheel((uint16_t(x + y) * 256 * 2 / (WIDTH*HEIGHT) + dynamicColorShiftActivePhase) % 256);
+    color = Wheel((uint16_t(x + y*WIDTH) * 256 * 2 / (WIDTH*HEIGHT) + dynamicColorShiftActivePhase) % 256);
   }
   // limit ranges of x and y
   if(x < WIDTH && y < HEIGHT){

From 697cfd2be400f9c898f4fa865b9c34a8e9fb748e Mon Sep 17 00:00:00 2001
From: Edgar W <techniccontroller@gmail.com>
Date: Thu, 2 Jan 2025 18:31:08 +0100
Subject: [PATCH 8/8] Add dynamic color shift mode to README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a529b45..23f9232 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Thank you to everyone who provided feedback on adding new languages and testing
 - webserver interface for configuration and control
 - physical button to change mode or enable night mode without webserver
 - automatic current limiting of LEDs
+- dynamic color shift mode 
 
 ## Pictures of clock
 ![modes_images2](https://user-images.githubusercontent.com/36072504/156947689-dd90874d-a887-4254-bede-4947152d85c1.png)