Skip to content

Commit 13aa641

Browse files
authored
Merge pull request #763 from adafruit/add-s3-devkitc-1-n8
Add s3 devkitc 1 n8
2 parents 13bfecf + 6ccd814 commit 13aa641

File tree

8 files changed

+34
-10
lines changed

8 files changed

+34
-10
lines changed

.github/workflows/build-clang-doxy.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,15 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
arduino-platform: ["funhouse_noota"]
27+
arduino-platform:
28+
[
29+
"funhouse_noota",
30+
"esp32s3_devkitc_1_n8"
31+
]
2832
include:
33+
- offset: "0x0"
2934
- offset: "0x1000"
35+
arduino-platform: "funhouse_noota"
3036
steps:
3137
- name: "skip if unwanted"
3238
if: |
@@ -118,6 +124,7 @@ jobs:
118124
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.elf wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.elf
119125
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.map wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.map
120126
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bootloader.bin
127+
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.merged.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.merged_auto.bin
121128
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.partitions.bin
122129
- name: Get Board Flash Parameters
123130
id: get_board_json
@@ -706,6 +713,7 @@ jobs:
706713
matrix:
707714
arduino-platform:
708715
[
716+
"esp32s3_devkitc_1_n8_debug",
709717
"feather_esp32s2_debug",
710718
"feather_esp32s2_tft_debug",
711719
"feather_esp32s3_debug",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

platformio.ini

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ extra_scripts = pre:rename_usb_config.py
235235
extends = common:esp32
236236
board = adafruit_feather_esp32s3_nopsram
237237
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM
238+
board_build.partitions = tinyuf2-partitions-8MB.csv
238239
extra_scripts = pre:rename_usb_config.py
239240

240241
; Adafruit Feather ESP32-S3 TFT
@@ -410,8 +411,10 @@ extra_scripts = pre:rename_usb_config.py
410411
[env:espressif_esp32s3_devkitc_1_n8]
411412
extends = common:esp32
412413
board = esp32-s3-devkitc-1
413-
build_flags = -DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8
414-
extra_scripts = pre:rename_usb_config.py
414+
build_flags = -DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8 -DUSE_TINYUSB=1 -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=1
415+
board_build.partitions = noota_ffat.csv
416+
; board_build.partitions = tinyuf2-partitions-8MB.csv
417+
; extra_scripts = pre:rename_usb_config.py
415418

416419
; Espressif ESP32-S3 NO PSRAM espressif_esp32s3_devkitc_1_n8 (DEBUG)
417420
[env:espressif_esp32s3_devkitc_1_n8_debug]
@@ -420,17 +423,17 @@ board = esp32-s3-devkitc-1
420423
build_type = debug
421424
build_flags =
422425
-DUSE_TINYUSB=1
426+
-DARDUINO_USB_MODE=0
427+
-DARDUINO_USB_CDC_ON_BOOT=1
423428
-DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8
424-
-DNDEBUG=1
425429
-DDEBUG=1
426430
-DESP_LOG_LEVEL=5
427-
-DARDUINO_CORE_DEBUG_LEVEL=5
428-
-DARDUINO_DEBUG_LEVEL=5
431+
-DARDUINO_CORE_LOG_LEVEL=5
429432
-DARDUINO_LOG_LEVEL=5
430-
-DCORE_DEBUG_LEVEL=5
431433
-DARDUHAL_LOG_LEVEL=5
432-
board_build.partitions = tinyuf2-partitions-8MB.csv
433-
extra_scripts = pre:rename_usb_config.py
434+
; board_build.partitions = tinyuf2-partitions-8MB.csv
435+
board_build.partitions = noota_ffat.csv
436+
; extra_scripts = pre:rename_usb_config.py
434437

435438
; ESP8266 Boards
436439

src/Wippersnapper_Boards.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
#define STATUS_NEOPIXEL_PIN 45
5252
#define STATUS_NEOPIXEL_NUM 1
5353
#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
54+
#elif defined(ARDUINO_ESP32S3_DEV)
55+
#define BOARD_ID "esp32s3-devkitc-1-n8"
56+
#define USE_TINYUSB
57+
#define USE_STATUS_NEOPIXEL
58+
#define STATUS_NEOPIXEL_PIN 48
59+
#define STATUS_NEOPIXEL_NUM 1
60+
#ifdef BOARD_HAS_PSRAM
61+
#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
62+
#endif
5463
#elif defined(ARDUINO_METRO_ESP32S3)
5564
#define BOARD_ID "metroesp32s3"
5665
#define USE_TINYUSB

src/provisioning/tinyusb/Wippersnapper_FS.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) || \
2525
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) || \
2626
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) || \
27-
defined(ARDUINO_ARCH_RP2040) || \
27+
defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ESP32S3_DEV) || \
2828
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) || \
2929
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) || \
3030
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2)

0 commit comments

Comments
 (0)