Setup Yukon to use dynamic wireless pins

Author: ZodiusInfuser

examples/modules/rm2_wireless/cheerlights.py

@@ -1,5 +1,4 @@
 import time
-import network
 import requests
 from pimoroni_yukon import Yukon
 from pimoroni_yukon import SLOT2 as STRIP_SLOT
@@ -51,7 +50,7 @@
     yukon.register_with_slot(wireless, RM2_SLOT)    # Register the RM2WirelessModule object with the slot
     yukon.verify_and_initialise()                   # Verify that the modules are attached to Yukon, and initialise them
 
-    wlan = network.WLAN(network.STA_IF)             # Create a new network object for interacting with WiFi
+    wlan = wireless.WLAN(wireless.STA_IF)           # Create a new network object for interacting with WiFi
     wlan.active(True)                               # Turn on WLAN communications
 
     # Connect to WLAN
@@ -98,9 +97,3 @@
 finally:
     # Put the board back into a safe state, regardless of how the program may have ended
     yukon.reset()
-
-    # Attempt to disconnect from WiFi
-    try:
-        wlan.disconnect()
-    except Exception:
-        pass

examples/modules/rm2_wireless/wifi_scan.py

@@ -1,5 +1,4 @@
 import time
-import network
 import binascii
 from pimoroni_yukon import Yukon
 from pimoroni_yukon import SLOT5 as SLOT
@@ -17,16 +16,16 @@
 
 # Variables
 yukon = Yukon()                 # Create a new Yukon object, with a lower voltage limit set
-module = RM2WirelessModule()    # Create a RM2WirelessModule object
+wireless = RM2WirelessModule()  # Create a RM2WirelessModule object
 
 
 # Wrap the code in a try block, to catch any exceptions (including KeyboardInterrupt)
 try:
-    yukon.register_with_slot(module, SLOT)  # Register the RM2WirelessModule object with the slot
-    yukon.verify_and_initialise()           # Verify that a RM2WirelessModule is attached to Yukon, and initialise it
+    yukon.register_with_slot(wireless, SLOT)    # Register the RM2WirelessModule object with the slot
+    yukon.verify_and_initialise()               # Verify that a RM2WirelessModule is attached to Yukon, and initialise it
 
-    wlan = network.WLAN(network.STA_IF)     # Create a new network object for interacting with WiFi
-    wlan.active(True)                       # Turn on WLAN communications
+    wlan = wireless.WLAN(wireless.STA_IF)       # Create a new network object for interacting with WiFi
+    wlan.active(True)                           # Turn on WLAN communications
 
     while not yukon.is_boot_pressed():
         # Scan for nearby networks and print them out
@@ -41,9 +40,3 @@
 finally:
     # Put the board back into a safe state, regardless of how the program may have ended
     yukon.reset()
-
-    # Attempt to disconnect from WiFi
-    try:
-        wlan.disconnect()
-    except Exception:
-        pass

firmware/PIMORONI_YUKON_W/board.c

@@ -16,17 +16,7 @@ void board_init() {
 }
 
 void board_reset(void) {
-    for (int i = 0; i < 16; ++i) {
-        gpio_init(i);
-        hw_clear_bits(&pads_bank0_hw->io[i], PADS_BANK0_GPIO0_IE_BITS |
-            PADS_BANK0_GPIO0_PUE_BITS |
-            PADS_BANK0_GPIO0_PDE_BITS);
-        hw_set_bits(&pads_bank0_hw->io[i], PADS_BANK0_GPIO0_OD_BITS);
-    }
-
-    // Skip over SLOT 5
-
-    for (int i = 20; i < 24; ++i) {
+    for (int i = 0; i < 24; ++i) {
         gpio_init(i);
         hw_clear_bits(&pads_bank0_hw->io[i], PADS_BANK0_GPIO0_IE_BITS |
             PADS_BANK0_GPIO0_PUE_BITS |

firmware/PIMORONI_YUKON_W/pimoroni_yukon_w.h

@@ -77,9 +77,9 @@
 #endif
 
 // --- WIRELESS ---
-// cyw43 SPI pins can't be changed at runtime
+// cyw43 SPI pins can be changed at runtime
 #ifndef CYW43_PIN_WL_DYNAMIC
-#define CYW43_PIN_WL_DYNAMIC 0
+#define CYW43_PIN_WL_DYNAMIC 1
 #endif
 
 // gpio pin to power up the cyw43 chip

lib/pimoroni_yukon/modules/rm2_wireless.py

@@ -8,6 +8,9 @@
 class RM2WirelessModule(YukonModule):
     NAME = "RM2 Wireless"
 
+    STA_IF = 0
+    AP_IF = 1
+
     # | ADC1  | ADC2  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
     # |-------|-------|-------|-------|-------|----------------------|-----------------------------|
     # | LOW   | FLOAT | 1     | 0     | 1     | RM2 Wireless         |                             |
@@ -23,9 +26,30 @@ def __init__(self):
         except ImportError:
             raise RuntimeError("This build does not contain wireless networking support. Please flash your Yukon with a build that supports wireless in order to use this module.")
 
+        self.__network = network
+
     def initialise(self, slot, adc1_func, adc2_func):
-        if slot.ID != 5:
-            raise RuntimeError("Currently the wireless module is only supported in Slot 5. Please relocate your module.")
+        self.__wl_on = slot.FAST1
+        self.__wl_cs = slot.FAST2
+        self.__wl_sck = slot.FAST3
+        self.__wl_dat = slot.FAST4
 
         # Pass the slot and adc functions up to the parent now that module specific initialisation has finished
         super().initialise(slot, adc1_func, adc2_func)
+
+    def reset(self):
+        # Attempt to disconnect from WiFi
+        try:
+            self.__wlan.disconnect()
+        except Exception:
+            pass
+
+    def WLAN(self, interface_id):
+        self.__wlan = self.__network.WLAN(interface_id,
+                                          pin_on=self.__wl_on,
+                                          pin_out=self.__wl_dat,
+                                          pin_in=self.__wl_dat,
+                                          pin_wake=self.__wl_dat,
+                                          pin_clock=self.__wl_sck,
+                                          pin_cs=self.__wl_cs)
+        return self.__wlan