Merge pull request '15-create-filesystem-image-with-firmware' (#17) from 15-create-filesystem-image-with-firmware into main

Reviewed-on: #17
Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>

.gitea/workflows/build.yaml

@@ -18,3 +18,8 @@ jobs:
         with:
           name: firmware-RPi-Pico-W
           path: software/lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/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

.gitignore

@@ -5,3 +5,4 @@ hardware/tonberry-pico/tonberry-pico-backups/
 software/build
 compile_commands.json
 .dir-locals.el
+.cache

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "software/lib/microdot"]
 	path = software/lib/microdot
 	url = ../microdot.git
+[submodule "software/tools/mklittlefs"]
+	path = software/tools/mklittlefs
+	url = https://github.com/earlephilhower/mklittlefs.git

software/CMakeLists.txt

@@ -50,7 +50,7 @@ add_test(NAME generate-xml-report
 set_tests_properties(clean-reports PROPERTIES FIXTURES_SETUP "Report")
 set_tests_properties(generate-xml-report PROPERTIES FIXTURES_CLEANUP "Report")
 
-add_subdirectory(src/audiocore)
+add_subdirectory(modules/audiocore)
 
 add_custom_target(check-format
     find . -iname '*.[ch]' -exec clang-format -Werror --dry-run {} +

software/boards/RPI_PICO_W/manifest.py

@@ -5,7 +5,7 @@ require("bundle-networking")
 # Bluetooth
 require("aioble")
 
-module("rp2_neopixel.py", "../../src")
+module("rp2_neopixel.py", "../../modules")
 require("sdcard")
 require("aiorepl")
 
@@ -14,5 +14,4 @@ module("mfrc522.py", "../../lib/micropython-mfrc522/")
 module("microdot.py", "../../lib/microdot/src/microdot/")
 
 # TonberryPico modules
-module("audiocore.py", "../../src/audiocore")
-package("nfc", base_path="../../src/")
+module("audiocore.py", "../../modules/audiocore")

software/build.sh

@@ -8,7 +8,28 @@ set -eu
   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"/src/micropython.cmake -j "$(nproc)"
+       USER_C_MODULES="$TOPDIR"/modules/micropython.cmake -j "$(nproc)"
 )
 
-echo "Output in lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/firmware.uf2"
+( 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/
+tools/mklittlefs/mklittlefs -p 256 -s 868352 -c src/ $BUILDDIR/filesystem.bin
+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.uf2
+
+echo "Output in $BUILDDIR/firmware.uf2"
+echo "Image with filesystem in $BUILDDIR/firmware-filesystem.uf2"

software/update-submodules.sh

@@ -5,3 +5,4 @@ set -eu
 git submodule update --init lib
 git -C lib/micropython submodule update --init lib/pico-sdk lib/mbedtls lib/micropython-lib lib/tinyusb lib/btstack lib/cyw43-driver lib/lwip
 git -C lib/micropython/lib/pico-sdk submodule update --init lib
+git submodule update --init --recursive tools/mklittlefs