feedc0de/NeoPixelBus
1
0
Fork 0
forked from Makuna/NeoPixelBus
Code Pull Requests Activity

Default Back to i2s method (#431)

Browse Source
This commit is contained in:
Michael Miller
2021-02-14 17:16:06 -08:00
committed by GitHub
parent 8161894491
commit b76a42bb5a
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal/NeoEsp32I2sMethod.h
View File

@@ -303,7 +303,8 @@ typedef NeoEsp32I2sMethodBase<NeoEsp32I2sSpeedApa106, NeoEsp32I2sBusN, NeoEsp32I
#endif #endif
/* due to a core issue where requests to send aren't consistent, I2s is no longer the default #if !defined(NEOPIXEL_ESP32_RMT_DEFAULT)
// I2s Bus 1 method is the default method for Esp32 // I2s Bus 1 method is the default method for Esp32
typedef NeoEsp32I2s1Ws2812xMethod NeoWs2813Method; typedef NeoEsp32I2s1Ws2812xMethod NeoWs2813Method;
typedef NeoEsp32I2s1Ws2812xMethod NeoWs2812xMethod; typedef NeoEsp32I2s1Ws2812xMethod NeoWs2812xMethod;
@@ -328,6 +329,7 @@ typedef NeoEsp32I2s1Apa106InvertedMethod NeoApa106InvertedMethod;
typedef NeoEsp32I2s1Ws2812xInvertedMethod Neo800KbpsInvertedMethod; typedef NeoEsp32I2s1Ws2812xInvertedMethod Neo800KbpsInvertedMethod;
typedef NeoEsp32I2s1400KbpsInvertedMethod Neo400KbpsInvertedMethod; typedef NeoEsp32I2s1400KbpsInvertedMethod Neo400KbpsInvertedMethod;
*/
#endif // !defined(NEOPIXEL_ESP32_RMT_DEFAULT)
#endif #endif

11
src/internal/NeoEsp32RmtMethod.h
View File

@@ -667,10 +667,12 @@ typedef NeoEsp32RmtMethodBase<NeoEsp32RmtInvertedSpeed800Kbps, NeoEsp32RmtChanne
typedef NeoEsp32RmtMethodBase<NeoEsp32RmtInvertedSpeed400Kbps, NeoEsp32RmtChannel7> NeoEsp32Rmt7400KbpsInvertedMethod; typedef NeoEsp32RmtMethodBase<NeoEsp32RmtInvertedSpeed400Kbps, NeoEsp32RmtChannel7> NeoEsp32Rmt7400KbpsInvertedMethod;
#endif #endif
#if defined(NEOPIXEL_ESP32_RMT_DEFAULT)
// Normally I2s method is the default, defining NEOPIXEL_ESP32_RMT_DEFAULT
// will switch to use RMT as the default method
#if !defined(CONFIG_IDF_TARGET_ESP32S2) #if !defined(CONFIG_IDF_TARGET_ESP32S2)
// (RMT_CHANNEL_MAX == 8) // (RMT_CHANNEL_MAX == 8)
// due to a core issue where requests to send aren't consistent with I2s, RMT ch6 is temporarily the default
// RMT channel 6 method is the default method for Esp32 // RMT channel 6 method is the default method for Esp32
typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2813Method; typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2813Method;
typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2812xMethod; typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2812xMethod;
@@ -695,9 +697,8 @@ typedef NeoEsp32Rmt6Apa106InvertedMethod NeoApa106InvertedMethod;
typedef NeoEsp32Rmt6Ws2812xInvertedMethod Neo800KbpsInvertedMethod; typedef NeoEsp32Rmt6Ws2812xInvertedMethod Neo800KbpsInvertedMethod;
typedef NeoEsp32Rmt6400KbpsInvertedMethod Neo400KbpsInvertedMethod; typedef NeoEsp32Rmt6400KbpsInvertedMethod Neo400KbpsInvertedMethod;
#else #else // !defined(CONFIG_IDF_TARGET_ESP32S2)
// due to a core issue where requests to send aren't consistent with I2s, RMT ch3 is temporarily the default
// RMT channel 3 method is the default method for Esp32S2 // RMT channel 3 method is the default method for Esp32S2
typedef NeoEsp32Rmt3Ws2812xMethod NeoWs2813Method; typedef NeoEsp32Rmt3Ws2812xMethod NeoWs2813Method;
typedef NeoEsp32Rmt3Ws2812xMethod NeoWs2812xMethod; typedef NeoEsp32Rmt3Ws2812xMethod NeoWs2812xMethod;
@@ -723,6 +724,8 @@ typedef NeoEsp32Rmt3Apa106InvertedMethod NeoApa106InvertedMethod;
typedef NeoEsp32Rmt3Ws2812xInvertedMethod Neo800KbpsInvertedMethod; typedef NeoEsp32Rmt3Ws2812xInvertedMethod Neo800KbpsInvertedMethod;
typedef NeoEsp32Rmt3400KbpsInvertedMethod Neo400KbpsInvertedMethod; typedef NeoEsp32Rmt3400KbpsInvertedMethod Neo400KbpsInvertedMethod;
#endif #endif // !defined(CONFIG_IDF_TARGET_ESP32S2)
#endif // defined(NEOPIXEL_ESP32_RMT_DEFAULT)
#endif #endif