Merge pull request FastLED#1006 from drzony/master

ESP32: Fixed SemaphoreGive when using RMT builtin driver
be-engineer · May 25, 2020 · 0076bbc · 0076bbc
2 parents cfce255 + 423588f
commit 0076bbc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/platforms/esp/32/clockless_i2s_esp32.h b/platforms/esp/32/clockless_i2s_esp32.h
@@ -363,7 +363,7 @@ class ClocklessController : public CPixelLEDController<RGB_ORDER>
         freq=1/(CLOCK_DIVIDER_N+(double)CLOCK_DIVIDER_B/CLOCK_DIVIDER_A);
         freq=freq*I2S_BASE_CLK;
         // Serial.printf("calculted for i2s frequency:%f Mhz N:%d B:%d A:%d\n",freq/1000000,CLOCK_DIVIDER_N,CLOCK_DIVIDER_B,CLOCK_DIVIDER_A);
-        double pulseduration=1000000000/freq;
+        // double pulseduration=1000000000/freq;
         // Serial.printf("Pulse duration: %f ns\n",pulseduration);
         // gPulsesPerBit = (T1ns + T2ns + T3ns)/FASTLED_I2S_NS_PER_PULSE;
 
@@ -510,8 +510,8 @@ class ClocklessController : public CPixelLEDController<RGB_ORDER>
 
         // -- Allocate i2s interrupt
         SET_PERI_REG_BITS(I2S_INT_ENA_REG(I2S_DEVICE), I2S_OUT_EOF_INT_ENA_V, 1, I2S_OUT_EOF_INT_ENA_S);
-        esp_err_t e = esp_intr_alloc(interruptSource, 0, // ESP_INTR_FLAG_INTRDISABLED | ESP_INTR_FLAG_LEVEL3,
-                                     &interruptHandler, 0, &gI2S_intr_handle);
+        esp_intr_alloc(interruptSource, 0, // ESP_INTR_FLAG_INTRDISABLED | ESP_INTR_FLAG_LEVEL3,
+                       &interruptHandler, 0, &gI2S_intr_handle);
 
         // -- Create a semaphore to block execution until all the controllers are done
         if (gTX_sem == NULL) {
@@ -645,7 +645,7 @@ class ClocklessController : public CPixelLEDController<RGB_ORDER>
         }
 
         // -- Transpose and encode the pixel data for the DMA buffer
-        int buf_index = 0;
+        // int buf_index = 0;
         for (int channel = 0; channel < NUM_COLOR_CHANNELS; channel++) {
 
             // -- Tranpose each array: all the bit 7's, then all the bit 6's, ...

diff --git a/platforms/esp/32/clockless_rmt_esp32.h b/platforms/esp/32/clockless_rmt_esp32.h
@@ -481,8 +481,12 @@ class ClocklessController : public CPixelLEDController<RGB_ORDER>
 
         if (gNumDone == gNumControllers) {
             // -- If this is the last controller, signal that we are all done
-            xSemaphoreGiveFromISR(gTX_sem, &HPTaskAwoken);
-            if(HPTaskAwoken == pdTRUE) portYIELD_FROM_ISR();
+            if (FASTLED_RMT_BUILTIN_DRIVER) {
+                xSemaphoreGive(gTX_sem);
+            } else {
+                xSemaphoreGiveFromISR(gTX_sem, &HPTaskAwoken);
+                if (HPTaskAwoken == pdTRUE) portYIELD_FROM_ISR();
+            }
         } else {
             // -- Otherwise, if there are still controllers waiting, then
             //    start the next one on this channel