Merge pull request #103 from robertlipe/schedule-and-robustness

schedule and robustness

Author: rbergen

canvas.h

@@ -21,7 +21,7 @@ class Canvas : public ICanvas
     EffectsManager          _effects;
     string                  _name;
     vector<shared_ptr<ILEDFeature>> _features;
-    mutable mutex           _featuresMutex;
+    mutable recursive_mutex _featuresMutex;
 
 public:
     Canvas(string name, uint32_t width, uint32_t height, uint16_t fps = 30) :
@@ -172,7 +172,7 @@ inline void from_json(const nlohmann::json& j, shared_ptr<ICanvas> & canvas)
     canvas = make_shared<Canvas>(
         canvasName,
         j.at("width").get<uint32_t>(),
-        j.at("height").get<uint32_t>()
+        j.value("height", uint32_t(1))
     );
 
     if (!autoAssignCanvasId)

controller.h

@@ -63,7 +63,9 @@ class Controller : public IController
         nlohmann::json jsonData;
         file >> jsonData;
 
-        return jsonData.get<unique_ptr<Controller>>();
+        unique_ptr<Controller> ptr;
+        from_json(jsonData, ptr);
+        return ptr;
     }
 
     void WriteToFile(const string& filePath) const override
@@ -559,7 +561,7 @@ inline void from_json(const nlohmann::json &j, unique_ptr<Controller> & ptrContr
     try
     {
         // Extract port
-        uint16_t port = j.at("port").get<uint16_t>();
+        uint16_t port = j.value("port", uint16_t(7777));
 
         // Create controller
         ptrController = make_unique<Controller>(port);

pixeltypes.h

@@ -1358,8 +1358,11 @@ inline void from_json(const nlohmann::json& j, CRGB& color)
             return;
         }
         if (s[0] == '#') s = s.substr(1);
-        uint32_t val = static_cast<uint32_t>(stoul(s, nullptr, 16));
-        color = CRGB(val);
+        try {
+            color = CRGB(static_cast<uint32_t>(stoul(s, nullptr, 16)));
+        } catch (...) {
+            color = CRGB::Black;
+        }
     } else if (j.is_array()) {
         color = CRGB(
             j.at(0).get<uint8_t>(),

schedule.h

@@ -70,8 +70,10 @@ class Schedule : public ISchedule
         // Note: localTime->tm_wday: Sunday == 0, Monday == 1, etc.
         if (daysOfWeek) {
             uint8_t todayBit = 1 << localTime->tm_wday;
-            if (!(*daysOfWeek & todayBit))
+            if (!(*daysOfWeek & todayBit)) {
+                logger->debug("Schedule inactive: day bit {} not in mask {}", todayBit, *daysOfWeek);
                 return false;
+            }
         }
 
         // Format current date and time as strings in "YYYY-MM-DD" and "HH:MM:SS" formats.
@@ -82,18 +84,36 @@ class Schedule : public ISchedule
         string currentTime = timeStream.str();
 
         // Check start and stop dates if set.
-        if (startDate && currentDate < *startDate)
+        if (startDate && currentDate < *startDate) {
             return false;
+        }
 
-        if (stopDate && currentDate > *stopDate)
+        if (stopDate && currentDate > *stopDate) {
             return false;
+        }
 
         // Check start and stop times if set.
-        if (startTime && currentTime < *startTime)
-            return false;
-
-        if (stopTime && currentTime > *stopTime)
-            return false;
+        if (startTime && stopTime) {
+            if (*startTime <= *stopTime) {
+                // Normal range (e.g., 08:00:00 to 17:00:00)
+                if (currentTime < *startTime || currentTime > *stopTime) {
+                    return false;
+                }
+            } else {
+                // Overnight range (e.g., 22:00:00 to 06:00:00)
+                if (currentTime < *startTime && currentTime > *stopTime) {
+                    return false;
+                }
+            }
+        } else if (startTime) {
+            if (currentTime < *startTime) {
+                return false;
+            }
+        } else if (stopTime) {
+            if (currentTime > *stopTime) {
+                return false;
+            }
+        }
 
         return true;
     }