[ESP32-Sx/C3] build compatibility of SkyView and WebTop with Core 3.0.0

lyusupov · May 30, 2024 · 620611b · 620611b
1 parent 3af9d3e
commit 620611b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/software/firmware/source/SkyView/Platform_ESP32.cpp b/software/firmware/source/SkyView/Platform_ESP32.cpp
@@ -888,6 +888,7 @@ static void ESP32_WiFiUDP_stopAll()
 
 static void ESP32_Battery_setup()
 {
+#if !defined(ESP_IDF_VERSION_MAJOR) || ESP_IDF_VERSION_MAJOR < 5
 #if defined(CONFIG_IDF_TARGET_ESP32)
  calibrate_voltage(settings->adapter == ADAPTER_TTGO_T5S ?
  (adc1_channel_t) ADC1_GPIO35_CHANNEL :
@@ -903,6 +904,9 @@ static void ESP32_Battery_setup()
 #else
 #error "This ESP32 family build variant is not supported!"
 #endif /* CONFIG_IDF_TARGET_ESP32 */
+#else
+ /* TBD */
+#endif /* ESP_IDF_VERSION_MAJOR */
 }
 
 static float ESP32_Battery_voltage()
@@ -929,11 +933,11 @@ SoftSPI swSPI(SOC_GPIO_PIN_MOSI_WS,
  SOC_GPIO_PIN_MOSI_WS, /* half duplex */
  SOC_GPIO_PIN_SCK_WS);
 
-#if defined(CONFIG_IDF_TARGET_ESP32C6)
+#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR>=5
 static spinlock_t EPD_ident_mutex;
 #else
 static portMUX_TYPE EPD_ident_mutex;
-#endif /* CONFIG_IDF_TARGET_ESP32C6 */
+#endif /* ESP_IDF_VERSION_MAJOR */
 
 static ep_model_id ESP32_EPD_ident()
 {

diff --git a/software/firmware/source/SkyView/Platform_ESP32.h b/software/firmware/source/SkyView/Platform_ESP32.h
@@ -140,7 +140,10 @@
 //#define USE_ADAFRUIT_MSC
 
 // Audio
-//#define EXCLUDE_AUDIO
+#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR>=5
+#define EXCLUDE_AUDIO
+#endif /* ESP_IDF_VERSION_MAJOR */
+
 #if !defined(EXCLUDE_AUDIO)
 //#define USE_EXT_I2S_DAC
 #endif /* EXCLUDE_AUDIO */

diff --git a/software/firmware/source/SkyWatch/Platform_ESP32.cpp b/software/firmware/source/SkyWatch/Platform_ESP32.cpp
@@ -595,7 +595,11 @@ static void ESP32_reset()
 static void ESP32_sleep_ms(int ms)
 {
  esp_sleep_enable_timer_wakeup(ms * 1000);
+#if !defined(ESP_IDF_VERSION_MAJOR) || ESP_IDF_VERSION_MAJOR < 5
  esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH,ESP_PD_OPTION_ON);
+#else
+ /* TBD */
+#endif /* ESP_IDF_VERSION_MAJOR */
  esp_light_sleep_start();
 }
 
@@ -817,11 +821,19 @@ static void ESP32_Battery_setup()
 
  } else if (hw_info.model == SOFTRF_MODEL_WEBTOP_USB) {
 #if 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 */
 #endif /* CONFIG_IDF_TARGET_ESP32S2 */
  } else if (hw_info.model == SOFTRF_MODEL_WEBTOP_SERIAL) {
 #if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3)
+#if !defined(ESP_IDF_VERSION_MAJOR) || ESP_IDF_VERSION_MAJOR < 5
  calibrate_voltage((adc1_channel_t) ADC1_GPIO2_CHANNEL);
+#else
+ /* TBD */
+#endif /* ESP_IDF_VERSION_MAJOR */
 #endif /* CONFIG_IDF_TARGET_ESP32S3 */
  }
 }