fix build with esp32s2,s3

adafruit · Nov 21, 2023 · 2ca4b90 · 2ca4b90
1 parent 61e908e
commit 2ca4b90
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/arduino/Adafruit_USBH_Host.cpp b/src/arduino/Adafruit_USBH_Host.cpp
@@ -27,7 +27,6 @@
 #include "arduino/ports/esp32/tusb_config_esp32.h"
 #include "driver/gpio.h"
 #include <Arduino.h>
-#define MSBFIRST SPI_MSBFIRST
 #endif
 
 #include "tusb_option.h"

diff --git a/src/arduino/ports/esp32/tusb_config_esp32.h b/src/arduino/ports/esp32/tusb_config_esp32.h
@@ -63,14 +63,6 @@ extern "C" {
 // with no OTG USB MCU such as eps32, c3 etc...
 //--------------------------------------------------------------------
 
-#ifndef CFG_TUSB_OS
-#define CFG_TUSB_OS OPT_OS_FREERTOS
-
-// clang-format off
-#define CFG_TUSB_OS_INC_PATH freertos/
-// clang-format on
-#endif
-
 // #ifndef CFG_TUSB_DEBUG
 // #define CFG_TUSB_DEBUG 0
 // #endif

diff --git a/src/tusb_config.h b/src/tusb_config.h
@@ -42,9 +42,15 @@
   // Note: when compiling core Arduino IDEs will include tusb_config.h in the BSP
   // sdk/include/arduino_tinyusb/include. While compiling .c file in this library this
   // file will be used instead. For consistency: include the one in BSP here as well
+  #include "sdkconfig.h"
   #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     #include "../../arduino_tinyusb/include/tusb_config.h"
   #else
+    #define CFG_TUSB_OS OPT_OS_FREERTOS
+    // clang-format off
+    #define CFG_TUSB_OS_INC_PATH freertos/
+    // clang-format on
+
     #include "arduino/ports/esp32/tusb_config_esp32.h"
   #endif