ci: Fix build.yaml for changed output dir

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
feat: freeze all python code, restructure build
2025-11-11 22:26:16 +01:00 · 2025-11-11 22:26:16 +01:00
7 changed files with 42 additions and 24 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -17,9 +17,9 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: firmware-RPi-Pico-W
-          path: software/lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/firmware.uf2
+          path: build/firmware-*.uf2
      - name: Upload firmware w/ filesystem
        uses: actions/upload-artifact@v3
        with:
          name: firmware-RPi-Pico-W-with-fs
-          path: software/lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/firmware-filesystem-*.uf2
+          path: build/firmware-filesystem-*.uf2
--- a/software/boards/RPI_PICO_W/manifest-Rev1.py
+++ b/software/boards/RPI_PICO_W/manifest-Rev1.py
@@ -0,0 +1,3 @@
+include("manifest.py")
+
+module("hwconfig.py", "../../src/hwconfig_Rev1")
--- a/software/boards/RPI_PICO_W/manifest-breadboard.py
+++ b/software/boards/RPI_PICO_W/manifest-breadboard.py
@@ -0,0 +1,3 @@
+include("manifest.py")
+
+module("hwconfig.py", "../../src/hwconfig_breadboard")
--- a/software/boards/RPI_PICO_W/manifest.py
+++ b/software/boards/RPI_PICO_W/manifest.py
@@ -15,3 +15,9 @@ module("microdot.py", "../../lib/microdot/src/microdot/")
 # TonberryPico modules
 module("audiocore.py", "../../modules/audiocore")
 module("rp2_neopixel.py", "../../modules")
+
+module("main.py", "../../src")
+module("app.py", "../../src")
+module("mp3player.py", "../../src")
+package("utils", base_path="../../src")
+package("nfc", base_path="../../src")
--- a/software/build.sh
+++ b/software/build.sh
@@ -6,40 +6,46 @@ set -eu

 ( cd lib/micropython
  make -C mpy-cross -j "$(nproc)"
-  make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W clean
-  make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W \
-       USER_C_MODULES="$TOPDIR"/modules/micropython.cmake -j "$(nproc)"
 )

 ( cd tools/mklittlefs
  make -j "$(nproc)"
 )

-PICOTOOL=picotool
-if ! command -v $PICOTOOL >/dev/null 2>&1; then
-    echo "system picotool not found, checking SDK build dir"
-    PICOTOOL=lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/_deps/picotool-build/picotool
-    if ! command -v $PICOTOOL >/dev/null 2>&1; then
-       echo "No picotool found, exiting"
-       exit 1
-    fi
-fi
 BUILDDIR=lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/
+OUTDIR=$(pwd)/build
+mkdir -p "$OUTDIR"
 FS_STAGE_DIR=$(mktemp -d)
+mkdir  "$FS_STAGE_DIR"/fs
 trap 'rm -rf $FS_STAGE_DIR' EXIT
-for hwconfig in src/hwconfig_*.py; do
+tools/mklittlefs/mklittlefs -p 256 -s 868352 -c "$FS_STAGE_DIR"/fs "$FS_STAGE_DIR"/filesystem.bin
+
+for hwconfig in boards/RPI_PICO_W/manifest-*.py; do
    hwconfig_base=$(basename "$hwconfig")
-    hwname=${hwconfig_base##hwconfig_}
+    hwname=${hwconfig_base##manifest-}
    hwname=${hwname%%.py}
-    find src/ -iname '*.py' \! -iname 'hwconfig_*.py' | cpio -pdm "$FS_STAGE_DIR"
-    cp "$hwconfig" "$FS_STAGE_DIR"/src/hwconfig.py
-    tools/mklittlefs/mklittlefs -p 256 -s 868352 -c "$FS_STAGE_DIR"/src $BUILDDIR/filesystem.bin
+    hwconfig_abs=$(realpath "$hwconfig")
+    ( cd lib/micropython
+      make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W clean
+      make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W \
+           USER_C_MODULES="$TOPDIR"/modules/micropython.cmake \
+           FROZEN_MANIFEST="$hwconfig_abs" -j "$(nproc)"
+    )
+    PICOTOOL=picotool
+    if ! command -v $PICOTOOL >/dev/null 2>&1; then
+        echo "system picotool not found, checking SDK build dir"
+        PICOTOOL=lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/_deps/picotool-build/picotool
+        if ! command -v $PICOTOOL >/dev/null 2>&1; then
+            echo "No picotool found, exiting"
+            exit 1
+        fi
+    fi
    truncate -s 2M $BUILDDIR/firmware-filesystem.bin
    dd if=$BUILDDIR/firmware.bin of=$BUILDDIR/firmware-filesystem.bin bs=1k
-    dd if=$BUILDDIR/filesystem.bin of=$BUILDDIR/firmware-filesystem.bin bs=1k seek=1200
-    $PICOTOOL uf2 convert $BUILDDIR/firmware-filesystem.bin $BUILDDIR/firmware-filesystem-"$hwname".uf2
-    rm -r "${FS_STAGE_DIR:?}"/*
+    dd if="$FS_STAGE_DIR"/filesystem.bin of=$BUILDDIR/firmware-filesystem.bin bs=1k seek=1200
+    cp $BUILDDIR/firmware.uf2 "$OUTDIR"/firmware-"$hwname".uf2
+    $PICOTOOL uf2 convert $BUILDDIR/firmware-filesystem.bin "$OUTDIR"/firmware-filesystem-"$hwname".uf2
 done

-echo "Output in $BUILDDIR/firmware.uf2"
-echo "Images with filesystem in" ${BUILDDIR}firmware-filesystem-*.uf2
+echo "Output in" "${OUTDIR}"/firmware-*.uf2
+echo "Images with filesystem in" "${OUTDIR}"/firmware-filesystem-*.uf2
--- a/software/src/hwconfig_Rev1/hwconfig.py
+++ b/software/src/hwconfig_Rev1/hwconfig.py
--- a/software/src/hwconfig_breadboard/hwconfig.py
+++ b/software/src/hwconfig_breadboard/hwconfig.py
Author	SHA1	Message	Date
Matthias Blankertz	f403bf289f	ci: Fix build.yaml for changed output dir All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m29s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 8s Details Run pytests / Check-Pytest (push) Successful in 11s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-11-11 22:26:16 +01:00
Matthias Blankertz	5642570426	feat: freeze all python code, restructure build Add all python code run on the device to the manifest.py to freeze it. This has two benefits: - It precompiles the bytecode, so it is smaller and faster - All code (C and python) is now in the firmware image, leaving the littlefs filesystem on the flash free for user settings. This requires changing the way the hardware variants are handled. There is now only one _filesystem_ image, but instead there are different _firmware_ images for each variant. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-11-11 22:26:16 +01:00