[ESP-IDF 5.1] Fix building ESP32-S3

letscontrolit · Oct 6, 2023 · e4a9bea · e4a9bea
1 parent 8e0e502
commit e4a9bea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp
@@ -40,13 +40,17 @@
   # if ESP_IDF_VERSION_MAJOR > 3      // IDF 4+
     #  if CONFIG_IDF_TARGET_ESP32S3   // ESP32-S3
       #   include <esp32s3/rom/spi_flash.h>
+      #if ESP_IDF_VERSION_MAJOR < 5
       #   include <esp32s3/spiram.h>
+      #endif
       #   include <esp32s3/rom/rtc.h>
 
       # define HAS_HALL_EFFECT_SENSOR  0
     #  elif CONFIG_IDF_TARGET_ESP32S2   // ESP32-S2
       #   include <esp32s2/rom/spi_flash.h>
+      #if ESP_IDF_VERSION_MAJOR < 5
       #   include <esp32s2/spiram.h>
+      #endif
       #   include <esp32s2/rom/rtc.h>
 
       # define HAS_HALL_EFFECT_SENSOR  0

diff --git a/src/src/Helpers/Hardware_defines.h b/src/src/Helpers/Hardware_defines.h
@@ -16,7 +16,11 @@
 # if CONFIG_IDF_TARGET_ESP32
   #  define MAX_ADC_VALUE 4095
 # else // if CONFIG_IDF_TARGET_ESP32
+  #if ESP_IDF_VERSION_MAJOR < 5
   #  define MAX_ADC_VALUE ((1 << SOC_ADC_MAX_BITWIDTH) - 1)
+  #else
+  #  define MAX_ADC_VALUE ((1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1)
+  #endif
 # endif  // if CONFIG_IDF_TARGET_ESP32
 #endif  // ifdef ESP32
 #ifdef ESP8266