Support WiFi/BT/BLT with RP2350 CYW43 boards (earlephilhower#2616)

Using pico-sdk develop branch, add in support for CYW43-based
WiFi/BT/BLE boards on the RP2350 such as the
SparkFun Thing Plus RP2350 or the Pimoroni Pico Plus 2W.

Fixes earlephilhower#2608

Rolls in dynamic SPI divider earlephilhower#2600

* Support LED digitalWrite on RP2350+CYW

Also move "special GPIO" to 64 since the Pimoroni Pico 2W uses the
RP2350B with 48 GPIOs.

* Enable CYW43_PIN_WL_DYNAMIC in IDE and P.IO

Allows calling `cyw43_set_pins_wl(cyw43_pin_array);` to redefine the
CYW43 hookup in the variant initialization.

Author: earlephilhower

.github/workflows/build-libpico.yml

@@ -29,12 +29,6 @@ jobs:
             # add to PATH
             echo "$GITHUB_WORKSPACE/system/riscv32-unknown-elf/bin" >> "$GITHUB_PATH"
             echo "$GITHUB_WORKSPACE/system/arm-none-eabi/bin" >> "$GITHUB_PATH"
-        # Needed until we switch to Pico-SDK 2.0.1.
-        - name: Patch Pico-SDK (Fix Assembly for newer GCC)
-          run: |
-            cd pico-sdk
-            wget https://patch-diff.githubusercontent.com/raw/raspberrypi/pico-sdk/pull/2000.patch
-            patch -p1 < 2000.patch
         - name: Build libpico
           run: |
             cd tools/libpico

README.md

@@ -465,7 +465,7 @@ class RP2040 {
     }
 
     bool isPicoW() {
-#if !defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if !defined(PICO_CYW43_SUPPORTED)
         return false;
 #else
         extern bool __isPicoW;

boards.txt

@@ -17,14 +17,20 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
 
 #include <lwip/netif.h>
 extern "C" {
 #include <cyw43.h>
 #include <cyw43_stats.h>
 }
 #include <pico/cyw43_arch.h>
+#include <pico/cyw43_driver.h>
+#include <pico/lwip_nosys.h>
+#include <hardware/resets.h>
+#include <hardware/gpio.h>
+#include <hardware/adc.h>
+#include <hardware/clocks.h>
 #include <Arduino.h>
 
 // From cyw43_ctrl.c
@@ -101,4 +107,100 @@ extern "C" void __wrap_cyw43_cb_tcpip_deinit(cyw43_t *self, int itf) {
     (void) itf;
 }
 
+#ifndef WIFICC
+#define WIFICC CYW43_COUNTRY_WORLDWIDE
+#endif
+
+// Taken from https://datasheets.raspberrypi.com/picow/connecting-to-the-internet-with-pico-w.pdf
+// also discussion in https://github.com/earlephilhower/arduino-pico/issues/849
+static bool CheckPicoW() {
+#ifdef PICO_RP2040
+    adc_init();
+    auto dir = gpio_get_dir(29);
+    auto fnc = gpio_get_function(29);
+    adc_gpio_init(29);
+    adc_select_input(3);
+    auto adc29 = adc_read();
+    gpio_set_function(29, fnc);
+    gpio_set_dir(29, dir);
+
+    dir = gpio_get_dir(25);
+    fnc = gpio_get_function(25);
+    gpio_init(25);
+    gpio_set_dir(25, GPIO_IN);
+    auto gp25 = gpio_get(25);
+    gpio_set_function(25, fnc);
+    gpio_set_dir(25, dir);
+
+    if (gp25) {
+        return true; // Can't tell, so assume yes
+    } else if (adc29 < 200) {
+        return true; // PicoW
+    } else {
+        return false;
+    }
+#else
+    return true;
+#endif
+}
+
+bool __isPicoW = true;
+
+extern "C" void init_cyw43_wifi() {
+    __isPicoW = CheckPicoW();
+    if (__isPicoW) {
+        // Fix for overclocked CPU: SPI communication breaks down with default "div by 2" speed
+        // So, divide clock by 4 for anything including and above 250MHz CPU frequency.
+        if (clock_get_hz(clk_sys) >= 250000000) {
+            cyw43_set_pio_clock_divisor(4, 0); // div by 4.0
+        }
+        cyw43_arch_init_with_country(WIFICC);
+    }
+}
+
+extern "C" void __lockBluetooth() {
+    async_context_acquire_lock_blocking(cyw43_arch_async_context());
+}
+
+extern "C" void __unlockBluetooth() {
+    async_context_release_lock(cyw43_arch_async_context());
+}
+
+extern "C" void __pinMode(pin_size_t pin, PinMode mode);
+extern "C" void __digitalWrite(pin_size_t pin, PinStatus val);
+extern "C" PinStatus __digitalRead(pin_size_t pin);
+
+extern "C" void cyw43_pinMode(pin_size_t pin, PinMode mode) {
+    if (!__isPicoW && (pin == PIN_LED)) {
+        pin = 25;  // Silently swap in the Pico's LED
+    }
+    if (pin < 64) {
+        __pinMode(pin, mode);
+    } else {
+        // TBD - There is no GPIO direction control in the driver
+    }
+}
+
+extern "C" void cyw43_digitalWrite(pin_size_t pin, PinStatus val) {
+    if (!__isPicoW && (pin == PIN_LED)) {
+        pin = 25;  // Silently swap in the Pico's LED
+    }
+    if (pin < 64) {
+        __digitalWrite(pin, val);
+    } else {
+        cyw43_arch_gpio_put(pin - 64, val == HIGH ? 1 : 0);
+    }
+}
+
+extern "C" PinStatus cyw43_digitalRead(pin_size_t pin) {
+    if (!__isPicoW && (pin == PIN_LED)) {
+        pin = 25;  // Silently swap in the Pico's LED
+    }
+    if (pin < 64) {
+        return __digitalRead(pin);
+    } else {
+        return cyw43_arch_gpio_get(pin - 64) ? HIGH : LOW;
+    }
+}
+
 #endif

cores/rp2040/RP2040Support.h

@@ -0,0 +1,33 @@
+/*
+    CYW43 TCP/Ethernet wrappers
+    Copyright (c) 2023 Earle F. Philhower, III <[email protected]>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#pragma once
+
+#include <Arduino.h>
+#include <pico/cyw43_driver.h>
+
+extern bool __isPicoW;
+extern "C" {
+    void init_cyw43_wifi();
+    void __lockBluetooth();
+    void __unlockBluetooth();
+    void cyw43_pinMode(pin_size_t pin, PinMode mode);
+    void cyw43_digitalWrite(pin_size_t pin, PinStatus val);
+    PinStatus cyw43_digitalRead(pin_size_t pin);
+}

cores/rp2040/cyw43_wrappers.cpp

@@ -26,9 +26,7 @@
 #include <lwip/dns.h>
 #include <lwip/raw.h>
 #include <lwip/timeouts.h>
-#ifdef PICO_RP2040
 #include <pico/cyw43_arch.h>
-#endif
 #include <pico/mutex.h>
 #include <sys/lock.h>
 #include "_xoshiro.h"
@@ -46,7 +44,7 @@ class LWIPMutex {
         if (ethernet_arch_lwip_gpio_mask)  {
             ethernet_arch_lwip_gpio_mask();
         }
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
         if (rp2040.isPicoW()) {
             cyw43_arch_lwip_begin();
             return;
@@ -60,7 +58,7 @@ class LWIPMutex {
     }
 
     ~LWIPMutex() {
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
         if (rp2040.isPicoW()) {
             cyw43_arch_lwip_end();
         } else {
@@ -70,7 +68,7 @@ class LWIPMutex {
             } else {
                 recursive_mutex_exit(&__lwipMutex);
             }
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
         }
 #endif
         if (ethernet_arch_lwip_gpio_unmask) {

cores/rp2040/cyw43_wrappers.h

@@ -29,7 +29,6 @@ extern unsigned long __lwip_rand(void);
 #define MEM_SIZE                      (__LWIP_MEMMULT * 16384)
 #define MEMP_NUM_TCP_SEG              (32)
 #define MEMP_NUM_ARP_QUEUE            (10)
-//#define MEMP_NUM_SYS_TIMEOUT          (LWIP_NUM_SYS_TIMEOUT_INTERNAL + 4)
 #define PBUF_POOL_SIZE                (__LWIP_MEMMULT > 1 ? 32 : 24)
 #define LWIP_ARP                      5
 #define LWIP_ETHERNET                 1

cores/rp2040/lwip_wrap.cpp

@@ -13,7 +13,7 @@
 
 #define PICO_SDK_VERSION_MAJOR    2
 #define PICO_SDK_VERSION_MINOR    0
-#define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "2.0.0"
+#define PICO_SDK_VERSION_REVISION 1
+#define PICO_SDK_VERSION_STRING   "2.0.1-develop"
 
 #endif

include/lwipopts.h

@@ -13,7 +13,7 @@
 
 #define PICO_SDK_VERSION_MAJOR    2
 #define PICO_SDK_VERSION_MINOR    0
-#define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "2.0.0"
+#define PICO_SDK_VERSION_REVISION 1
+#define PICO_SDK_VERSION_STRING   "2.0.1-develop"
 
 #endif