Experimental: builds with dual FAT MSC support.

pimoroni · Jan 19, 2024 · e8b6bb8 · e8b6bb8
1 parent 392d75b
commit e8b6bb8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -7,7 +7,7 @@ on:
     types: [created]
 
 env:
-  MICROPYTHON_VERSION: v1.22.1
+  MICROPYTHON_VERSION: feature/multi-msc
 
 jobs:
   build:

diff --git a/ci/micropython.sh b/ci/micropython.sh
@@ -14,7 +14,7 @@ function log_warning {
 
 function micropython_clone {
     log_inform "Using MicroPython $MICROPYTHON_VERSION"
-    git clone https://github.com/micropython/micropython --depth=1 --branch=$MICROPYTHON_VERSION
+    git clone https://github.com/pimoroni/micropython --depth=1 --branch=$MICROPYTHON_VERSION
     cd micropython
     git submodule update --init lib/pico-sdk
     git submodule update --init lib/cyw43-driver
@@ -72,4 +72,4 @@ function cmake_build {
     ccache --show-stats || true
     cd build-$BOARD_NAME
     cp firmware.uf2 $RELEASE_FILE.uf2
-}
+}
diff --git a/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.h b/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.h
@@ -3,6 +3,11 @@
 #define MICROPY_HW_BOARD_NAME          "Pimoroni Tufty 2040"
 #define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
 
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pimoroni"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"
+
 #define MICROPY_HW_USB_VID (0x2E8A)
 #define MICROPY_HW_USB_PID (0x1002)
 

diff --git a/micropython/board/RPI_PICO/mpconfigboard.h b/micropython/board/RPI_PICO/mpconfigboard.h
@@ -1,3 +1,10 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
+
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_VID (0x1FFB)
+#define MICROPY_HW_USB_PID (0x2043)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pimoroni"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"
diff --git a/micropython/board/RPI_PICO_W/mpconfigboard.h b/micropython/board/RPI_PICO_W/mpconfigboard.h
@@ -20,4 +20,11 @@
 
 #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)
+#define MICROPY_HW_PIN_RESERVED(i) ((i) == CYW43_PIN_WL_HOST_WAKE || (i) == CYW43_PIN_WL_REG_ON)
+
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_VID (0x1FFB)
+#define MICROPY_HW_USB_PID (0x2043)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pimoroni"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"