From b83bdbf198e2c5629d77d2e3c79e5c6370d6e6d5 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@pimoroni.com>
Date: Thu, 16 Mar 2023 13:33:17 +0000
Subject: [PATCH] MicroPython: Pico W parity with Pico build.

---
 micropython/modules/micropython-common.cmake | 33 ++++++++++++-----
 micropython/modules/micropython-picow.cmake  | 39 +-------------------
 2 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/micropython/modules/micropython-common.cmake b/micropython/modules/micropython-common.cmake
index c33d36d22..04fac22fc 100644
--- a/micropython/modules/micropython-common.cmake
+++ b/micropython/modules/micropython-common.cmake
@@ -1,31 +1,43 @@
+# Essential
 include(pimoroni_i2c/micropython)
 include(pimoroni_bus/micropython)
 
+# Pico Graphics Essential
+include(hershey_fonts/micropython)
+include(bitmap_fonts/micropython)
+include(picographics/micropython)
+
+# Pico Graphics Extra
+include(jpegdec/micropython)
+include(qrcode/micropython/micropython)
+
+# Sensors & Breakouts
 include(micropython-common-breakouts)
 
+# Packs & Bases
+include(pico_unicorn/micropython)
 include(pico_scroll/micropython)
 include(pico_rgb_keypad/micropython)
-include(pico_unicorn/micropython)
 include(pico_wireless/micropython)
 include(pico_explorer/micropython)
 
-include(hershey_fonts/micropython)
-include(bitmap_fonts/micropython)
-
+# LEDs & Matrices
 include(plasma/micropython)
 include(hub75/micropython)
+
+# Servos & Motors
 include(pwm/micropython)
 include(servo/micropython)
 include(encoder/micropython)
 include(motor/micropython)
-include(qrcode/micropython/micropython)
-include(adcfft/micropython)
-include(pcf85063a/micropython)
 
-include(picographics/micropython)
-include(jpegdec/micropython)
-include(galactic_unicorn/micropython)
+# Utility
+include(adcfft/micropython)
 
+# RTC (Badger 2040W, Enviro)
+if(PICO_BOARD STREQUAL "pico_w")
+    include(pcf85063a/micropython)
+endif()
 
 include(modules_py/modules_py)
 
@@ -37,4 +49,5 @@ if(PICO_BOARD STREQUAL "pico_w")
     copy_module(inventor.py)
 endif()
 
+# Must call `enable_ulab()` to enable
 include(micropython-common-ulab)
\ No newline at end of file
diff --git a/micropython/modules/micropython-picow.cmake b/micropython/modules/micropython-picow.cmake
index 0e5621a42..4f7e72800 100644
--- a/micropython/modules/micropython-picow.cmake
+++ b/micropython/modules/micropython-picow.cmake
@@ -7,41 +7,4 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../")
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 
-# Essential
-include(pimoroni_i2c/micropython)
-include(pimoroni_bus/micropython)
-
-# Pico Graphics Essential
-include(hershey_fonts/micropython)
-include(bitmap_fonts/micropython)
-include(picographics/micropython)
-
-# Pico Graphics Extra
-include(jpegdec/micropython)
-include(qrcode/micropython/micropython)
-
-# Sensors & Breakouts
-include(micropython-common-breakouts)
-include(pcf85063a/micropython)
-
-# Utility
-include(adcfft/micropython)
-
-# LEDs & Matrices
-include(plasma/micropython)
-include(hub75/micropython)
-
-# Packs
-include(pico_unicorn/micropython)
-include(pico_scroll/micropython)
-include(pico_rgb_keypad/micropython)
-
-# Servos & Motors
-include(pwm/micropython)
-include(servo/micropython)
-include(encoder/micropython)
-include(motor/micropython)
-
-# include(micropython-common)
-
-include(modules_py/modules_py)
\ No newline at end of file
+include(micropython-common)