fix(scheduler): list was not persisted and send max info everytime over websocket

Author: ph1p

.github/workflows/build-and-release.yaml

@@ -68,14 +68,12 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        environment: [nodemcuv2, d1_mini_pro-ota, esp32c3, ESP32-wemos]
+        environment: [nodemcuv2, d1_mini_pro-ota, ESP32-wemos]
         include:
           - environment: nodemcuv2
             artifact_name: nodemcuv2_firmware
           - environment: d1_mini_pro-ota
             artifact_name: d1_mini_pro_ota_firmware
-          - environment: esp32c3
-            artifact_name: esp32c3_firmware
           - environment: ESP32-wemos
             artifact_name: ESP32-wemos_firmware
 

frontend/src/app.tsx

@@ -1,4 +1,4 @@
-import { Component, createMemo, Show } from 'solid-js';
+import { type Component, createMemo, Show } from 'solid-js';
 import { Layout } from './components/layout/layout';
 import Sidebar from './components/layout/sidebar';
 import { LedMatrix } from './components/led-matrix';
@@ -82,9 +82,9 @@ export const App: Component = () => {
       wsMessage('brightness', { brightness: value });
     }
   };
-  
+
   const handleArtnetUniverseChange = (value: number, shouldSend = false) => {
-    actions?.setArtnetUniverse(value);    
+    actions?.setArtnetUniverse(value);
     if (shouldSend) {
       wsMessage('artnet', { universe: value });
     }

frontend/src/contexts/store.tsx

@@ -75,15 +75,6 @@ export const StoreProvider: ParentComponent = (props) => {
     const json = JSON.parse(messageEvent()?.data || '{}');
 
     switch (json.event) {
-      case 'minimal-info':
-        actions.setSystemStatus(
-          Object.values(SYSTEM_STATUS)[json.status as number],
-        );
-        actions.setRotation(json.rotation);
-        actions.setBrightness(json.brightness);
-        actions.setPlugin(json.plugin as number);
-        actions.setIsActiveScheduler(json.scheduleActive);
-        break;
       case 'info':
         batch(() => {
           actions.setSystemStatus(

frontend/src/types.ts

@@ -23,6 +23,7 @@ export interface StoreActions {
   setLeds: (leds: number[]) => void;
   setSystemStatus: (systemStatus: SYSTEM_STATUS) => void;
   setSchedule: (items: ScheduleItem[]) => void;
+  setArtnetUniverse: (artnetUniverse: number) => void;
   send: (message: string | ArrayBuffer) => void;
 }
 

include/websocket.h

@@ -15,7 +15,6 @@ void onWsEvent(
     uint8_t *data,
     size_t len);
 void sendInfo();
-void sendMinimalInfo();
 void initWebsocketServer(AsyncWebServer &server);
 void cleanUpClients();
 

src/PluginManager.cpp

@@ -145,6 +145,6 @@ void PluginManager::activateNextPlugin()
         setActivePluginById(1);
     }
 #ifdef ENABLE_SERVER
-    sendMinimalInfo();
+    sendInfo();
 #endif
 }

src/scheduler.cpp

@@ -18,17 +18,22 @@ void PluginScheduler::addItem(int pluginId, unsigned long durationSeconds)
 
 void PluginScheduler::clearSchedule(bool emptyStorage)
 {
-  schedule.clear();
   currentIndex = 0;
   isActive = false;
 #ifdef ENABLE_STORAGE
   if (emptyStorage)
   {
-    storage.begin("led-wall", false);
+    schedule.clear();
+    storage.begin("led-wall");
     storage.putString("schedule", "");
     storage.putInt("scheduleactive", 0);
     storage.end();
   }
+#else
+  if (emptyStorage)
+  {
+    schedule.clear();
+  }
 #endif
 }
 
@@ -78,7 +83,7 @@ void PluginScheduler::switchToCurrentPlugin()
   {
     pluginManager.setActivePluginById(schedule[currentIndex].pluginId);
 #ifdef ENABLE_SERVER
-    sendMinimalInfo();
+    sendInfo();
 #endif
   }
 }
@@ -118,26 +123,22 @@ bool PluginScheduler::setScheduleByJSONString(String scheduleJson)
   }
 
 #ifdef ENABLE_STORAGE
-  storage.begin("led-wall", false);
+  storage.begin("led-wall");
   storage.putString("schedule", scheduleJson);
   storage.end();
 #endif
 
-  Scheduler.clearSchedule();
+  clearSchedule();
 
-  JsonArray schedule = doc.as<JsonArray>();
-  for (JsonObject item : schedule)
+  for (const auto &item : doc.as<JsonArray>())
   {
-    if (!item.containsKey("pluginId") || !item.containsKey("duration"))
+    if (item.containsKey("pluginId") && item.containsKey("duration"))
     {
-      return false;
+      int pluginId = item["pluginId"].as<int>();
+      unsigned long duration = item["duration"].as<unsigned long>();
+      addItem(pluginId, duration);
     }
-
-    int pluginId = item["pluginId"].as<int>();
-    unsigned long duration = item["duration"].as<unsigned long>();
-    Scheduler.addItem(pluginId, duration);
   }
-
   return true;
 }
 

src/screen.cpp

@@ -24,7 +24,7 @@ void Screen_::setBrightness(uint8_t brightness, bool shouldStore)
 #ifdef ENABLE_STORAGE
   if (shouldStore)
   {
-    storage.begin("led-wall", false);
+    storage.begin("led-wall");
     storage.putUInt("brightness", brightness);
     storage.end();
   }