[ESP-IDF5.1] Fix build issue on older IDF based builds

letscontrolit · Oct 23, 2023 · 65666f8 · 65666f8
1 parent 852a709
commit 65666f8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod.cpp b/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod.cpp
@@ -28,12 +28,12 @@ License along with NeoPixel.  If not, see
 -------------------------------------------------------------------------*/
 
 #include <Arduino.h>
+
+#if defined(ARDUINO_ARCH_ESP32) && ESP_IDF_VERSION_MAJOR < 5 && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32C2)
 #include "NeoSettings.h"
 #include "NeoBusChannel.h"
 #include "NeoEsp32RmtMethod.h"
 
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32C2)
-
 
 // translate NeoPixelBuffer into RMT buffer
 // this is done on the fly so we don't require a send buffer in raw RMT format

diff --git a/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod.h b/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod.h
@@ -29,7 +29,7 @@ License along with NeoPixel.  If not, see
 
 #pragma once
 
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32C2)
+#if defined(ARDUINO_ARCH_ESP32) && ESP_IDF_VERSION_MAJOR < 5 && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32C2)
 
 /*  General Reference documentation for the APIs used in this implementation
 LOW LEVEL:  (what is actually used)

diff --git a/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod_idf5.cpp b/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod_idf5.cpp
@@ -1,7 +1,6 @@
+#if ESP_IDF_VERSION_MAJOR >= 5 && defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C2)
 #include "../internal/NeoEsp32RmtMethod_idf5.h"
 
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C2)
-
 
 size_t rmt_encode_led_strip(rmt_encoder_t *encoder, rmt_channel_handle_t channel, const void *primary_data, size_t data_size, rmt_encode_state_t *ret_state)
 {

diff --git a/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod_idf5.h b/lib/NeoPixelBus/src/internal/NeoEsp32RmtMethod_idf5.h
@@ -29,7 +29,7 @@ License along with NeoPixel.  If not, see
 
 #pragma once
 
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C2)
+#if defined(ARDUINO_ARCH_ESP32) && ESP_IDF_VERSION_MAJOR >= 5 && !defined(CONFIG_IDF_TARGET_ESP32C2)
 
 /*  General Reference documentation for the APIs used in this implementation
 LOW LEVEL:  (what is actually used)
@@ -367,9 +367,9 @@ class NeoEsp32RmtChannelN
 {
 public:
     NeoEsp32RmtChannelN(NeoBusChannel channel) :
-        RmtChannelNumber(RmtChannelNumber)
+        RmtChannelNumber(nullptr)
     {
-        RmtChannelNumber = NULL;
+        //RmtChannelNumber = NULL;
     };
     NeoEsp32RmtChannelN() = delete; // no default constructor
     rmt_channel_handle_t RmtChannelNumber = NULL;

diff --git a/lib/NeoPixelBus/src/internal/NeoEsp32SpiMethod_idf5.h b/lib/NeoPixelBus/src/internal/NeoEsp32SpiMethod_idf5.h
@@ -28,7 +28,7 @@ License along with NeoPixel.  If not, see
 
 #pragma once
 
-#if defined(ARDUINO_ARCH_ESP32)
+#if defined(ARDUINO_ARCH_ESP32) && ESP_IDF_VERSION_MAJOR >= 5
 
 #if (defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C6)) && !defined(HSPI_HOST)
 // HSPI_HOST depreciated in C3
@@ -37,7 +37,7 @@ License along with NeoPixel.  If not, see
 
 #include <Arduino.h>
 
-extern void AddLog(uint32_t loglevel, PGM_P formatP, ...); // TODO: Remove all Addlogs
+// extern void AddLog(uint32_t loglevel, PGM_P formatP, ...); // TODO: Remove all Addlogs
 
 extern "C"
 {
@@ -329,7 +329,7 @@ template<typename T_SPEED, typename T_CHANNEL> class NeoEsp32SpiMethodBase
         _spi_strip->bytes_per_pixel = bytes_per_pixel;
         _spi_strip->strip_len = _pixelCount;
 
-        AddLog(2,"SPI:initialized with error code: %u on pin: %u",ret, _pin);
+        // AddLog(2,"SPI:initialized with error code: %u on pin: %u",ret, _pin);
         return;
     err:
         if (_spi_strip) {
@@ -341,7 +341,7 @@ template<typename T_SPEED, typename T_CHANNEL> class NeoEsp32SpiMethodBase
             }
             free(_spi_strip);
         }
-        AddLog(2,"SPI-Error:initialized with error code: %u on pin: %u",ret, _pin);
+        // AddLog(2,"SPI-Error:initialized with error code: %u on pin: %u",ret, _pin);
         return;
     }