diff --git a/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h b/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h index 7d50191a..05abfb70 100644 --- a/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h +++ b/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h @@ -29,6 +29,7 @@ License along with NeoPixel. If not, see #pragma once #if defined(ARDUINO_ARCH_ESP32) +#if !defined(WLED_USE_SHARED_RMT) && !defined(__riscv) && (ESP_IDF_VERSION_MAJOR >= 4) // WLEDMM don't compile this file on unsupported platforms // Use the NeoEspRmtSpeed types from the driver-based implementation #include @@ -485,3 +486,4 @@ typedef NeoEsp32RmtHI7Ws2805InvertedMethod NeoEsp32RmtHI7Ws2814InvertedMethod; #endif // !defined(CONFIG_IDF_TARGET_ESP32C3) #endif +#endif diff --git a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S index 0c60d2eb..9be11a65 100644 --- a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S +++ b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHI.S @@ -6,6 +6,7 @@ */ #if defined(__XTENSA__) && defined(ESP32) && !defined(CONFIG_BTDM_CTRL_HLI) +#if !defined(WLED_USE_SHARED_RMT) && !defined(__riscv) && defined(ARDUINO_ARCH_ESP32) && (ESP_IDF_VERSION_MAJOR >= 4) // WLEDMM don't compile this file on unsupported platforms #include #include "sdkconfig.h" @@ -260,4 +261,5 @@ ld_include_hli_vectors_rmt: #endif // CONFIG_BTDM_CTRL_HLI +#endif // WLEDMM #endif // XTensa \ No newline at end of file diff --git a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp index 8353201f..63cd3163 100644 --- a/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp +++ b/lib/NeoESP32RmtHI/src/NeoEsp32RmtHIMethod.cpp @@ -30,6 +30,7 @@ License along with NeoPixel. If not, see #include #if defined(ARDUINO_ARCH_ESP32) +#if !defined(WLED_USE_SHARED_RMT) && !defined(__riscv) && (ESP_IDF_VERSION_MAJOR >= 4) // WLEDMM don't compile this file on unsupported platforms #include #include "esp_idf_version.h" @@ -504,4 +505,5 @@ esp_err_t NeoEsp32RmtHiMethodDriver::WaitForTxDone(rmt_channel_t channel, TickTy return rv; } +#endif #endif \ No newline at end of file diff --git a/wled00/bus_wrapper.h b/wled00/bus_wrapper.h index 846277ba..41e7b39c 100644 --- a/wled00/bus_wrapper.h +++ b/wled00/bus_wrapper.h @@ -184,7 +184,7 @@ bool canUseSerial(void); // WLEDMM (wled_serial.cpp) returns true if Serial ca #endif -// RMT driver selection +// RMT driver selection - only for Xtensa and ESP-IDF 4.x #if !defined(WLED_USE_SHARED_RMT) && !defined(__riscv) && defined(ARDUINO_ARCH_ESP32) && (ESP_IDF_VERSION_MAJOR >= 4) #include