Update from "main v1.1.8"

README.md

@@ -91,6 +91,8 @@ We've got some interesting branches in this repo inspired by user feedback. Thes
 ![compile esp8266 workflow](https://github.com/techniccontroller/wordclock_esp8266/actions/workflows/compile_esp8266.yml/badge.svg?branch=rgbw_leds)
 - [**static_background_pattern**](https://github.com/techniccontroller/wordclock_esp8266/tree/static_background_pattern): This branch allows to light up specific letters always during clock mode. E.G., to display some special words in another color.  
 ![compile esp8266 workflow](https://github.com/techniccontroller/wordclock_esp8266/actions/workflows/compile_esp8266.yml/badge.svg?branch=static_background_pattern)
+- [**frame_light**](https://github.com/techniccontroller/wordclock_esp8266/tree/frame_light): This branch allows to add an additional LEDs around the clock, as background/frame light it has the same color as the clock. Thanks to Sandro for the idea. 
+![compile esp8266 workflow](https://github.com/techniccontroller/wordclock_esp8266/actions/workflows/compile_esp8266.yml/badge.svg?branch=frame_light)
 
 ## Install needed Libraries
 

data/index.html

@@ -243,7 +243,7 @@
 	}
 
 	.show{
-		height: 280px;
+		height: 320px;
 		transition: height 1s;
 	}
 
@@ -280,6 +280,10 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 				<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_brightness">Nightmode brightness:</label>
+				<input type="range" id="nm_brightness" name="volume" min="0" max="100">
+			</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">
@@ -536,6 +540,7 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 					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("nm_brightness").value = parseInt(myVar.nightModeBrightness);
 					document.getElementById("colorshiftspeed").value = parseInt(myVar.colorshiftspeed);
 
 					updateDisplay(parseInt(myVar.modeid));
@@ -606,6 +611,7 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 				var nmStart = document.getElementById("nm_start");
 				var nmEnd = document.getElementById("nm_end");
 				var sld_brightness = document.getElementById("brightness");
+				var sld_nm_brightness = document.getElementById("nm_brightness");
 				var sld_colorshiftspeed = document.getElementById("colorshiftspeed");
 				var ckb_resetWifi = document.querySelector('input[id="ResetWifi"]');
 				var cmdstr = "./cmd?setting=";
@@ -616,6 +622,8 @@ <h1 id="headline">WORDCLOCK 2.0</h1>
 				cmdstr += sld_brightness.value;
 				cmdstr += "-";
 				cmdstr += sld_colorshiftspeed.value;
+				cmdstr += "-";
+				cmdstr += sld_nm_brightness.value;
 				console.log(cmdstr);
 				sendCommand(cmdstr);
 				if(ckb_resetWifi.checked) {

ntp_client_plus.cpp

@@ -128,11 +128,12 @@ void NTPClientPlus::setPoolServerName(const char *poolServerName)
  * @return unsigned long seconds since 1. Jan. 1900
  */
 unsigned long NTPClientPlus::getSecsSince1900() const
-{
-    return this->_utcx * this->secondperminute +            // UTC offset
-            this->_summertime * this->secondperhour +       // Summer time offset
-            this->_secsSince1900 +                          // seconds returned by the NTP server
-            ((millis() - this->_lastUpdate) / 1000);        // Time since last update
+{    
+    int64_t secsSince1900WithDST =  static_cast<int64_t>(this->_secsSince1900) +                    // seconds returned by the NTP server
+                                    static_cast<int64_t>((millis() - this->_lastUpdate) / 1000) +   // Time since last update
+                                    this->_summertime * this->secondperhour +                       // Summer time offset
+                                    (static_cast<int64_t>(this->_utcx) * this->secondperminute);    // UTC offset
+    return static_cast<unsigned long>(secsSince1900WithDST);
 }
 
 /**
@@ -199,15 +200,14 @@ int NTPClientPlus::getSeconds() const
 String NTPClientPlus::getFormattedTime() const {
   unsigned long rawTime = this->getEpochTime();
   unsigned long hours = (rawTime % 86400L) / 3600;
-  String hoursStr = hours < 10 ? "0" + String(hours) : String(hours);
-
   unsigned long minutes = (rawTime % 3600) / 60;
-  String minuteStr = minutes < 10 ? "0" + String(minutes) : String(minutes);
-
   unsigned long seconds = rawTime % 60;
-  String secondStr = seconds < 10 ? "0" + String(seconds) : String(seconds);
 
-  return hoursStr + ":" + minuteStr + ":" + secondStr;
+  // Fester Puffer statt mehrfacher String-Verkettung, um Heap-Fragmentierung zu vermeiden
+  // Format identisch zu vorher: hh:mm:ss (jeweils 2-stellig, mit fuehrender Null)
+  char buffer[9]; // "hh:mm:ss" + '\0'
+  snprintf(buffer, sizeof(buffer), "%02lu:%02lu:%02lu", hours, minutes, seconds);
+  return String(buffer);
 }
 
 /**
@@ -314,6 +314,26 @@ unsigned int NTPClientPlus::getDayOfWeek()
     return this->_dayOfWeek;
 }
 
+/**
+ * @brief Getter for day of the month
+ * 
+ * @return unsigned int 
+ */
+unsigned int NTPClientPlus::getDayOfMonth()
+{
+    return this->_dateDay;
+}
+
+/**
+ * @brief Getter for the month number
+ * 
+ * @return unsigned int 
+ */
+unsigned int NTPClientPlus::getMonthNumber()
+{
+    return this->_dateMonth;
+}
+
 /**
  * @brief Function to calc current year
  * 
@@ -565,6 +585,21 @@ bool NTPClientPlus::updateSWChange()
     unsigned int dateDay = this->_dateDay; 
     unsigned int dateMonth = this->_dateMonth;
 
+    // Calculate local STANDARD time (without DST) for exact switch-hour handling.
+    // EU rule: DST starts on last Sunday in March at 02:00 (standard time),
+    // and ends on last Sunday in October at 03:00 local summer time
+    // (== 02:00 standard time).
+    int64_t currentUtcSeconds = static_cast<int64_t>(this->_secsSince1900) +
+                                static_cast<int64_t>((millis() - this->_lastUpdate) / 1000);
+    int64_t secsSince1900NoDST = currentUtcSeconds +
+                                 (static_cast<int64_t>(this->_utcx) * this->secondperminute);
+    int64_t secondsIntoDay = secsSince1900NoDST % this->secondperday;
+    if (secondsIntoDay < 0)
+    {
+        secondsIntoDay += this->secondperday;
+    }
+    unsigned int hourNoDST = static_cast<unsigned int>(secondsIntoDay / this->secondperhour);
+
     bool summertimeActive = false;
 
     if (this->_swChange)
@@ -587,10 +622,19 @@ bool NTPClientPlus::updateSWChange()
                 //Calculation: 31 - 30 = 1; 1 + 2 = 3;
                 //Result: Last day in March is a Wednesday. Changeover to summer time already done => set summer time
 
-                // If today is Sunday (dayOfWeek == 7) then this is already the last sunday in march -> set summer time
+                // If today is Sunday (dayOfWeek == 7) then this is the last Sunday in March.
+                // Switch to summer time at 02:00 standard time (clock jumps to 03:00).
                 if(dayOfWeek == 7){
-                    this->setSummertime(1);
-                    summertimeActive = true;
+                    if (hourNoDST >= 2)
+                    {
+                        this->setSummertime(1);
+                        summertimeActive = true;
+                    }
+                    else
+                    {
+                        this->setSummertime(0);
+                        summertimeActive = false;
+                    }
                 }
 
                 //There follows within the last week in March one more Sunday => set winter time
@@ -632,10 +676,20 @@ bool NTPClientPlus::updateSWChange()
                 //Calculation: 31 - 26 = 5; 5 + 2 = 7;
                 //Result: Last day in October is a Sunday. There follows another Sunday in October => set summer time
 
-                // If today is Sunday (dayOfWeek == 7) then this is already the last sunday in october -> winter time
+                // If today is Sunday (dayOfWeek == 7) then this is the last Sunday in October.
+                // Switch back to winter time at 02:00 standard time
+                // (which corresponds to 03:00 local summer time).
                 if(dayOfWeek == 7){
-                    this->setSummertime(0);
-                    summertimeActive = false;
+                    if (hourNoDST >= 2)
+                    {
+                        this->setSummertime(0);
+                        summertimeActive = false;
+                    }
+                    else
+                    {
+                        this->setSummertime(1);
+                        summertimeActive = true;
+                    }
                 }
 
                 // There follows within the last week in October one more Sunday => summer time
@@ -677,4 +731,4 @@ bool NTPClientPlus::updateSWChange()
     }
 
     return summertimeActive;
-}
+}

ntp_client_plus.h

@@ -33,6 +33,8 @@ class NTPClientPlus{
         String getFormattedDate();
         void calcDate();
         unsigned int getDayOfWeek();
+        unsigned int getDayOfMonth();
+        unsigned int getMonthNumber();
         unsigned int getYear();
         bool isLeapYear(unsigned int year);
         int getMonth(int dayOfYear);

udplogger.cpp

@@ -10,21 +10,23 @@ UDPLogger::UDPLogger(IPAddress interfaceAddr, IPAddress multicastAddr, int port)
     _interfaceAddr = interfaceAddr;
     _name = "Log";
     _Udp.beginMulticast(_interfaceAddr, _multicastAddr, _port);
+    _lastSend = 0;
 }
 
 void UDPLogger::setName(String name){
     _name = name;
 }
 
-void UDPLogger::logString(String logmessage){
+void UDPLogger::logString(const String& logmessage){
     // wait 5 milliseconds if last send was less than 5 milliseconds before 
     if(millis() < (_lastSend + 5)){
         delay(5);
     }
-    logmessage = _name + ": " + logmessage;
-    Serial.println(logmessage);
+    // use fixed buffer instead of string concatenation to avoid heap fragmentation
+    // message will be truncated to fit into _packetBuffer (99 chars + NUL)
+    snprintf(_packetBuffer, sizeof(_packetBuffer), "%s: %s", _name.c_str(), logmessage.c_str());
+    Serial.println(_packetBuffer);
     _Udp.beginPacketMulticast(_multicastAddr, _port, _interfaceAddr);
-    logmessage.toCharArray(_packetBuffer, 100);
     _Udp.print(_packetBuffer);
     _Udp.endPacket();
     _lastSend=millis();
@@ -35,4 +37,4 @@ void UDPLogger::logColor24bit(uint32_t color){
   uint8_t resultGreen = color >> 8 & 0xff;
   uint8_t resultBlue = color & 0xff;
   logString(String(resultRed) + ", " + String(resultGreen) + ", " + String(resultBlue));
-}
+}

udplogger.h

@@ -22,7 +22,7 @@ class UDPLogger{
         UDPLogger();
         UDPLogger(IPAddress interfaceAddr, IPAddress multicastAddr, int port);
         void setName(String name);
-        void logString(String logmessage);
+        void logString(const String& logmessage);
         void logColor24bit(uint32_t color);
     private:
         String _name;