diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index e0d912256..7a5ef627e 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -18,9 +18,15 @@ jobs: strategy: fail-fast: false matrix: - arduino-platform: ["funhouse_noota"] + arduino-platform: + [ + "funhouse_noota", + "esp32s3_devkitc_1_n8" + ] include: + - offset: "0x0" - offset: "0x1000" + arduino-platform: "funhouse_noota" steps: - uses: actions/setup-python@v5 with: @@ -105,6 +111,7 @@ jobs: mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.elf wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.elf mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.map wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.map mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bootloader.bin + mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.merged.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.merged_auto.bin mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.partitions.bin - name: Get Board Flash Parameters id: get_board_json @@ -652,6 +659,7 @@ jobs: matrix: arduino-platform: [ + "esp32s3_devkitc_1_n8_debug", "feather_esp32s2_debug", "feather_esp32s2_tft_debug", "feather_esp32s3_debug", diff --git a/examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8.generate b/examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8.generate @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8_debug.test.skip b/examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8_debug.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8_debug.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.esp32s3_devkitc_1_n8.test.skip b/examples/wippersnapper_debug/.esp32s3_devkitc_1_n8.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.esp32s3_devkitc_1_n8.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.esp32s3_devkitc_1_n8_debug.generate b/examples/wippersnapper_debug/.esp32s3_devkitc_1_n8_debug.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.esp32s3_devkitc_1_n8_debug.generate @@ -0,0 +1 @@ + diff --git a/platformio.ini b/platformio.ini index bddb00c06..147e20941 100644 --- a/platformio.ini +++ b/platformio.ini @@ -232,6 +232,7 @@ extra_scripts = pre:rename_usb_config.py extends = common:esp32 board = adafruit_feather_esp32s3_nopsram build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM +board_build.partitions = tinyuf2-partitions-8MB.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Feather ESP32-S3 TFT @@ -407,8 +408,10 @@ extra_scripts = pre:rename_usb_config.py [env:espressif_esp32s3_devkitc_1_n8] extends = common:esp32 board = esp32-s3-devkitc-1 -build_flags = -DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8 -extra_scripts = pre:rename_usb_config.py +build_flags = -DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8 -DUSE_TINYUSB=1 -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=1 +board_build.partitions = noota_ffat.csv +; board_build.partitions = tinyuf2-partitions-8MB.csv +; extra_scripts = pre:rename_usb_config.py ; Espressif ESP32-S3 NO PSRAM espressif_esp32s3_devkitc_1_n8 (DEBUG) [env:espressif_esp32s3_devkitc_1_n8_debug] @@ -417,17 +420,17 @@ board = esp32-s3-devkitc-1 build_type = debug build_flags = -DUSE_TINYUSB=1 + -DARDUINO_USB_MODE=0 + -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8 - -DNDEBUG=1 -DDEBUG=1 -DESP_LOG_LEVEL=5 - -DARDUINO_CORE_DEBUG_LEVEL=5 - -DARDUINO_DEBUG_LEVEL=5 + -DARDUINO_CORE_LOG_LEVEL=5 -DARDUINO_LOG_LEVEL=5 - -DCORE_DEBUG_LEVEL=5 -DARDUHAL_LOG_LEVEL=5 -board_build.partitions = tinyuf2-partitions-8MB.csv -extra_scripts = pre:rename_usb_config.py +; board_build.partitions = tinyuf2-partitions-8MB.csv +board_build.partitions = noota_ffat.csv +; extra_scripts = pre:rename_usb_config.py ; ESP8266 Boards diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 756e185fd..84a07b896 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -51,6 +51,15 @@ #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_ESP32S3_DEV) +#define BOARD_ID "esp32s3-devkitc-1-n8" +#define USE_TINYUSB +#define USE_STATUS_NEOPIXEL +#define STATUS_NEOPIXEL_PIN 48 +#define STATUS_NEOPIXEL_NUM 1 +#ifdef BOARD_HAS_PSRAM +#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation +#endif #elif defined(ARDUINO_METRO_ESP32S3) #define BOARD_ID "metroesp32s3" #define USE_TINYUSB diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp index 83e4453b5..b3c25bd61 100644 --- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp +++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp @@ -24,7 +24,7 @@ defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) || \ - defined(ARDUINO_ARCH_RP2040) || \ + defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ESP32S3_DEV) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) || \ defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2)