Merge pull request pimoroni#858 from pimoroni/patch-bump-micropython-…

…oct-2023 CI: Bump MicroPython to v1.21.0.
LionsPhil · Oct 6, 2023 · ee7f275 · ee7f275
2 parents 9499b7e + 388d8af
commit ee7f275
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 17 deletions.
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -7,7 +7,7 @@ on:
     types: [created]
 
 env:
-  MICROPYTHON_VERSION: 856e08b1931b88271816a2f60648f6ff332235b2
+  MICROPYTHON_VERSION: v1.21.0
   WORKFLOW_VERSION: v1
 
 jobs:
@@ -69,9 +69,9 @@ jobs:
       matrix:
         include:
         - name: pico
-          board: PICO
+          board: RPI_PICO
         - name: picow
-          board: PICO_W
+          board: RPI_PICO_W
         - name: tiny2040
           board: PIMORONI_TINY2040
         - name: picolipo_4mb
@@ -84,11 +84,11 @@ jobs:
           board: PICO_W_ENVIRO
           patch: true
         - name: galactic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: cosmic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: stellar_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: inky_frame
           board: PICO_W_INKY
           patch: true

diff --git a/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake b/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 # cmake file for Pimoroni Enviro with Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
+set(MICROPY_BOARD RPI_PICO_W)
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)

diff --git a/micropython/board/PICO_W_INKY/manifest.py b/micropython/board/PICO_W_INKY/manifest.py
@@ -5,6 +5,9 @@
 require("urllib.urequest")
 require("umqtt.simple")
 
+# SD Card
+require("sdcard")
+
 # Bluetooth
 require("aioble")
 

diff --git a/micropython/board/PICO_W_INKY/mpconfigboard.cmake b/micropython/board/PICO_W_INKY/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
+set(MICROPY_BOARD RPI_PICO_W)
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)

diff --git a/micropython/board/PICO/board.json → micropython/board/RPI_PICO/board.json b/micropython/board/PICO/board.json → micropython/board/RPI_PICO/board.json
diff --git a/micropython/board/PICO/manifest.py → micropython/board/RPI_PICO/manifest.py b/micropython/board/PICO/manifest.py → micropython/board/RPI_PICO/manifest.py
diff --git a/micropython/board/PICO/mpconfigboard.cmake → ...python/board/RPI_PICO/mpconfigboard.cmake b/micropython/board/PICO/mpconfigboard.cmake → ...python/board/RPI_PICO/mpconfigboard.cmake
@@ -1,4 +1,5 @@
 # cmake file for Raspberry Pi Pico
+set(PICO_BOARD "pico")
 
 # Board specific version of the frozen manifest
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

diff --git a/micropython/board/PICO/mpconfigboard.h → micropython/board/RPI_PICO/mpconfigboard.h b/micropython/board/PICO/mpconfigboard.h → micropython/board/RPI_PICO/mpconfigboard.h
diff --git a/micropython/board/PICO/pins.csv → micropython/board/RPI_PICO/pins.csv b/micropython/board/PICO/pins.csv → micropython/board/RPI_PICO/pins.csv
diff --git a/micropython/board/PICO_W/board.json → micropython/board/RPI_PICO_W/board.json b/micropython/board/PICO_W/board.json → micropython/board/RPI_PICO_W/board.json
diff --git a/micropython/board/PICO_W/manifest.py → micropython/board/RPI_PICO_W/manifest.py b/micropython/board/PICO_W/manifest.py → micropython/board/RPI_PICO_W/manifest.py
@@ -2,6 +2,9 @@
 
 require("bundle-networking")
 
+# SD Card
+require("sdcard")
+
 # Bluetooth
 require("aioble")
 

diff --git a/micropython/board/PICO_W/mpconfigboard.cmake → ...thon/board/RPI_PICO_W/mpconfigboard.cmake b/micropython/board/PICO_W/mpconfigboard.cmake → ...thon/board/RPI_PICO_W/mpconfigboard.cmake
@@ -1,4 +1,5 @@
 # cmake file for Raspberry Pi Pico W
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)

diff --git a/micropython/board/PICO_W/mpconfigboard.h → micropython/board/RPI_PICO_W/mpconfigboard.h b/micropython/board/PICO_W/mpconfigboard.h → micropython/board/RPI_PICO_W/mpconfigboard.h
diff --git a/micropython/board/PICO_W/pins.csv → micropython/board/RPI_PICO_W/pins.csv b/micropython/board/PICO_W/pins.csv → micropython/board/RPI_PICO_W/pins.csv
diff --git a/micropython/examples/common/lib/sdcard.mpy b/micropython/examples/common/lib/sdcard.mpy
diff --git a/micropython/examples/inky_frame/README.md b/micropython/examples/inky_frame/README.md
@@ -27,10 +27,6 @@ The wireless examples need `network_manager.py` and `WIFI_CONFIG.py` from the `c
 
 You'll also need to install the `micropython-urllib.urequest` library using Thonny's 'Tools' > 'Manage Packages' or `common/lib/urllib` which contains a compiled `.mpy` version that uses less RAM. You should place this directory in `lib` on your Pico W.
 
-Finally for examples loading images, you'll need `sdcard.mpy` from `common/lib`. You should place this file in `lib` on your Pico W.
-
-- [/micropython/examples/common](../common)
-
 ### Button Test
 [button_test.py](button_test.py)
 

diff --git a/micropython/examples/inky_frame/image_gallery/README.md b/micropython/examples/inky_frame/image_gallery/README.md
@@ -24,11 +24,18 @@ Copy the images to your Pico W using Thonny.
 
 ### image_gallery_sd.py / image_gallery_sd_random.py
 
-Pop an SD card into your computer to copy the images across. (Alternatively, you can transfer them using Thonny, but you will have to mount the SD card using the REPL first).
-
-The SD card examples require `sdcard.mpy` from `common/lib`  - copy this file into the `lib` directory on your Pico W.
-
-- [/micropython/examples/common](../../common)
+Pop an SD card into your computer to copy the images across.
+
+Alternatively, you can transfer them using Thonny, but you will have to mount the SD card using the REPL first:
+
+```python
+import os
+import sdcard
+from machine import Pin
+sd_spi = SPI(0, sck=Pin(18, Pin.OUT), mosi=Pin(19, Pin.OUT), miso=Pin(16, Pin.OUT))
+sd = sdcard.SDCard(sd_spi, Pin(22))
+os.mount(sd, "/sd")
+```
 
 ## Image Credits