Fix build workflow

update to increase factory partition size for sparkfun iot redboard
Uncomment redvision submodule update
Misc fixes to redvision build script

Author: sfe-SparkFro

.github/workflows/ports_sparkfun.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: 'micropython repo'
+        working-directory: 'micropython'
     steps:
     - uses: actions/checkout@v4
       with:
-        path: 'micropython repo'
+        path: 'micropython'
     - name: Install RP2 package
       run: source tools/ci.sh && ci_rp2_setup
     # - name: Install mimxrt package # Currently redundant since it does the same arm setup as rp2, but in future if these diverge, uncomment this...
@@ -34,7 +34,7 @@ jobs:
     - name: Upload Release Assets
       uses: shogo82148/actions-upload-release-asset@v1
       with:
-        asset_path: "micropython repo/sparkfun_release/*"
+        asset_path: "micropython/sparkfun_release/*"
         github_token: ${{ secrets.GITHUB_TOKEN }}
         upload_url: ${{ github.event.release.upload_url }}
 

ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/mpconfigboard.cmake

@@ -2,6 +2,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
+    boards/SPARKFUN_IOT_REDBOARD_ESP32/sdkconfig.base-sparkfun-plus
 )
 
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

ports/esp32/boards/SPARKFUN_IOT_REDBOARD_ESP32/sdkconfig.base-sparkfun-plus

@@ -0,0 +1,3 @@
+# Use the base "plus" paritition table - for larger images
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiBplusplus.csv"

ports/esp32/partitions-4MiBplusplus.csv

@@ -0,0 +1,10 @@
+# This partition table is for devices with 4MiB or more of flash.
+# The first 2MiB is used for bootloader, nvs, phy_init and firmware.
+# The remaining flash is for the user filesystem(s).
+
+# Notes: the offset of the partition table itself is set in
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 0x1FF000,

sparkfun_build.sh

@@ -151,10 +151,23 @@ function build_for_port {
         fi
         echo "Building $(basename $board)"
 
+        # Construct make arguments
         BOARD_TO_BUILD=${SPARKFUN_PREFIX}${board#$SPARKFUN_BOARD_PREFIX}
-        make ${MAKEOPTS} -C ports/${TARGET_PORT_NAME} BOARD=$BOARD_TO_BUILD BOARD_VARIANT=$BOARD_VARIANT FROZEN_MANIFEST=$FROZEN_MANIFEST USER_C_MODULES=$USER_C_MODULES clean
-        make ${MAKEOPTS} -C ports/${TARGET_PORT_NAME} BOARD=$BOARD_TO_BUILD BOARD_VARIANT=$BOARD_VARIANT FROZEN_MANIFEST=$FROZEN_MANIFEST USER_C_MODULES=$USER_C_MODULES submodules
-        make ${MAKEOPTS} -C ports/${TARGET_PORT_NAME} BOARD=$BOARD_TO_BUILD BOARD_VARIANT=$BOARD_VARIANT FROZEN_MANIFEST=$FROZEN_MANIFEST USER_C_MODULES=$USER_C_MODULES
+        MAKE_ARGS="-C ports/${TARGET_PORT_NAME} BOARD=$BOARD_TO_BUILD"
+        if [ -n "$BOARD_VARIANT" ]; then
+            MAKE_ARGS+=" BOARD_VARIANT=${BOARD_VARIANT}"
+        fi
+        if [ -n "$FROZEN_MANIFEST" ]; then
+            MAKE_ARGS+=" FROZEN_MANIFEST=${FROZEN_MANIFEST}"
+        fi
+        if [ -n "$USER_C_MODULES" ]; then
+            MAKE_ARGS+=" USER_C_MODULES=${USER_C_MODULES}"
+        fi
+        echo "MAKE_ARGS: ${MAKE_ARGS}"
+
+        make ${MAKE_ARGS} ${MAKEOPTS} clean
+        make ${MAKE_ARGS} ${MAKEOPTS} submodules
+        make ${MAKE_ARGS} ${MAKEOPTS}
     done
 }
 
@@ -302,17 +315,23 @@ function build_micropython_red_vision_rp2 {
     # https://stackoverflow.com/a/246128/4783963
     SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
     if [ -n "$GITHUB_WORKSPACE" ]; then
-        export PICO_SDK_PATH="$GITHUB_WORKSPACE/lib/pico-sdk"
+        export PICO_SDK_PATH="$GITHUB_WORKSPACE/micropython/lib/pico-sdk"
     else
         export PICO_SDK_PATH="$SCRIPT_DIR/lib/pico-sdk"
     fi
 
     # Clone the Red Vision submodule
-    # git submodule update --init --recursive lib/red_vision
+    git submodule update --init --recursive lib/red_vision
+
+    # Clone the Pico SDK submodule
+    git submodule update --init --recursive lib/pico-sdk
 
     # Build OpenCV
     make -C lib/red_vision/micropython-opencv PLATFORM=rp2350 --no-print-directory ${MAKEOPTS}
 
+    # install freezefs if not already installed
+    pip install freezefs
+
     # Archive the examples directory
     python3 -m freezefs lib/red_vision/red_vision_examples lib/red_vision/extract_red_vision_examples.py  --on-import=extract --compress --overwrite always
 
@@ -420,7 +439,7 @@ function build_sparkfun {
     # Copy all mimxrt teensy binary files to the output directory
     copy_all_for_prefix ${OUTPUT_DIRECTORY} "ports/mimxrt" "build-TEENSY" "firmware" "elf" "${OUTPUT_FILE_PREFIX}TEENSY_" true
 
-    Remove all builds to prepare for Red Vision build
+    # Remove all builds to prepare for Red Vision build
     delete_build_directories_for_port esp32
     delete_build_directories_for_port rp2
     delete_build_directories_for_port mimxrt