Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 26 additions & 25 deletions .github/workflows/build-clang-doxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,22 @@ jobs:
build-esp32sx-esptool:
name: 🏗️ESP32-Sx(lvgl)
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
arduino-platform:
[
"funhouse_noota",
"esp32s3_devkitc_1_n8"
"esp32s3_devkitc_1_n8",
"xiao_esp32s3",
]
include:
- offset: "0x0"
- offset: "0x1000"
arduino-platform: "funhouse_noota"
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -159,14 +160,14 @@ jobs:
- name: boot_app0 file from esp32 source bsp
if: steps.check_files.outputs.files_exists == 'false'
run: mv /home/runner/Arduino/hardware/espressif/esp32/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin
- name: Create combined binary using Esptool merge_bin
- name: Create combined binary using Esptool merge-bin
run: |
echo ${{ steps.get_board_json.outputs.boardJson }}
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
-o wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.combined.bin \
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bootloader.bin \
0x8000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.partitions.bin \
Expand Down Expand Up @@ -194,7 +195,6 @@ jobs:
build-esp32sx:
name: 🏗️ESP32-Sx
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand All @@ -216,6 +216,7 @@ jobs:
]
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -306,7 +307,6 @@ jobs:
build-esp32:
name: 🏗️ESP32/Cx
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand All @@ -329,6 +329,7 @@ jobs:
arduino-platform: "wippersnapper_feather_esp32c6"
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -391,7 +392,7 @@ jobs:
mv nanopb/pb.h src/nanopb/nanopb.pb.h
- name: Install Dependencies
run: |
pip install esptool==4.6
pip install esptool
- name: build ESP32 platforms
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
- name: Check artifacts
Expand Down Expand Up @@ -429,14 +430,14 @@ jobs:
echo $content
echo EOF
} >> "$GITHUB_OUTPUT"
- name: Create combined binary using Esptool merge_bin
- name: Create combined binary using Esptool merge-bin
run: |
echo ${{ steps.get_board_json.outputs.boardJson }}
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
-o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \
Expand All @@ -455,7 +456,6 @@ jobs:
build-samd:
name: 🏗️SAMD
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand All @@ -467,6 +467,7 @@ jobs:
]
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -542,13 +543,13 @@ jobs:
build-rp2040:
name: 🏗️RP2040
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
arduino-platform: ["picow_rp2040_tinyusb", "picow_rp2350_tinyusb"]
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -621,13 +622,13 @@ jobs:
build-esp8266:
name: 🏗️ESP8266
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
arduino-platform: ["feather_esp8266"]
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -707,7 +708,6 @@ jobs:
build-esp32sx-dev:
name: 🏗️ESP32-Sx(DEV)
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand All @@ -725,6 +725,7 @@ jobs:
]
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -815,7 +816,6 @@ jobs:
build-esp32-dev:
name: 🏗️ESP32/Cx(DEV)
runs-on: ubuntu-latest
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand All @@ -829,6 +829,7 @@ jobs:
arduino-platform: "wippersnapper_feather_esp32c6_debug"
steps:
- name: "skip if unwanted"
continue-on-error: true
if: |
github.event_name == 'workflow_dispatch' &&
github.event.inputs.board != '' &&
Expand Down Expand Up @@ -931,14 +932,14 @@ jobs:
echo $content
echo EOF
} >> "$GITHUB_OUTPUT"
- name: Create combined binary using Esptool merge_bin
- name: Create combined binary using Esptool merge-bin
run: |
echo ${{ steps.get_board_json.outputs.boardJson }}
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
-o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \
Expand Down
1 change: 1 addition & 0 deletions examples/Wippersnapper_demo/.xiao_esp32s3.generate
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions examples/wippersnapper_debug/.xiao_esp32s3.test.skip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

15 changes: 14 additions & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ extra_scripts = pre:rename_usb_config.py
extends = common:esp32
board = adafruit_qtpy_esp32s3_nopsram
build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM
board_build.partitions = tinyuf2-partitions-4MB.csv
board_build.partitions = tinyuf2-partitions-8MB.csv
extra_scripts = pre:rename_usb_config.py

; Adafruit QT Py ESP32-S3 with PSRAM
Expand Down Expand Up @@ -435,6 +435,19 @@ build_flags =
board_build.partitions = noota_ffat.csv
; extra_scripts = pre:rename_usb_config.py

; Seeed Studio ESP32 boards:

; Xiao ESP32S3 N8R8 (SENSE)
[env:seeed-xiao_esp32s3_n8r8]
extends = common:esp32
board = seeed_xiao_esp32s3
build_flags = -DARDUINO_XIAO_ESP32S3 -DUSE_TINYUSB -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MODE=0
board_build.partitions = tinyuf2-partitions-8MB.csv
extra_scripts = pre:rename_usb_config.py




; ESP8266 Boards

; Adafruit Feather HUZZAH ESP8266
Expand Down
7 changes: 7 additions & 0 deletions src/Wippersnapper_Boards.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,13 @@
#define USE_TINYUSB
#define USE_STATUS_LED
#define STATUS_LED_PIN LED_BUILTIN
#elif defined(ARDUINO_XIAO_ESP32S3)
#define BOARD_ID "seeed-xiao-esp32s3"
#define BOARD_HAS_PSRAM
#define USE_PSRAM
#define USE_TINYUSB
#define USE_STATUS_LED
#define STATUS_LED_PIN LED_BUILTIN
#else
#warning "Board type not identified within Wippersnapper_Boards.h!"
#endif
Expand Down
5 changes: 3 additions & 2 deletions src/provisioning/tinyusb/Wippersnapper_FS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
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)
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) || \
defined(ARDUINO_XIAO_ESP32S3)
#include "Wippersnapper_FS.h"
#include "print_dependencies.h"
// On-board external flash (QSPI or SPI) macros should already
Expand Down Expand Up @@ -552,7 +553,7 @@ bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool force_rec
createDisplayConfig();
#endif
}

// Check if display_config.json file exists, if not, generate it
if (!wipperFatFs.exists("/display_config.json")) {
WS_DEBUG_PRINTLN("Could not find display_config.json, generating...");
Expand Down
Loading