2nd attempt to fix ESP32-Sx build with Core 2.0.15

lyusupov · Apr 12, 2024 · 5de5e23 · 5de5e23
1 parent c10fa8d
commit 5de5e23
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/software/firmware/source/SkyView/Platform_ESP32.cpp b/software/firmware/source/SkyView/Platform_ESP32.cpp
@@ -347,6 +347,11 @@ const uint16_t ESP32SX_Device_Version = SKYVIEW_USB_FW_VERSION;
 
 #endif /* CONFIG_IDF_TARGET_ESP32S3 */
 
+#if CONFIG_TINYUSB_ENABLED && \
+    (defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3))
+#include <USB.h>
+#endif /* CONFIG_TINYUSB_ENABLED */
+
 static uint32_t ESP32_getFlashId()
 {
   return g_rom_flashchip.device_id;
@@ -576,6 +581,7 @@ static void ESP32_setup()
 
 #if ARDUINO_USB_CDC_ON_BOOT && \
     (defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3))
+#if CONFIG_TINYUSB_ENABLED
   if (USB.manufacturerName(ESP32SX_Device_Manufacturer)) {
     char usb_serial_number[16];
     uint16_t pid = 0x812BD ; /* Banana Pi BPI-PicoW-S3 - Arduino */
@@ -592,6 +598,7 @@ static void ESP32_setup()
     USB.serialNumber(usb_serial_number);
     USB.begin();
   }
+#endif /* CONFIG_TINYUSB_ENABLED */
 
   Serial.begin(SERIAL_OUT_BR);
 

diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp
@@ -436,6 +436,11 @@ static bool play_file(char *filename)
 #endif /* USE_SA8X8 */
 #endif /* CONFIG_IDF_TARGET_ESP32S3 */
 
+#if CONFIG_TINYUSB_ENABLED && \
+    (defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3))
+#include <USB.h>
+#endif /* CONFIG_TINYUSB_ENABLED */
+
 #if defined(ENABLE_D1090_INPUT)
 #include <mode-s.h>