bbulkow/FastLED-idf
1
0
Fork 1
mirror of https://github.com/bbulkow/FastLED-idf.git synced 2025-07-30 18:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for multiple channels and multiple MEM_BLOCKS, suggested by @samguyer

Browse Source 
Should resolve issue #16 , checkin ahead of test because it can't get worse :-)
This commit is contained in:
Brian Bulkowski
2020-09-14 11:06:23 -07:00
parent 69c28ee3f5
commit b7f96a8b62
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/FastLED-idf/platforms/esp/32/clockless_rmt_esp32.cpp
View File

@ -225,17 +225,15 @@ void ESP32RMTController::init()
// warning: using more than MEM_BLOCK_NUM 1 means sometimes this might fail because // warning: using more than MEM_BLOCK_NUM 1 means sometimes this might fail because
// we don't have enough MEM_BLOCKs. Todo: add code to track and only allocate as many channels // we don't have enough MEM_BLOCKs. Todo: add code to track and only allocate as many channels
// as we have memblocks. // as we have memblocks.
ESP_ERROR_CHECK( ESP_ERROR_CHECK( rmt_config(&rmt_tx) );
rmt_config(&rmt_tx)
);
if (FASTLED_RMT_BUILTIN_DRIVER) { if (FASTLED_RMT_BUILTIN_DRIVER) {
rmt_driver_install(rmt_channel_t(i), 0, 0); ESP_ERROR_CHECK( rmt_driver_install(rmt_channel_t(i), 0, 0) );
} else { } else {
// -- Set up the RMT to send 32 bits of the pulse buffer and then // -- Set up the RMT to send 32 bits of the pulse buffer and then
// generate an interrupt. When we get this interrupt we // generate an interrupt. When we get this interrupt we
// fill the other part in preparation (like double-buffering) // fill the other part in preparation (like double-buffering)
rmt_set_tx_thr_intr_en(rmt_channel_t(i), true, PULSES_PER_FILL); ESP_ERROR_CHECK( rmt_set_tx_thr_intr_en(rmt_channel_t(i), true, PULSES_PER_FILL) );
} }
} }
@ -290,7 +288,9 @@ void ESP32RMTController::showPixels()
int channel = 0; int channel = 0;
while (channel < FASTLED_RMT_MAX_CHANNELS && gNext < gNumControllers) { while (channel < FASTLED_RMT_MAX_CHANNELS && gNext < gNumControllers) {
ESP32RMTController::startNext(channel); ESP32RMTController::startNext(channel);
channel++; // -- Important: when we use more than one memory block, we need to
// skip the channels that would otherwise overlap in memory. SZG
channel += MEM_BLOCK_NUM;
} }
// -- Make sure it's been at least 50us since last show // -- Make sure it's been at least 50us since last show