add sunrise/sunset to ui and other nitpicks

Author: PagedPenguin

wled00/cfg.cpp

@@ -697,6 +697,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   // Load timers into new vector-based system
   clearTimers();
 
+  // Load regular timers from "ins" array
   JsonArray timers = tm["ins"];
   for (JsonObject timer : timers) {
     // Extract timer data from JSON
@@ -705,25 +706,60 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
     uint8_t preset = timer["macro"] | 0;
 
     // Handle weekdays and enabled state
-    uint8_t weekdays = timer[F("dow")] | 0;
-    weekdays <<= 1; // shift to make room for enabled bit
-    bool enabled = timer["en"] | false;
-    if (enabled) weekdays |= 0x01; // set enabled bit
+    uint8_t weekdays = (timer[F("dow")] | 0) << 1; // shift weekdays to upper 7 bits
+    if (timer["en"] | false) weekdays |= 0x01; // set enabled bit if timer is enabled
 
-    // Handle date range (only for regular timers)
-    uint8_t monthStart = 1, monthEnd = 12, dayStart = 1, dayEnd = 31;
-    if (hour < 254) { // regular timer
-      JsonObject start = timer["start"];
-      JsonObject end = timer["end"];
-      monthStart = start["mon"] | 1;
-      dayStart = start["day"] | 1;
-      monthEnd = end["mon"] | 12;
-      dayEnd = end["day"] | 31;
-    }
+    // Handle date range for regular timers
+    JsonObject start = timer["start"];
+    JsonObject end = timer["end"];
+    uint8_t monthStart = start["mon"] | 1;
+    uint8_t dayStart = start["day"] | 1;
+    uint8_t monthEnd = end["mon"] | 12;
+    uint8_t dayEnd = end["day"] | 31;
 
-    // Add timer to vector system
+    // Add regular timer to vector system
     addTimer(preset, hour, minute, weekdays, monthStart, monthEnd, dayStart, dayEnd);
   }
+  
+  // Load sunrise/sunset timers from separate "sunrise_sunset" object
+  JsonObject sunriseSunset = tm["sunrise_sunset"];
+  if (!sunriseSunset.isNull()) {
+    // Load sunrise timer
+    JsonObject sunrise = sunriseSunset["sunrise"];
+    if (!sunrise.isNull()) {
+      uint8_t preset = sunrise["macro"] | 0;
+      int8_t offset = sunrise["offset"] | 0;
+      uint8_t weekdays = (sunrise[F("dow")] | 0) << 1;
+      if (sunrise["en"] | false) weekdays |= 0x01;
+      
+      JsonObject start = sunrise["start"];
+      JsonObject end = sunrise["end"];
+      uint8_t monthStart = start["mon"] | 1;
+      uint8_t dayStart = start["day"] | 1;
+      uint8_t monthEnd = end["mon"] | 12;
+      uint8_t dayEnd = end["day"] | 31;
+      
+      addTimer(preset, TIMER_HOUR_SUNRISE, offset, weekdays, monthStart, monthEnd, dayStart, dayEnd);
+    }
+    
+    // Load sunset timer
+    JsonObject sunset = sunriseSunset["sunset"];
+    if (!sunset.isNull()) {
+      uint8_t preset = sunset["macro"] | 0;
+      int8_t offset = sunset["offset"] | 0;
+      uint8_t weekdays = (sunset[F("dow")] | 0) << 1;
+      if (sunset["en"] | false) weekdays |= 0x01;
+      
+      JsonObject start = sunset["start"];
+      JsonObject end = sunset["end"];
+      uint8_t monthStart = start["mon"] | 1;
+      uint8_t dayStart = start["day"] | 1;
+      uint8_t monthEnd = end["mon"] | 12;
+      uint8_t dayEnd = end["day"] | 31;
+      
+      addTimer(preset, TIMER_HOUR_SUNSET, offset, weekdays, monthStart, monthEnd, dayStart, dayEnd);
+    }
+  }
 
   JsonObject ota = doc["ota"];
   const char* pwd = ota["psk"]; //normally not present due to security
@@ -1190,22 +1226,32 @@ void serializeConfig(JsonObject root) {
   goal.add(countdownHour); goal.add(countdownMin); goal.add(countdownSec);
   cntdwn["macro"] = macroCountdown;
 
+  // Separate regular timers and sunrise/sunset timers
   JsonArray timers_ins = timers.createNestedArray("ins");
+  JsonObject sunrise_sunset = timers.createNestedObject("sunrise_sunset");
+  
+  Timer sunriseTimer, sunsetTimer;
+  bool hasSunrise = false, hasSunset = false;
 
   // Access the global timers vector from ntp.cpp
   for (const auto& timer : ::timers) {
-    // Skip completely empty timers (but save sunrise/sunset even if preset=0)
-    if (timer.preset == 0 && timer.hour < 254 && timer.minute == 0) continue;
-    
-    JsonObject timers_ins0 = timers_ins.createNestedObject();
-    timers_ins0["en"] = timer.isEnabled();
-    timers_ins0[F("hour")] = timer.hour;
-    timers_ins0["min"] = timer.minute;
-    timers_ins0["macro"] = timer.preset;
-    timers_ins0[F("dow")] = timer.weekdays >> 1; // remove enabled bit
-    
-    // Add date range for regular timers only
-    if (timer.isRegular()) {
+    if (timer.isSunrise()) {
+      sunriseTimer = timer;
+      hasSunrise = true;
+    } else if (timer.isSunset()) {
+      sunsetTimer = timer;
+      hasSunset = true;
+    } else if (timer.isRegular()) {
+      // Skip completely empty regular timers
+      if (timer.preset == 0 && timer.minute == 0) continue;
+      
+      JsonObject timers_ins0 = timers_ins.createNestedObject();
+      timers_ins0["en"] = timer.isEnabled();
+      timers_ins0[F("hour")] = timer.hour;
+      timers_ins0["min"] = timer.minute;
+      timers_ins0["macro"] = timer.preset;
+      timers_ins0[F("dow")] = timer.weekdays >> 1; // remove enabled bit
+      
       JsonObject start = timers_ins0.createNestedObject("start");
       start["mon"] = timer.monthStart;
       start["day"] = timer.dayStart;
@@ -1214,6 +1260,36 @@ void serializeConfig(JsonObject root) {
       end["day"] = timer.dayEnd;
     }
   }
+  
+  // Save sunrise timer if it exists
+  if (hasSunrise) {
+    JsonObject sunrise = sunrise_sunset.createNestedObject("sunrise");
+    sunrise["en"] = sunriseTimer.isEnabled();
+    sunrise["offset"] = sunriseTimer.minute; // offset in minutes
+    sunrise["macro"] = sunriseTimer.preset;
+    sunrise[F("dow")] = sunriseTimer.weekdays >> 1; // remove enabled bit
+    JsonObject start = sunrise.createNestedObject("start");
+    start["mon"] = sunriseTimer.monthStart;
+    start["day"] = sunriseTimer.dayStart;
+    JsonObject end = sunrise.createNestedObject("end");
+    end["mon"] = sunriseTimer.monthEnd;
+    end["day"] = sunriseTimer.dayEnd;
+  }
+  
+  // Save sunset timer if it exists
+  if (hasSunset) {
+    JsonObject sunset = sunrise_sunset.createNestedObject("sunset");
+    sunset["en"] = sunsetTimer.isEnabled();
+    sunset["offset"] = sunsetTimer.minute; // offset in minutes
+    sunset["macro"] = sunsetTimer.preset;
+    sunset[F("dow")] = sunsetTimer.weekdays >> 1; // remove enabled bit
+    JsonObject start = sunset.createNestedObject("start");
+    start["mon"] = sunsetTimer.monthStart;
+    start["day"] = sunsetTimer.dayStart;
+    JsonObject end = sunset.createNestedObject("end");
+    end["mon"] = sunsetTimer.monthEnd;
+    end["day"] = sunsetTimer.dayEnd;
+  }
 
   JsonObject ota = root.createNestedObject("ota");
   ota[F("lock")] = otaLock;