Skip to content

Commit 398fb7d

Browse files
tyethtyeth
authored
Merge branch 'main' into ina238
2 parents 51b9335 + b637366 commit 398fb7d

File tree

6 files changed

+49
-25
lines changed

6 files changed

+49
-25
lines changed

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

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
build-esp32sx-esptool:
2121
name: 🏗️ESP32-Sx(lvgl)
2222
runs-on: ubuntu-latest
23-
continue-on-error: true
2423
strategy:
2524
fail-fast: false
2625
matrix:
@@ -38,6 +37,7 @@ jobs:
3837
"qtpy_esp32s3_n4r2",
3938
"feather_esp32s3_4mbflash_2mbpsram",
4039
"feather_esp32s3_tft",
40+
"xiao_esp32s3",
4141
]
4242
include:
4343
- offset: "0x0"
@@ -57,6 +57,7 @@ jobs:
5757
arduino-platform: "qtpy_esp32s2"
5858
steps:
5959
- name: "skip if unwanted"
60+
continue-on-error: true
6061
if: |
6162
github.event_name == 'workflow_dispatch' &&
6263
github.event.inputs.board != '' &&
@@ -182,14 +183,14 @@ jobs:
182183
- name: boot_app0 file from esp32 source bsp
183184
if: steps.check_files.outputs.files_exists == 'false'
184185
run: mv /home/runner/Arduino/hardware/espressif/esp32/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin
185-
- name: Create combined binary using Esptool merge_bin
186+
- name: Create combined binary using Esptool merge-bin
186187
run: |
187188
echo ${{ steps.get_board_json.outputs.boardJson }}
188189
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
189-
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
190-
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
191-
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
192-
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
190+
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
191+
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
192+
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
193+
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
193194
-o wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.combined.bin \
194195
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bootloader.bin \
195196
0x8000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.partitions.bin \
@@ -217,7 +218,6 @@ jobs:
217218
build-esp32sx:
218219
name: 🏗️ESP32-Sx
219220
runs-on: ubuntu-latest
220-
continue-on-error: true
221221
strategy:
222222
fail-fast: false
223223
matrix:
@@ -229,6 +229,7 @@ jobs:
229229
]
230230
steps:
231231
- name: "skip if unwanted"
232+
continue-on-error: true
232233
if: |
233234
github.event_name == 'workflow_dispatch' &&
234235
github.event.inputs.board != '' &&
@@ -319,7 +320,6 @@ jobs:
319320
build-esp32:
320321
name: 🏗️ESP32/Cx
321322
runs-on: ubuntu-latest
322-
continue-on-error: true
323323
strategy:
324324
fail-fast: false
325325
matrix:
@@ -342,6 +342,7 @@ jobs:
342342
arduino-platform: "wippersnapper_feather_esp32c6"
343343
steps:
344344
- name: "skip if unwanted"
345+
continue-on-error: true
345346
if: |
346347
github.event_name == 'workflow_dispatch' &&
347348
github.event.inputs.board != '' &&
@@ -442,14 +443,14 @@ jobs:
442443
echo $content
443444
echo EOF
444445
} >> "$GITHUB_OUTPUT"
445-
- name: Create combined binary using Esptool merge_bin
446+
- name: Create combined binary using Esptool merge-bin
446447
run: |
447448
echo ${{ steps.get_board_json.outputs.boardJson }}
448449
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
449-
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
450-
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
451-
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
452-
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
450+
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
451+
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
452+
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
453+
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
453454
-o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \
454455
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
455456
0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \
@@ -468,7 +469,6 @@ jobs:
468469
build-samd:
469470
name: 🏗️SAMD
470471
runs-on: ubuntu-latest
471-
continue-on-error: true
472472
strategy:
473473
fail-fast: false
474474
matrix:
@@ -480,6 +480,7 @@ jobs:
480480
]
481481
steps:
482482
- name: "skip if unwanted"
483+
continue-on-error: true
483484
if: |
484485
github.event_name == 'workflow_dispatch' &&
485486
github.event.inputs.board != '' &&
@@ -555,13 +556,13 @@ jobs:
555556
build-rp2040:
556557
name: 🏗️RP2040
557558
runs-on: ubuntu-latest
558-
continue-on-error: true
559559
strategy:
560560
fail-fast: false
561561
matrix:
562562
arduino-platform: ["picow_rp2040_tinyusb", "picow_rp2350_tinyusb"]
563563
steps:
564564
- name: "skip if unwanted"
565+
continue-on-error: true
565566
if: |
566567
github.event_name == 'workflow_dispatch' &&
567568
github.event.inputs.board != '' &&
@@ -634,13 +635,13 @@ jobs:
634635
build-esp8266:
635636
name: 🏗️ESP8266
636637
runs-on: ubuntu-latest
637-
continue-on-error: true
638638
strategy:
639639
fail-fast: false
640640
matrix:
641641
arduino-platform: ["feather_esp8266"]
642642
steps:
643643
- name: "skip if unwanted"
644+
continue-on-error: true
644645
if: |
645646
github.event_name == 'workflow_dispatch' &&
646647
github.event.inputs.board != '' &&
@@ -720,7 +721,6 @@ jobs:
720721
build-esp32sx-dev:
721722
name: 🏗️ESP32-Sx(DEV)
722723
runs-on: ubuntu-latest
723-
continue-on-error: true
724724
strategy:
725725
fail-fast: false
726726
matrix:
@@ -738,6 +738,7 @@ jobs:
738738
]
739739
steps:
740740
- name: "skip if unwanted"
741+
continue-on-error: true
741742
if: |
742743
github.event_name == 'workflow_dispatch' &&
743744
github.event.inputs.board != '' &&
@@ -828,7 +829,6 @@ jobs:
828829
build-esp32-dev:
829830
name: 🏗️ESP32/Cx(DEV)
830831
runs-on: ubuntu-latest
831-
continue-on-error: true
832832
strategy:
833833
fail-fast: false
834834
matrix:
@@ -842,6 +842,7 @@ jobs:
842842
arduino-platform: "wippersnapper_feather_esp32c6_debug"
843843
steps:
844844
- name: "skip if unwanted"
845+
continue-on-error: true
845846
if: |
846847
github.event_name == 'workflow_dispatch' &&
847848
github.event.inputs.board != '' &&
@@ -944,14 +945,14 @@ jobs:
944945
echo $content
945946
echo EOF
946947
} >> "$GITHUB_OUTPUT"
947-
- name: Create combined binary using Esptool merge_bin
948+
- name: Create combined binary using Esptool merge-bin
948949
run: |
949950
echo ${{ steps.get_board_json.outputs.boardJson }}
950951
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
951-
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
952-
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
953-
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
954-
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
952+
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
953+
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
954+
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
955+
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
955956
-o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \
956957
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
957958
0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \

‎examples/Wippersnapper_demo/.xiao_esp32s3.generate

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎examples/wippersnapper_debug/.xiao_esp32s3.test.skip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎platformio.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,19 @@ build_flags =
437437
board_build.partitions = noota_ffat.csv
438438
; extra_scripts = pre:rename_usb_config.py
439439

440+
; Seeed Studio ESP32 boards:
441+
442+
; Xiao ESP32S3 N8R8 (SENSE)
443+
[env:seeed-xiao_esp32s3_n8r8]
444+
extends = common:esp32
445+
board = seeed_xiao_esp32s3
446+
build_flags = -DARDUINO_XIAO_ESP32S3 -DUSE_TINYUSB -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MODE=0
447+
board_build.partitions = tinyuf2-partitions-8MB.csv
448+
extra_scripts = pre:rename_usb_config.py
449+
450+
451+
452+
440453
; ESP8266 Boards
441454

442455
; Adafruit Feather HUZZAH ESP8266

‎src/Wippersnapper_Boards.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,13 @@
208208
#define USE_TINYUSB
209209
#define USE_STATUS_LED
210210
#define STATUS_LED_PIN LED_BUILTIN
211+
#elif defined(ARDUINO_XIAO_ESP32S3)
212+
#define BOARD_ID "seeed-xiao-esp32s3"
213+
#define BOARD_HAS_PSRAM
214+
#define USE_PSRAM
215+
#define USE_TINYUSB
216+
#define USE_STATUS_LED
217+
#define STATUS_LED_PIN LED_BUILTIN
211218
#else
212219
#warning "Board type not identified within Wippersnapper_Boards.h!"
213220
#endif

‎src/provisioning/tinyusb/Wippersnapper_FS.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ESP32S3_DEV) || \
2828
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) || \
2929
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) || \
30-
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2)
30+
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) || \
31+
defined(ARDUINO_XIAO_ESP32S3)
3132
#include "Wippersnapper_FS.h"
3233
#include "print_dependencies.h"
3334
// On-board external flash (QSPI or SPI) macros should already
@@ -552,7 +553,7 @@ bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool force_rec
552553
createDisplayConfig();
553554
#endif
554555
}
555-
556+
556557
// Check if display_config.json file exists, if not, generate it
557558
if (!wipperFatFs.exists("/display_config.json")) {
558559
WS_DEBUG_PRINTLN("Could not find display_config.json, generating...");

0 commit comments

Comments
 (0)