Split out builds.

pimoroni · Dec 4, 2024 · 9817f61 · 9817f61
1 parent 4c111cb
commit 9817f61
Show file tree

Hide file tree

Showing 27 changed files with 151 additions and 17 deletions.
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -14,8 +14,10 @@ jobs:
     strategy:
       matrix:
         include:
-        - name: pico_w_unicorn
-        - name: pico2_w_unicorn
+        - name: pico_w_galactic
+        - name: pico_w_cosmic
+        - name: pico_w_stellar
+        - name: pico2_w_galactic
 
     env:
       # MicroPython version will be contained in github.event.release.tag_name for releases

diff --git a/boards/pico2_w_unicorn/manifest.py → boards/pico2_w_galactic/manifest.py b/boards/pico2_w_unicorn/manifest.py → boards/pico2_w_galactic/manifest.py
diff --git a/boards/pico2_w_unicorn/manifest.txt → boards/pico2_w_galactic/manifest.txt b/boards/pico2_w_unicorn/manifest.txt → boards/pico2_w_galactic/manifest.txt
diff --git a/boards/pico2_w_unicorn/mpconfigboard.cmake → boards/pico2_w_galactic/mpconfigboard.cmake b/boards/pico2_w_unicorn/mpconfigboard.cmake → boards/pico2_w_galactic/mpconfigboard.cmake
diff --git a/boards/pico2_w_unicorn/mpconfigboard.h → boards/pico2_w_galactic/mpconfigboard.h b/boards/pico2_w_unicorn/mpconfigboard.h → boards/pico2_w_galactic/mpconfigboard.h
@@ -1,12 +1,12 @@
 // Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico2 W (Unicorn)"
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico2 W (Galactic Unicorn)"
 
 // Leave 50/50 split - 2MB firmware, 2MB user filesystem
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - (2 * 1024 * 1024))
 
 // Enable networking.
 #define MICROPY_PY_NETWORK_PPP_LWIP             (1)
-#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "Unicorn2W"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "GalacticUnicorn2W"
 #include "enable_cyw43.h"
 
 // For debugging mbedtls - also set

diff --git a/boards/pico2_w_unicorn/pins.csv → boards/pico2_w_galactic/pins.csv b/boards/pico2_w_unicorn/pins.csv → boards/pico2_w_galactic/pins.csv
diff --git a/boards/pico2_w_galactic/usermodules.cmake b/boards/pico2_w_galactic/usermodules.cmake
@@ -0,0 +1,3 @@
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
+set(UNICORN "galactic")
+include(usermod-common)
diff --git a/boards/pico2_w_unicorn/usermodules.cmake b/boards/pico2_w_unicorn/usermodules.cmake
diff --git a/boards/pico_w_unicorn/manifest.py → boards/pico_w_cosmic/manifest.py b/boards/pico_w_unicorn/manifest.py → boards/pico_w_cosmic/manifest.py
diff --git a/boards/pico_w_unicorn/manifest.txt → boards/pico_w_cosmic/manifest.txt b/boards/pico_w_unicorn/manifest.txt → boards/pico_w_cosmic/manifest.txt
diff --git a/boards/pico_w_unicorn/mpconfigboard.cmake → boards/pico_w_cosmic/mpconfigboard.cmake b/boards/pico_w_unicorn/mpconfigboard.cmake → boards/pico_w_cosmic/mpconfigboard.cmake
diff --git a/boards/pico_w_unicorn/mpconfigboard.h → boards/pico_w_cosmic/mpconfigboard.h b/boards/pico_w_unicorn/mpconfigboard.h → boards/pico_w_cosmic/mpconfigboard.h
@@ -1,12 +1,12 @@
 // Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W (Unicorn)"
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W (Cosmic Unicorn)"
 
 // Leave 848k for user filesystem
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - (1200 * 1024))
 
 // Enable networking.
 #define MICROPY_PY_NETWORK_PPP_LWIP             (1)
-#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "Unicorn"
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "CosmicUnicorn"
 #include "enable_cyw43.h"
 
 // For debugging mbedtls - also set

diff --git a/boards/pico_w_unicorn/pins.csv → boards/pico_w_cosmic/pins.csv b/boards/pico_w_unicorn/pins.csv → boards/pico_w_cosmic/pins.csv
diff --git a/boards/pico_w_unicorn/usermodules.cmake → boards/pico_w_cosmic/usermodules.cmake b/boards/pico_w_unicorn/usermodules.cmake → boards/pico_w_cosmic/usermodules.cmake
@@ -1,3 +1,3 @@
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
-
+set(UNICORN "cosmic")
 include(usermod-common)
diff --git a/boards/pico_w_galactic/manifest.py b/boards/pico_w_galactic/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("../manifest-common.py")
diff --git a/boards/pico_w_galactic/manifest.txt b/boards/pico_w_galactic/manifest.txt
@@ -0,0 +1,3 @@
+*.py
+lib/*
+lib/*/*
diff --git a/boards/pico_w_galactic/mpconfigboard.cmake b/boards/pico_w_galactic/mpconfigboard.cmake
@@ -0,0 +1,17 @@
+# cmake file for Pimoroni Inky with Raspberry Pi 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)
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/boards/pico_w_galactic/mpconfigboard.h b/boards/pico_w_galactic/mpconfigboard.h
@@ -0,0 +1,14 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W (Galactic Unicorn)"
+
+// Leave 848k for user filesystem
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - (1200 * 1024))
+
+// Enable networking.
+#define MICROPY_PY_NETWORK_PPP_LWIP             (1)
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "GalacticUnicorn"
+#include "enable_cyw43.h"
+
+// For debugging mbedtls - also set
+// Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
+// #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
diff --git a/boards/pico_w_galactic/pins.csv b/boards/pico_w_galactic/pins.csv
@@ -0,0 +1,30 @@
+GP0,GPIO0
+GP1,GPIO1
+GP2,GPIO2
+GP3,GPIO3
+GP4,GPIO4
+GP5,GPIO5
+GP6,GPIO6
+GP7,GPIO7
+GP8,GPIO8
+GP9,GPIO9
+GP10,GPIO10
+GP11,GPIO11
+GP12,GPIO12
+GP13,GPIO13
+GP14,GPIO14
+GP15,GPIO15
+GP16,GPIO16
+GP17,GPIO17
+GP18,GPIO18
+GP19,GPIO19
+GP20,GPIO20
+GP21,GPIO21
+GP22,GPIO22
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+WL_GPIO0,EXT_GPIO0
+WL_GPIO1,EXT_GPIO1
+WL_GPIO2,EXT_GPIO2
+LED,EXT_GPIO0
diff --git a/boards/pico_w_galactic/usermodules.cmake b/boards/pico_w_galactic/usermodules.cmake
@@ -0,0 +1,3 @@
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
+set(UNICORN "galactic")
+include(usermod-common)
diff --git a/boards/pico_w_stellar/manifest.py b/boards/pico_w_stellar/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("../manifest-common.py")
diff --git a/boards/pico_w_stellar/manifest.txt b/boards/pico_w_stellar/manifest.txt
@@ -0,0 +1,3 @@
+*.py
+lib/*
+lib/*/*
diff --git a/boards/pico_w_stellar/mpconfigboard.cmake b/boards/pico_w_stellar/mpconfigboard.cmake
@@ -0,0 +1,17 @@
+# cmake file for Pimoroni Inky with Raspberry Pi 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)
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Bluetooth
+set(MICROPY_PY_BLUETOOTH ON)
+set(MICROPY_BLUETOOTH_BTSTACK ON)
+set(MICROPY_PY_BLUETOOTH_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/boards/pico_w_stellar/mpconfigboard.h b/boards/pico_w_stellar/mpconfigboard.h
@@ -0,0 +1,14 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W (Stellar Unicorn)"
+
+// Leave 848k for user filesystem
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - (1200 * 1024))
+
+// Enable networking.
+#define MICROPY_PY_NETWORK_PPP_LWIP             (1)
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT     "StellarUnicorn"
+#include "enable_cyw43.h"
+
+// For debugging mbedtls - also set
+// Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
+// #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
diff --git a/boards/pico_w_stellar/pins.csv b/boards/pico_w_stellar/pins.csv
@@ -0,0 +1,30 @@
+GP0,GPIO0
+GP1,GPIO1
+GP2,GPIO2
+GP3,GPIO3
+GP4,GPIO4
+GP5,GPIO5
+GP6,GPIO6
+GP7,GPIO7
+GP8,GPIO8
+GP9,GPIO9
+GP10,GPIO10
+GP11,GPIO11
+GP12,GPIO12
+GP13,GPIO13
+GP14,GPIO14
+GP15,GPIO15
+GP16,GPIO16
+GP17,GPIO17
+GP18,GPIO18
+GP19,GPIO19
+GP20,GPIO20
+GP21,GPIO21
+GP22,GPIO22
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+WL_GPIO0,EXT_GPIO0
+WL_GPIO1,EXT_GPIO1
+WL_GPIO2,EXT_GPIO2
+LED,EXT_GPIO0
diff --git a/boards/pico_w_stellar/usermodules.cmake b/boards/pico_w_stellar/usermodules.cmake
@@ -0,0 +1,3 @@
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
+set(UNICORN "stellar")
+include(usermod-common)
diff --git a/boards/usermod-common.cmake b/boards/usermod-common.cmake
@@ -38,9 +38,7 @@ include(adcfft/micropython)
 
 # LEDs & Matrices
 include(plasma/micropython)
-include(galactic_unicorn/micropython)
-include(cosmic_unicorn/micropython)
-include(stellar_unicorn/micropython)
+include(${UNICORN}_unicorn/micropython)
 
 # Servos & Motors
 include(pwm/micropython)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		include("$(PORT_DIR)/boards/manifest.py")
		include("../manifest-common.py")
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    *.py
+    lib/*
+    lib/*/*