Add server-side support for a second panel (13.3in Spectra 6 / EE02) and scaffold its firmware target
Server: Frame.panel_type (new column + migration) is auto-derived from the device's reported board (X-Frame-Board), never user-set -- the panel is a property of the hardware, not a picker in the UI. image_pipeline's packing/render pipeline is parameterized by panel geometry instead of hardcoded 800x480 globals, with the real confirmed 13.3in geometry (1600x1200) registered alongside the original 7.3in panel. Existing 7.3in frames are unaffected (column default + board mapping both resolve to the original panel). Board identifiers are also renamed (devkit/xiao -> devkit_esp32c6/ xiao_esp32c6, plus new "ee02") since the EE02 board also carries a XIAO module -- "xiao" alone stopped disambiguating hardware. The server keeps accepting the legacy bare names indefinitely for already-flashed devices. Firmware: scaffolds a third build target (ee02, ESP32-S3 -- a real chip-target change, not just a same-chip Kconfig variant like xiao) and a new epd13in3e driver component skeleton. The actual panel init/LUT/ refresh register sequence isn't ported from vendor demo code yet (none was available), so that component deliberately fails to compile (#error) rather than risk sending unverified register values to real hardware -- devkit/xiao are unaffected and build identically to before. CI's ee02 build step is continue-on-error for the same reason.
This commit is contained in:
@@ -3,9 +3,11 @@ name: Firmware build check
|
||||
# Fires on every push touching firmware source, unlike
|
||||
# firmware-release-build.yml (which only builds+publishes when
|
||||
# firmware/version.txt itself is bumped -- the "cut a release" signal).
|
||||
# This just verifies both board variants still compile; nothing else in
|
||||
# CI catches a firmware/** push that breaks the build until someone
|
||||
# happens to bump the version next.
|
||||
# This just verifies every board variant still compiles (or, for ee02,
|
||||
# that everything up to its known/tracked #error still compiles --
|
||||
# see that step's own comment); nothing else in CI catches a
|
||||
# firmware/** push that breaks the build until someone happens to bump
|
||||
# the version next.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
@@ -49,3 +51,26 @@ jobs:
|
||||
docker cp "$PWD/." "$cid:/workspace"
|
||||
docker start -a "$cid"
|
||||
docker rm "$cid"
|
||||
|
||||
# Expected to fail until firmware/components/epd13in3e's panel
|
||||
# driver is ported from vendor demo code (deliberate #error, see
|
||||
# that file's own top comment) -- continue-on-error so this known
|
||||
# gap doesn't block every other firmware/** push. Still worth
|
||||
# running: catches a regression in the surrounding scaffolding
|
||||
# (Kconfig, main/CMakeLists.txt's component selection, sdkconfig
|
||||
# layering) up to the point of that #error, same value a build
|
||||
# check normally provides. Remove continue-on-error once
|
||||
# epd13in3e's driver is real, so a build failure here goes back to
|
||||
# being a genuine regression signal.
|
||||
- name: Build (ee02 -- Seeed EE02, XIAO ESP32-S3 Plus + 13.3in panel)
|
||||
continue-on-error: true
|
||||
run: |
|
||||
cid=$(docker create -w /workspace/firmware espressif/idf:release-v6.0 bash -c '
|
||||
git config --global --add safe.directory /workspace &&
|
||||
. "$IDF_PATH/export.sh" &&
|
||||
./build_for_board.sh ee02 set-target esp32s3 &&
|
||||
./build_for_board.sh ee02 build
|
||||
')
|
||||
docker cp "$PWD/." "$cid:/workspace"
|
||||
docker start -a "$cid"
|
||||
docker rm "$cid"
|
||||
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
# actions) is a Node action that gets exec'd *inside* whatever container
|
||||
# the job specifies, so checkout fails immediately with "node: not
|
||||
# found" (hit this on the first real run). Checkout instead runs on the
|
||||
# plain runner (which has Node), and only the two build steps below
|
||||
# plain runner (which has Node), and only the three build steps below
|
||||
# spin up the ESP-IDF image themselves (docker create/cp/start, see the
|
||||
# comment on those steps for why not a plain `docker run -v`) -- the
|
||||
# runner already bind-mounts the host's docker socket, so docker-in-
|
||||
@@ -33,11 +33,13 @@ jobs:
|
||||
id: version
|
||||
run: echo "version=$(tr -d '[:space:]' < firmware/version.txt)" >> "$GITHUB_OUTPUT"
|
||||
|
||||
# Two board variants, two partition tables/flash sizes (see
|
||||
# firmware/README.md's "Building for the Seeed XIAO ESP32-C6"
|
||||
# section) -- build_for_board.sh gives each its own build dir/
|
||||
# generated sdkconfig so this never fights over shared state.
|
||||
# set-target first since a fresh checkout has no cached sdkconfig
|
||||
# Three board variants: devkit/xiao (ESP32-C6, different partition
|
||||
# tables/flash sizes -- see firmware/README.md's "Building for the
|
||||
# Seeed XIAO ESP32-C6" section) and ee02 (ESP32-S3 + 13.3" panel,
|
||||
# a genuinely different chip target, not just a Kconfig variant).
|
||||
# build_for_board.sh gives each its own build dir/generated
|
||||
# sdkconfig so this never fights over shared state. set-target
|
||||
# first since a fresh checkout has no cached sdkconfig
|
||||
# (firmware/sdkconfig* is gitignored, see firmware/.gitignore).
|
||||
# safe.directory guards against git's "dubious ownership" check,
|
||||
# since the container runs as root over content owned by a
|
||||
@@ -64,8 +66,15 @@ jobs:
|
||||
')
|
||||
docker cp "$PWD/." "$cid:/workspace"
|
||||
docker start -a "$cid"
|
||||
docker cp "$cid:/workspace/firmware/build/espresso_frame.bin" /tmp/release-assets/firmware-devkit.bin
|
||||
docker cp "$cid:/workspace/firmware/build/espresso_frame.bin" /tmp/release-assets/firmware-devkit_esp32c6.bin
|
||||
docker rm "$cid"
|
||||
# Rename bridge: fielded devices flashed before this rename still
|
||||
# report the bare "devkit" board name and look up "firmware-
|
||||
# devkit.bin" for their OTA check -- publish a duplicate under
|
||||
# the old name too so they can update at all. Safe to drop this
|
||||
# duplicate in a later release once no fielded device reports
|
||||
# the bare name anymore.
|
||||
cp /tmp/release-assets/firmware-devkit_esp32c6.bin /tmp/release-assets/firmware-devkit.bin
|
||||
|
||||
- name: Build (xiao -- Seeed XIAO ESP32-C6)
|
||||
run: |
|
||||
@@ -77,7 +86,35 @@ jobs:
|
||||
')
|
||||
docker cp "$PWD/." "$cid:/workspace"
|
||||
docker start -a "$cid"
|
||||
docker cp "$cid:/workspace/firmware/build_xiao/espresso_frame.bin" /tmp/release-assets/firmware-xiao.bin
|
||||
docker cp "$cid:/workspace/firmware/build_xiao/espresso_frame.bin" /tmp/release-assets/firmware-xiao_esp32c6.bin
|
||||
docker rm "$cid"
|
||||
# Same rename-bridge reasoning as the devkit step above.
|
||||
cp /tmp/release-assets/firmware-xiao_esp32c6.bin /tmp/release-assets/firmware-xiao.bin
|
||||
|
||||
# NOTE: this build is expected to FAIL until
|
||||
# firmware/components/epd13in3e's panel driver is ported from
|
||||
# vendor demo code (see that component's own top-of-file comment
|
||||
# -- a deliberate #error, not a bug here). `continue-on-error` so
|
||||
# this known, tracked gap doesn't block publishing the devkit/xiao
|
||||
# release (those boards work today and shouldn't wait on ee02) --
|
||||
# this step's own status still shows failed/red individually in
|
||||
# the run's step list, it just doesn't fail the overall job. Once
|
||||
# epd13in3e's driver is real, a build failure here becomes a
|
||||
# genuine regression again -- remove `continue-on-error` at that
|
||||
# point so it goes back to failing the job like the other two
|
||||
# builds do.
|
||||
- name: Build (ee02 -- Seeed EE02, XIAO ESP32-S3 Plus + 13.3in panel)
|
||||
continue-on-error: true
|
||||
run: |
|
||||
cid=$(docker create -w /workspace/firmware espressif/idf:release-v6.0 bash -c '
|
||||
git config --global --add safe.directory /workspace &&
|
||||
. "$IDF_PATH/export.sh" &&
|
||||
./build_for_board.sh ee02 set-target esp32s3 &&
|
||||
./build_for_board.sh ee02 build
|
||||
')
|
||||
docker cp "$PWD/." "$cid:/workspace"
|
||||
docker start -a "$cid"
|
||||
docker cp "$cid:/workspace/firmware/build_ee02/espresso_frame.bin" /tmp/release-assets/firmware-ee02.bin
|
||||
docker rm "$cid"
|
||||
|
||||
# Plain stdlib urllib rather than `requests` -- not guaranteed to be
|
||||
@@ -149,10 +186,25 @@ jobs:
|
||||
existing_assets = {a["name"]: a["id"] for a in release.get("assets", [])}
|
||||
|
||||
assets = [
|
||||
("firmware-devkit_esp32c6.bin", "/tmp/release-assets/firmware-devkit_esp32c6.bin"),
|
||||
("firmware-xiao_esp32c6.bin", "/tmp/release-assets/firmware-xiao_esp32c6.bin"),
|
||||
("firmware-ee02.bin", "/tmp/release-assets/firmware-ee02.bin"),
|
||||
# Rename-bridge duplicates for devices still on old firmware
|
||||
# reporting the bare "devkit"/"xiao" board names -- see the
|
||||
# build steps above. Safe to remove once no fielded device
|
||||
# reports the bare name anymore.
|
||||
("firmware-devkit.bin", "/tmp/release-assets/firmware-devkit.bin"),
|
||||
("firmware-xiao.bin", "/tmp/release-assets/firmware-xiao.bin"),
|
||||
]
|
||||
for name, path in assets:
|
||||
if not os.path.exists(path):
|
||||
# Expected for firmware-ee02.bin while that build is
|
||||
# still allowed to fail (continue-on-error, see the
|
||||
# build step's own comment) -- publish whatever boards
|
||||
# did build rather than crashing the whole release over
|
||||
# a known, tracked gap.
|
||||
print(f"Skipping {name}: build did not produce {path}")
|
||||
continue
|
||||
if name in existing_assets:
|
||||
del_status, _ = req("DELETE", f"/releases/{release_id}/assets/{existing_assets[name]}")
|
||||
print(f"Removed existing asset {name} (status {del_status})")
|
||||
|
||||
Reference in New Issue
Block a user