Makuna/NeoPixelBus
1
0
Fork 1
mirror of https://github.com/Makuna/NeoPixelBus.git synced 2025-08-15 16:40:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rmt is now dynamic channel only so its RmtX

Browse Source
This commit is contained in:
Michael Miller
2024-09-17 13:59:03 -07:00
parent 070cb5bfb4
commit 0aaad105c1
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal/methods/ESP/ESP32/Core_2_x/NeoEsp32RmtMethod.h
View File

@@ -976,7 +976,7 @@ typedef NeoEsp32Rmt7Ws2805InvertedMethod NeoEsp32Rmt7Ws2814InvertedMethod;
// Normally I2s method is the default, defining NEOPIXEL_ESP32_RMT_DEFAULT // Normally I2s method is the default, defining NEOPIXEL_ESP32_RMT_DEFAULT
// will switch to use RMT as the default method // will switch to use RMT as the default method
// The ESP32S2, ESP32S3, and ESP32C3 will always defualt to RMT // The ESP32S2, ESP32S3, and ESP32C3 will always default to RMT
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)

5
src/internal/methods/ESP/ESP32/NeoEsp32RmtMethod.h → src/internal/methods/ESP/ESP32/NeoEsp32RmtXMethod.h
View File

@@ -299,8 +299,7 @@ private:
rmt_transmit_config_t _tx_config = {}; rmt_transmit_config_t _tx_config = {};
rmt_encoder_handle_t _led_encoder = nullptr; rmt_encoder_handle_t _led_encoder = nullptr;
rmt_channel_handle_t _channel = nullptr; // holds instance for multi channel support rmt_channel_handle_t _channel = nullptr; // holds dynamic instance for multi channel support
// Holds data stream which include LED color values and other settings as needed // Holds data stream which include LED color values and other settings as needed
uint8_t* _dataEditing; // exposed for get and set uint8_t* _dataEditing; // exposed for get and set
@@ -353,7 +352,7 @@ typedef NeoEsp32RmtMethodBase<NeoEsp32RmtInvertedSpeed400Kbps> NeoEsp32RmtX400Kb
// Normally I2s method is the default, defining NEOPIXEL_ESP32_RMT_DEFAULT // Normally I2s method is the default, defining NEOPIXEL_ESP32_RMT_DEFAULT
// will switch to use RMT as the default method // will switch to use RMT as the default method
// The ESP32S2 & ESP32C3 will always defualt to RMT // The ESP32S2 & ESP32C3 will always default to RMT
typedef NeoEsp32RmtXWs2812xMethod NeoWs2813Method; typedef NeoEsp32RmtXWs2812xMethod NeoWs2813Method;
typedef NeoEsp32RmtXWs2812xMethod NeoWs2812xMethod; typedef NeoEsp32RmtXWs2812xMethod NeoWs2812xMethod;

2
src/internal/methods/NeoEsp8266I2sMethodCore.h
View File

@@ -291,7 +291,7 @@ protected:
// the last item will loop to the first item // the last item will loop to the first item
_i2sBufDesc[indexDesc - 1].next_link_ptr = reinterpret_cast<struct slc_queue_item*>(&(_i2sBufDesc[0])); _i2sBufDesc[indexDesc - 1].next_link_ptr = reinterpret_cast<struct slc_queue_item*>(&(_i2sBufDesc[0]));
// the last state block will loop to the first state block by defualt // the last state block will loop to the first state block by default
_i2sBufDesc[c_StateBlockCount - 1].next_link_ptr = reinterpret_cast<struct slc_queue_item*>(&(_i2sBufDesc[0])); _i2sBufDesc[c_StateBlockCount - 1].next_link_ptr = reinterpret_cast<struct slc_queue_item*>(&(_i2sBufDesc[0]));
// setup the rest of i2s DMA // setup the rest of i2s DMA