MicroPython Edge

.github/workflows/micropython.yml

@@ -7,9 +7,10 @@ on:
     types: [created]
 
 env:
-  MICROPYTHON_VERSION: v1.23.0
-  PIMORONI_PICO_VERSION: v1.23.0-1
-  WORKFLOW_VERSION: v3
+  MICROPYTHON_VERSION: master
+  MICROPYTHON_FLAVOUR: micropython
+  PIMORONI_PICO_VERSION: feature/picovector2-and-layers
+  WORKFLOW_VERSION: v4
 
 jobs:
   deps:
@@ -30,7 +31,7 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
-        repository: micropython/micropython
+        repository: ${{env.MICROPYTHON_FLAVOUR}}/micropython
         ref: ${{env.MICROPYTHON_VERSION}}
         submodules: false  # MicroPython submodules are hideously broken
         path: micropython
@@ -110,29 +111,16 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: gadgetoid/py_decl
-        ref: v0.0.1
+        ref: v0.0.4
         path: py_decl
 
     # Check out dir2u2f
     - uses: actions/checkout@v4
       with:
         repository: gadgetoid/dir2uf2
-        ref: v0.0.5
+        ref: v0.0.10
         path: dir2uf2
 
-    # HACK: Patch startup overclock into Pico SDK
-    - name: "HACK: Startup Overclock Patch"
-      shell: bash
-      working-directory: micropython/lib/pico-sdk
-      run: |
-        git apply "${{env.FIRMWARE_DIR}}/startup_overclock.patch"
-
-    - name: "HACK: MicroPython out of tree board pins.csv fix"
-      shell: bash
-      working-directory: micropython
-      run: |
-        git apply "${{env.FIRMWARE_DIR}}/932f76c6ba64c5a3e68de3324556d9979f09303b.patch"
-
     # Install apt packages
     - name: Install CCache & Compiler
       shell: bash

firmware/PIMORONI_BADGER2040W/mpconfigboard.h

@@ -18,4 +18,5 @@
 
 #define MICROPY_HW_PIN_EXT_COUNT    CYW43_WL_GPIO_COUNT
 
-#define MICROPY_HW_PIN_RESERVED(i) ((i) == CYW43_PIN_WL_HOST_WAKE || (i) == CYW43_PIN_WL_REG_ON)
+int mp_hal_is_pin_reserved(int n);
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)

firmware/modules/wakeup/wakeup.cpp

@@ -12,9 +12,12 @@ struct Wakeup {
             gpio_set_dir_masked(WAKEUP_PIN_MASK, WAKEUP_PIN_DIR);
             gpio_put_masked(WAKEUP_PIN_MASK, WAKEUP_PIN_VALUE);
 
+            gpio_init_mask(~WAKEUP_PIN_MASK);
+            gpio_set_dir_in_masked(~WAKEUP_PIN_MASK);
             wakeup_gpio_state = gpio_get_all();
             sleep_ms(5);
             wakeup_gpio_state |= gpio_get_all();
+            gpio_init_mask(~WAKEUP_PIN_MASK);
 
 #if WAKEUP_HAS_RTC==1
             // Set up RTC I2C pins and send reset command