[ESP32-Sx/C3] (partial) build compatibility with Core 3.0.0

lyusupov · May 29, 2024 · a011823 · a011823
1 parent 7e3d1a7
commit a011823
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp
@@ -3861,8 +3861,13 @@ static void ESP32_Battery_setup()
  (adc1_channel_t) ADC1_GPIO35_CHANNEL :
  (adc1_channel_t) ADC1_GPIO36_CHANNEL);
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
+#if !defined(ESP_IDF_VERSION_MAJOR) || ESP_IDF_VERSION_MAJOR < 5
  calibrate_voltage((adc1_channel_t) ADC1_GPIO9_CHANNEL);
+#else
+ /* TBD */
+#endif /* ESP_IDF_VERSION_MAJOR */
 #elif defined(CONFIG_IDF_TARGET_ESP32S3)
+#if !defined(ESP_IDF_VERSION_MAJOR) || ESP_IDF_VERSION_MAJOR < 5
  /* use this procedure on T-TWR Plus (has PMU) to calibrate audio ADC */
  if (esp32_board == ESP32_LILYGO_T_TWR2 && hw_info.revision == 0) {
 #if defined(USE_SA8X8)
@@ -3880,10 +3885,17 @@ static void ESP32_Battery_setup()
  } else {
  calibrate_voltage((adc1_channel_t) ADC1_GPIO2_CHANNEL);
  }
+#else
+ /* TBD */
+#endif /* ESP_IDF_VERSION_MAJOR */
 #elif defined(CONFIG_IDF_TARGET_ESP32C2)
  calibrate_voltage(SOC_GPIO_PIN_C2_BATTERY);
 #elif defined(CONFIG_IDF_TARGET_ESP32C3)
+#if !defined(ESP_IDF_VERSION_MAJOR) || ESP_IDF_VERSION_MAJOR < 5
  calibrate_voltage((adc1_channel_t) ADC1_GPIO1_CHANNEL);
+#else
+ /* TBD */
+#endif /* ESP_IDF_VERSION_MAJOR */
 #elif defined(CONFIG_IDF_TARGET_ESP32C6)
  calibrate_voltage(SOC_GPIO_PIN_C6_BATTERY);
 #elif defined(CONFIG_IDF_TARGET_ESP32H2)
@@ -4832,13 +4844,13 @@ IODev_ops_t ESP32SX_USBSerial_ops = {
 #if ARDUINO_USB_CDC_ON_BOOT
 #define USBSerial Serial
 #else
-#if defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2)
+#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR >= 5
 #if HWCDC_SERIAL_IS_DEFINED
 #define USBSerial HWCDCSerial
 #else
 HWCDC USBSerial;
 #endif /* HWCDC_SERIAL_IS_DEFINED */
-#endif /* CONFIG_IDF_TARGET_ESP32C6 || H2 */
+#endif /* ESP_IDF_VERSION_MAJOR */
 #endif /* ARDUINO_USB_CDC_ON_BOOT */
 
 static void ESP32CX_USB_setup()

diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.h b/software/firmware/source/SoftRF/src/platform/ESP32.h
@@ -430,7 +430,9 @@ extern const USB_Device_List_t supported_USB_devices[];
 #define USE_SA8X8
 /* Experimental */
 #define ENABLE_REMOTE_ID
-//#define EXCLUDE_VOICE_MESSAGE
+#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR >= 5
+#define EXCLUDE_VOICE_MESSAGE
+#endif /* ESP_IDF_VERSION_MAJOR */
 #endif /* S3 */
 
 #if defined(CONFIG_IDF_TARGET_ESP32S2)

diff --git a/software/firmware/source/libraries/ESP8266Audio/src/AudioFileSourceHTTPStream.h b/software/firmware/source/libraries/ESP8266Audio/src/AudioFileSourceHTTPStream.h
@@ -23,6 +23,9 @@
 
 #include <Arduino.h>
 #ifdef ESP32
+ #if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR >= 5
+ #include <WiFi.h>
+ #endif /* ESP_IDF_VERSION_MAJOR */
  #include <HTTPClient.h>
 #else
  #include <ESP8266HTTPClient.h>