Merge pull request #647 from tyeth/add-metro-s3

Add metro s3
adafruit · Nov 21, 2024 · 01d4b72 · 01d4b72
1 parent c6776a2
commit 01d4b72
Show file tree

Hide file tree

Showing 13 changed files with 466 additions and 2 deletions.
diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
diff --git a/examples/Wippersnapper_NoFS/.metro_esp32s3.test.skip b/examples/Wippersnapper_NoFS/.metro_esp32s3.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/Wippersnapper_NoFS/.metro_esp32s3_debug.test.skip b/examples/Wippersnapper_NoFS/.metro_esp32s3_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/Wippersnapper_NoFS/.metroesp32s2_debug.test.skip b/examples/Wippersnapper_NoFS/.metroesp32s2_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/Wippersnapper_demo/.metro_esp32s3.generate b/examples/Wippersnapper_demo/.metro_esp32s3.generate
@@ -0,0 +1 @@
+
diff --git a/examples/Wippersnapper_demo/.metro_esp32s3_debug.test.skip b/examples/Wippersnapper_demo/.metro_esp32s3_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/Wippersnapper_demo/.metroesp32s2_debug.test.skip b/examples/Wippersnapper_demo/.metroesp32s2_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/wippersnapper_debug/.metro_esp32s3.test.skip b/examples/wippersnapper_debug/.metro_esp32s3.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/wippersnapper_debug/.metro_esp32s3_debug.generate b/examples/wippersnapper_debug/.metro_esp32s3_debug.generate
@@ -0,0 +1 @@
+
diff --git a/examples/wippersnapper_debug/.metroesp32s2_debug.generate b/examples/wippersnapper_debug/.metroesp32s2_debug.generate
@@ -0,0 +1 @@
+
diff --git a/platformio.ini b/platformio.ini
@@ -242,6 +242,53 @@ build_flags = -DARDUINO_METRO_ESP32S2 -DBOARD_HAS_PSRAM
 board_build.partitions = tinyuf2-partitions-4MB.csv
 extra_scripts =  pre:rename_usb_config.py
 
+; Adafruit Metro ESP32-S3
+[env:adafruit_metro_esp32s3]
+extends = common:esp32
+board = adafruit_metro_esp32s3
+build_flags = -DARDUINO_METRO_ESP32S3 -DBOARD_HAS_PSRAM
+;set partition to tinyuf2-partitions-16MB.csv as of idf 5.1
+board_build.partitions = tinyuf2-partitions-16MB.csv
+extra_scripts =  pre:rename_usb_config.py
+
+; Adafruit Funhouse ESP32-S2
+[env:adafruit_funhouse_esp32s2]
+extends = common:esp32
+board = adafruit_funhouse_esp32s2
+build_flags = -DARDUINO_FUNHOUSE -DBOARD_HAS_PSRAM
+;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
+board_build.partitions = tinyuf2-partitions-4MB-noota.csv
+extra_scripts =  pre:rename_usb_config.py
+
+; Adafruit Funhouse ESP32-S2
+[env:adafruit_funhouse_esp32s2_debug]
+extends = common:esp32
+board = adafruit_funhouse_esp32s2
+;lib_extra_dirs = 
+build_type = debug
+build_flags =
+    -DARDUINO_FUNHOUSE
+    -DBOARD_HAS_PSRAM
+    -DCFG_TUSB_DEBUG=1
+    -DDEBUG=1
+    -DESP_LOG_LEVEL=ESP_LOG_VERBOSE
+    -DARDUINO_CORE_DEBUG_LEVEL=5
+    -DCORE_DEBUG_LEVEL=5
+    -DARDUHAL_LOG_LEVEL=5
+    ; USB Configuration
+    ; Uncomment if USB CDC on boot is needed
+    ; -DARDUINO_USB_CDC_ON_BOOT=1
+    ; -DARDUINO_USB_MODE=0  ; 0 for CDC + TinyUSB, 1 for Hardware CDC + JTAG
+    ; LVGL Debugging
+    -DLV_USE_DEBUG=1
+    -DLV_USE_LOG=1
+    -DLV_LOG_PRINTF=1
+    -DLV_LOG_COLOR=1
+    -DLV_LOG_LEVEL=LV_LOG_LEVEL_TRACE
+;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
+board_build.partitions = tinyuf2-partitions-4MB-noota.csv
+extra_scripts =  pre:rename_usb_config.py
+
 ; Adafruit QT Py ESP32 Pico
 [env:adafruit_qtpy_esp32]
 extends = common:esp32

diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
@@ -51,6 +51,13 @@
 #define STATUS_NEOPIXEL_PIN 45
 #define STATUS_NEOPIXEL_NUM 1
 #define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
+#elif defined(ARDUINO_METRO_ESP32S3)
+#define BOARD_ID "metroesp32s3"
+#define USE_TINYUSB
+#define USE_STATUS_NEOPIXEL
+#define STATUS_NEOPIXEL_PIN 46
+#define STATUS_NEOPIXEL_NUM 1
+#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
 #elif defined(ARDUINO_MAGTAG29_ESP32S2)
 #define BOARD_ID "magtag"
 #define USE_TINYUSB

diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
@@ -13,7 +13,7 @@
  *
  */
 #if defined(ARDUINO_MAGTAG29_ESP32S2) || defined(ARDUINO_METRO_ESP32S2) ||     \
-    defined(ARDUINO_FUNHOUSE_ESP32S2) ||                                       \
+    defined(ARDUINO_METRO_ESP32S3) || defined(ARDUINO_FUNHOUSE_ESP32S2) ||     \
     defined(ADAFRUIT_PYPORTAL_M4_TITANO) ||                                    \
     defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) ||   \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) ||                               \