tweak for ESP-IDFv5 and ArduinoESP32 v3

lovyan03 · Nov 1, 2023 · 49eed9c · 49eed9c
1 parent 462610a
commit 49eed9c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/src/lgfx/v1/platforms/esp32/Bus_SPI.cpp b/src/lgfx/v1/platforms/esp32/Bus_SPI.cpp
@@ -46,29 +46,20 @@ Original Source:
 #if defined (ARDUINO) // Arduino ESP32
  #include <soc/periph_defs.h>
  #include <esp32-hal-cpu.h>
-#else
- #include <driver/spi_master.h>
-
- #if defined ( CONFIG_IDF_TARGET_ESP32S3 )
- #if __has_include (<esp32s3/rom/gpio.h>)
- #include <esp32s3/rom/gpio.h>
- #else
- #include <rom/gpio.h>
- #endif
- #elif defined ( CONFIG_IDF_TARGET_ESP32S2 )
- #if __has_include (<esp32s2/rom/gpio.h>)
- #include <esp32s2/rom/gpio.h>
- #else
- #include <rom/gpio.h>
- #endif
- #else
- #if __has_include (<esp32/rom/gpio.h>)
- #include <esp32/rom/gpio.h>
- #else
- #include <rom/gpio.h>
- #endif
- #endif
 #endif
+#include <driver/spi_master.h>
+
+#if defined ESP_IDF_VERSION_MAJOR && ESP_IDF_VERSION_MAJOR >= 5
+ #include <rom/gpio.h> // dispatched by core
+#elif defined ( CONFIG_IDF_TARGET_ESP32S3 ) && __has_include (<esp32s3/rom/gpio.h>)
+ #include <esp32s3/rom/gpio.h> // dispatched by config
+#elif defined ( CONFIG_IDF_TARGET_ESP32S2 ) && __has_include (<esp32s2/rom/gpio.h>)
+ #include <esp32s2/rom/gpio.h> // dispatched by config
+#elif defined ( CONFIG_IDF_TARGET_ESP32 ) && __has_include (<esp32/rom/gpio.h>)
+ #include <esp32/rom/gpio.h>
+#else
+ #include <rom/gpio.h> // dispatched by core
+#endif 
 
 #ifndef SPI_PIN_REG
  #define SPI_PIN_REG SPI_MISC_REG

diff --git a/src/lgfx/v1/platforms/esp32/Light_PWM.cpp b/src/lgfx/v1/platforms/esp32/Light_PWM.cpp
@@ -22,6 +22,9 @@ Original Source:
 
 #if defined ( ARDUINO )
  #include <esp32-hal-ledc.h>
+ #if __has_include(<esp_arduino_version.h>)
+ #include <esp_arduino_version.h>
+ #endif
 #else
  #include <driver/ledc.h>
 #endif
@@ -40,10 +43,20 @@ namespace lgfx
 
 #if defined ( ARDUINO )
 
+#if defined ESP_ARDUINO_VERSION
+ #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+ #define LEDC_USE_IDF_V5 // esp32-arduino core 3.x.x uses the new ledC syntax
+ #endif 
+#endif
+
+#if defined LEDC_USE_IDF_V5
+ ledcAttach(_cfg.pin_bl, _cfg.freq, PWM_BITS); 
+ setBrightness(brightness);
+#else
  ledcSetup(_cfg.pwm_channel, _cfg.freq, PWM_BITS);
  ledcAttachPin(_cfg.pin_bl, _cfg.pwm_channel);
  setBrightness(brightness);
-
+#endif
 #else
 
  static ledc_channel_config_t ledc_channel;