TinyFX: Add picofx lib into user flash.

pimoroni · Jul 29, 2024 · 5bfef36 · 5bfef36
1 parent 22979af
commit 5bfef36
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -70,6 +70,7 @@ jobs:
       RELEASE_FILE: pimoroni-${{matrix.shortname}}-${{github.event.release.tag_name || github.sha}}-micropython.uf2
       RELEASE_FILE_WITH_OS: pimoroni-${{matrix.shortname}}-${{github.event.release.tag_name || github.sha}}-micropython-with-examples.uf2
       FIRMWARE_DIR: "$GITHUB_WORKSPACE/picofx/boards"
+      ROOT_DIR: "$GITHUB_WORKSPACE/picofx"
       BOARD_DIR: "$GITHUB_WORKSPACE/picofx/boards/${{matrix.board}}"
       EXAMPLES_DIR: "$GITHUB_WORKSPACE/picofx/examples/${{matrix.shortundername}}"
 
@@ -123,12 +124,16 @@ jobs:
       working-directory: micropython
       run: |
         git apply "${{env.FIRMWARE_DIR}}/932f76c6ba64c5a3e68de3324556d9979f09303b.patch"
-
-    # Install apt packages
-    - name: Install CCache & Compiler
-      shell: bash
-      run:
-        sudo apt update && sudo apt install ccache gcc-arm-none-eabi
+    
+    - name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
+      uses: carlosperate/arm-none-eabi-gcc-action@v1
+      with:
+        release: '9-2020-q2'
+
+    - name: Install CCache
+      run: |
+        source $BUILD_TOOLS
+        apt_install_build_deps
 
     # Build firmware
     - name: Configure MicroPython
@@ -156,6 +161,12 @@ jobs:
       run: |
         python3 py_decl/py_decl.py --to-json --verify micropython/ports/rp2/build/${{ env.RELEASE_FILE }}
 
+    - name: "HACK: Mangle PicoFX Lib into user filesystem"
+      shell: bash
+      run: |
+        mkdir -p ${{env.EXAMPLES_DIR}}/lib
+        cp -v -r ${{env.ROOT_DIR}}/picofx ${{env.EXAMPLES_DIR}}/lib
+
     - name: Append Filesystem
       shell: bash
       run: |

diff --git a/boards/PIMORONI_TINYFX/manifest.py b/boards/PIMORONI_TINYFX/manifest.py
@@ -2,4 +2,5 @@
 
 freeze("lib/")
 
-package("picofx", base_path="../../")
+# TODO: Convince Chris this is the one true and holy path
+# package("picofx", base_path="../../")
diff --git a/examples/tiny_fx/uf2-manifest.txt b/examples/tiny_fx/uf2-manifest.txt
@@ -1,3 +1,6 @@
 main.py
 effects/*.py
-showcase/*.py
+showcase/*.py
+lib/picofx/*.py
+lib/picofx/colour/*.py
+lib/picofx/mono/*.py