Time to Explore!

pimoroni · Aug 14, 2024 · e109d7b · e109d7b
1 parent ff987d3
commit e109d7b
Show file tree

Hide file tree

Showing 21 changed files with 63 additions and 286 deletions.
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -9,7 +9,7 @@ on:
 env:
   MICROPYTHON_VERSION: feature/psram
   MICROPYTHON_FLAVOUR: pimoroni
-  PIMORONI_PICO_VERSION: feature/sdk-2.0.0
+  PIMORONI_PICO_VERSION: ci/micropython-edge
 
 jobs:
   build:
@@ -19,16 +19,10 @@ jobs:
     strategy:
       matrix:
         include:
-        - name: pga2040
-          board: pga2040
+        - name: explorer
+          board: explorer
           modules: default
-        - name: pga2350
-          board: pga2350
-          modules: default
-        - name: pga2350-psram  # Friendly-name for output files
-          board: pga2350       # /<board>
-          variant: PSRAM       # /<board>/mpconfigvariant_<variant>.cmake
-          modules: default     # /modules/<modules>.cmake
+          variant: 
 
     env:
       # MicroPython version will be contained in github.event.release.tag_name for releases

diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml
@@ -0,0 +1,25 @@
+name: Python Linting
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    name: Python Linting
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install Python Deps
+      run: python3 -m pip install flake8
+
+    - name: Lint Frozen Modules
+      shell: bash
+      run: |
+        python3 -m flake8 --show-source --ignore E501 modules/py_frozen
+
+    - name: Lint Filesystem
+      shell: bash
+      run: |
+        python3 -m flake8 --show-source --ignore E501 modules/py_littlefs
diff --git a/pga2350/pga2350.h → explorer/explorer.h b/pga2350/pga2350.h → explorer/explorer.h
diff --git a/pga2040/manifest.py → explorer/manifest.py b/pga2040/manifest.py → explorer/manifest.py
diff --git a/pga2350/mpconfigboard.cmake → explorer/mpconfigboard.cmake b/pga2350/mpconfigboard.cmake → explorer/mpconfigboard.cmake
@@ -1,5 +1,5 @@
 # cmake file for the Pimoroni PGA2350
-set(PICO_BOARD "pga2350")
+set(PICO_BOARD "explorer")
 set(PICO_PLATFORM "rp2350-arm-s")
 set(PICO_NUM_GPIOS 48)
 

diff --git a/pga2350/mpconfigboard.h → explorer/mpconfigboard.h b/pga2350/mpconfigboard.h → explorer/mpconfigboard.h
@@ -3,12 +3,9 @@
 // Board and hardware specific configuration
 #ifndef MICROPY_HW_BOARD_NAME
 // Might be defined by mpconfigvariant_VARIANT.cmake
-#define MICROPY_HW_BOARD_NAME                   "PGA2350"
+#define MICROPY_HW_BOARD_NAME                   "Pimoroni Explorer"
 #endif
 
 // Portion of onboard flash to reserve for the user filesystem
 // PGA2350 has 16MB flash, so reserve 2MiB for the firmware and leave 14MiB
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (14 * 1024 * 1024)
-
-// Alias the chip select pin specified by pga2350.h
-#define MICROPY_HW_PSRAM_CS_PIN                 PIMORONI_PGA2350_PSRAM_CS_PIN
diff --git a/pga2350/pins.csv → explorer/pins.csv b/pga2350/pins.csv → explorer/pins.csv
diff --git a/modules/c/example/example.c b/modules/c/example/example.c
diff --git a/modules/c/example/example.cpp b/modules/c/example/example.cpp
diff --git a/modules/c/example/example.h b/modules/c/example/example.h
diff --git a/modules/c/example/micropython.cmake b/modules/c/example/micropython.cmake
diff --git a/modules/default.cmake b/modules/default.cmake
@@ -14,13 +14,38 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 
-include(c/example/micropython)
+# Essential
+include(pimoroni_i2c/micropython)
+include(pimoroni_bus/micropython)
 
-# include(micropython-common)
-# enable_ulab()
+# Pico Graphics Essential
+include(hershey_fonts/micropython)
+include(bitmap_fonts/micropython)
+include(picographics/micropython)
+
+# Pico Graphics Extra
+include(pngdec/micropython)
+include(jpegdec/micropython)
+include(picovector/micropython)
+include(qrcode/micropython/micropython)
+
+# Sensors & Breakouts
+include(micropython-common-breakouts)
+
+# Utility
+include(adcfft/micropython)
+
+# LEDs & Matrices
+include(plasma/micropython)
+
+# ULAB
+include(micropython-common-ulab)
+enable_ulab()
+
+include(modules_py/modules_py)
 
 # C++ Magic Memory
-# include(cppmem/micropython)
+include(cppmem/micropython)
 
 # Disable build-busting C++ exceptions
 include(micropython-disable-exceptions)
diff --git a/modules/py_frozen/boot.py b/modules/py_frozen/boot.py
@@ -0,0 +1,3 @@
+import cppmem
+# Switch C++ memory allocations to use MicroPython's heap
+cppmem.set_mode(cppmem.MICROPYTHON)
diff --git a/modules/py_frozen/frozen_example.py b/modules/py_frozen/frozen_example.py
diff --git a/pga2040/mpconfigboard.cmake b/pga2040/mpconfigboard.cmake
diff --git a/pga2040/mpconfigboard.h b/pga2040/mpconfigboard.h
diff --git a/pga2040/pga2040.h b/pga2040/pga2040.h
diff --git a/pga2040/pins.csv b/pga2040/pins.csv