Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FastLED/FastLED.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Guyer <sam.guyer@gmail.com>2021-01-12 06:42:27 +0300
committerGitHub <noreply@github.com>2021-01-12 06:42:27 +0300
commitee0742e5fc3a443a886a34f06c0e92c3828009ce (patch)
tree33addf5ab12079a8074f13abcc43428d81ea2e3f
parentffee7627d0c5d70303df337a285d030fca2cbe77 (diff)
parente1e5a54ad64f004f78afb24a230c5d3fafd8c1ca (diff)
Merge pull request #1172 from estshorter/fix_compilation_warning_esp_idf_v4.2
Fix deprecated warnings about #include "esp_intr.h"
-rw-r--r--src/platforms/esp/32/clockless_i2s_esp32.h6
-rw-r--r--src/platforms/esp/32/clockless_rmt_esp32.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/src/platforms/esp/32/clockless_i2s_esp32.h b/src/platforms/esp/32/clockless_i2s_esp32.h
index d7af459d..5c7979cf 100644
--- a/src/platforms/esp/32/clockless_i2s_esp32.h
+++ b/src/platforms/esp/32/clockless_i2s_esp32.h
@@ -103,7 +103,13 @@ extern "C" {
#include "driver/gpio.h"
#include "driver/periph_ctrl.h"
#include "rom/lldesc.h"
+#include "esp_system.h" // Load ESP_IDF_VERSION_MAJOR if exists
+// ESP_IDF_VERSION_MAJOR is defined in ESP-IDF v3.3 or later
+#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR > 3
+#include "esp_intr_alloc.h"
+#else
#include "esp_intr.h"
+#endif
#include "esp_log.h"
#ifdef __cplusplus
diff --git a/src/platforms/esp/32/clockless_rmt_esp32.h b/src/platforms/esp/32/clockless_rmt_esp32.h
index 3a10f9ca..faa31dc5 100644
--- a/src/platforms/esp/32/clockless_rmt_esp32.h
+++ b/src/platforms/esp/32/clockless_rmt_esp32.h
@@ -113,7 +113,12 @@ extern "C" {
#endif
#include "esp32-hal.h"
+// ESP_IDF_VERSION_MAJOR is defined in ESP-IDF v3.3 or later
+#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR > 3
+#include "esp_intr_alloc.h"
+#else
#include "esp_intr.h"
+#endif
#include "driver/gpio.h"
#include "driver/rmt.h"
#include "driver/periph_ctrl.h"