isPosition guarded by mutex, monitor using channelsD

Author: ewowi

src/MoonLight/Layers/PhysicalLayer.cpp

@@ -111,7 +111,7 @@ void PhysicalLayer::loopDrivers() {
     if (prevSize != lights.header.size) node->onSizeChanged(prevSize);
     if (node->on) node->loop();
   }
-  
+
   prevSize = lights.header.size;
 }
 
@@ -131,9 +131,14 @@ void PhysicalLayer::onLayoutPre() {
   if (pass == 1) {
     lights.header.nrOfLights = 0;  // for pass1 and pass2 as in pass2 virtual layer needs it
     lights.header.size = {0, 0, 0};
+    extern SemaphoreHandle_t swapMutex;
+    xSemaphoreTake(swapMutex, portMAX_DELAY);
     EXT_LOGD(ML_TAG, "positions in progress (%d -> 1)", lights.header.isPositions);
     lights.header.isPositions = 1;  // in progress...
-    delay(100);                     // wait to stop effects
+    xSemaphoreGive(swapMutex);
+
+    delay(100);  // wait to stop effects
+
     // set all channels to 0 (e.g for multichannel to not activate unused channels, e.g. fancy modes on MHs)
     memset(lights.channelsE, 0, lights.maxChannels);  // set all the channels to 0, positions in channelsE
     // dealloc pins
@@ -206,8 +211,11 @@ void PhysicalLayer::onLayoutPost() {
     lights.header.nrOfChannels = lights.header.nrOfLights * lights.header.channelsPerLight * ((lights.header.lightPreset == lightPreset_RGB2040) ? 2 : 1);  // RGB2040 has empty channels
     EXT_LOGD(ML_TAG, "pass %d mp:%d #:%d / %d s:%d,%d,%d", pass, monitorPass, lights.header.nrOfLights, lights.header.nrOfChannels, lights.header.size.x, lights.header.size.y, lights.header.size.z);
     // send the positions to the UI _socket_emit
+    extern SemaphoreHandle_t swapMutex;
+    xSemaphoreTake(swapMutex, portMAX_DELAY);
     EXT_LOGD(ML_TAG, "positions stored (%d -> %d)", lights.header.isPositions, lights.header.nrOfLights ? 2 : 3);
     lights.header.isPositions = lights.header.nrOfLights ? 2 : 3;  // filled with positions, set back to 3 in ModuleEffects, or direct to 3 if no lights (effects will move it to 0)
+    xSemaphoreGive(swapMutex);
 
     // initLightsToBlend();
 

src/MoonLight/Modules/ModuleLightsControl.h

@@ -352,18 +352,27 @@ class ModuleLightsControl : public Module {
     }
 
   #if FT_ENABLED(FT_MONITOR)
-    extern SemaphoreHandle_t monitorMutex;        // defined in main
-    if (layerP.lights.header.isPositions == 2) {  // send to UI
+    extern SemaphoreHandle_t monitorMutex;  // defined in main
+    extern SemaphoreHandle_t swapMutex;
+
+    // Check and transition under lock
+    xSemaphoreTake(swapMutex, portMAX_DELAY);
+    uint8_t isPositions = layerP.lights.header.isPositions;
+    xSemaphoreGive(swapMutex);
+
+    if (isPositions == 2) {  // send to UI
       read([&](ModuleState& _state) {
         if (_socket->getConnectedClients() && _state.data["monitorOn"]) {
           _socket->emitEvent("monitor", (char*)&layerP.lights.header, 37);                                                                     // sizeof(LightsHeader)); //sizeof(LightsHeader), nearest prime nr above 32 to avoid monitor data to be seen as header
           _socket->emitEvent("monitor", (char*)layerP.lights.channelsE, MIN(layerP.lights.header.nrOfLights * 3, layerP.lights.maxChannels));  //*3 is for 3 bytes position
         }
         memset(layerP.lights.channelsE, 0, layerP.lights.maxChannels);  // set all the channels to 0 //cleaning the positions
-        EXT_LOGD(ML_TAG, "positions sent to monitor (2 -> 3, #L:%d maxC:%d)", layerP.lights.header.nrOfLights, layerP.lights.maxChannels);
+        xSemaphoreTake(swapMutex, portMAX_DELAY);
+        EXT_LOGD(ML_TAG, "positions sent to monitor (2 -> 3)");
         layerP.lights.header.isPositions = 3;
+        xSemaphoreGive(swapMutex);
       });
-    } else if (layerP.lights.header.isPositions == 0 && layerP.lights.header.nrOfLights) {  // send to UI
+    } else if (isPositions == 0 && layerP.lights.header.nrOfLights) {  // send to UI
       static unsigned long monitorMillis = 0;
       if (millis() - monitorMillis >= layerP.lights.header.nrOfLights / 12) {
         monitorMillis = millis();
@@ -372,7 +381,7 @@ class ModuleLightsControl : public Module {
           if (_socket->getConnectedClients() && _state.data["monitorOn"]) {
             // protect emit by monitorMutex, see main.cpp
             xSemaphoreTake(monitorMutex, portMAX_DELAY);
-            _socket->emitEvent("monitor", (char*)layerP.lights.channelsE, MIN(layerP.lights.header.nrOfChannels, layerP.lights.maxChannels));
+            _socket->emitEvent("monitor", (char*)layerP.lights.channelsD, MIN(layerP.lights.header.nrOfChannels, layerP.lights.maxChannels));  // use channelsD as it won't be overwritten by effects during loop
             xSemaphoreGive(monitorMutex);
           }
         });

src/main.cpp

@@ -128,7 +128,12 @@ void effectTask(void* pvParameters) {
   static unsigned long last20ms = 0;
 
   while (true) {
-    if (layerP.lights.header.isPositions == 0) {  // driver task can change this
+    // Check state under lock
+    xSemaphoreTake(swapMutex, portMAX_DELAY);
+    uint8_t isPositions = layerP.lights.header.isPositions;
+    xSemaphoreGive(swapMutex);
+
+    if (isPositions == 0) {  // driver task can change this
       if (layerP.lights.useDoubleBuffer) {
         xSemaphoreTake(swapMutex, portMAX_DELAY);
         bool canProduce = !newFrameReady;
@@ -138,21 +143,21 @@ void effectTask(void* pvParameters) {
           // Copy previous frame (channelsD) to working buffer (channelsE)
           memcpy(layerP.lights.channelsE, layerP.lights.channelsD, layerP.lights.header.nrOfChannels);
 
-          xSemaphoreTake(monitorMutex, portMAX_DELAY);  // don't change channelsE while the monitor display data is sent
           layerP.loop();
 
           if (millis() - last20ms >= 20) {
             last20ms = millis();
             layerP.loop20ms();
           }
-          xSemaphoreGive(monitorMutex);
 
           // Atomic swap channels
           xSemaphoreTake(swapMutex, portMAX_DELAY);
+          xSemaphoreTake(monitorMutex, portMAX_DELAY);
           uint8_t* temp = layerP.lights.channelsD;
           layerP.lights.channelsD = layerP.lights.channelsE;
           layerP.lights.channelsE = temp;
           newFrameReady = true;
+          xSemaphoreGive(monitorMutex);
           xSemaphoreGive(swapMutex);
         }
 
@@ -180,12 +185,16 @@ void driverTask(void* pvParameters) {
   // layerP.setup() done in effectTask
 
   while (true) {
+    // Check and transition state under lock
+    xSemaphoreTake(swapMutex, portMAX_DELAY);
     if (layerP.lights.header.isPositions == 3) {
       EXT_LOGD(ML_TAG, "positions done (3 -> 0)");
-      layerP.lights.header.isPositions = 0;  // now driver can show again
+      layerP.lights.header.isPositions = 0;
     }
+    uint8_t isPositions = layerP.lights.header.isPositions;
+    xSemaphoreGive(swapMutex);
 
-    if (layerP.lights.header.isPositions == 0) {
+    if (isPositions == 0) {
       xSemaphoreTake(swapMutex, portMAX_DELAY);
       if (layerP.lights.useDoubleBuffer) {
         if (newFrameReady) {