pico w onboard led

CMakeLists.txt

@@ -74,6 +74,7 @@ target_sources(gadget PUBLIC
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/fatfs)
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/st7789/src)
+target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/st7789/interface)
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mcufont/decoder)
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mcufont/fonts)
 
@@ -98,11 +99,12 @@ target_link_libraries(gadget
     hardware_spi
     pico_btstack_ble
     pico_btstack_cyw43
-    pico_cyw43_arch_none
+    pico_cyw43_arch_threadsafe_background
 )
 
 target_compile_definitions(gadget PUBLIC
     RUNNING_AS_CLIENT=1
+    CYW43_LWIP=0
 )
 
 # fix for Errata RP2040-E5 (the fix requires use of GPIO 15)

README.md

@@ -2,9 +2,7 @@
 
 For use with Raspberry Pi Pico W boards with the [Waveshare Pico LCD 1.3](https://www.waveshare.com/wiki/Pico-LCD-1.3) and the [Pimoroni Pico Lipo Shim](https://shop.pimoroni.com/products/pico-lipo-shim).
 
-Adapted from the [tinyusb-cdc-example](https://github.com/hathach/tinyusb/blob/master/examples/device/cdc_msc/src/main.c).
-
-TODO other examples used
+Adapted from the [tinyusb-cdc-example](https://github.com/hathach/tinyusb/blob/master/examples/device/cdc_msc/src/main.c), [standalone client example](https://github.com/raspberrypi/pico-examples/blob/master/pico_w/bt/standalone/client.c) and my [Trackball firmware](https://git.xythobuz.de/thomas/Trackball).
 
 ## Quick Start
 

debug.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-SERIAL=/dev/serial/by-id/usb-xythobuz_Trackball_*
+SERIAL=/dev/serial/by-id/usb-xythobuz_VolcanoRC_*
 
 echo -n Waiting for serial port to appear
 until [ -e $SERIAL ]

flash.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-SERIAL=/dev/serial/by-id/usb-xythobuz_Trackball_*
+SERIAL=/dev/serial/by-id/usb-xythobuz_VolcanoRC_*
 DISK=/dev/disk/by-label/RPI-RP2
 MOUNT=/mnt/tmp
 

src/main.c

@@ -17,6 +17,7 @@
  */
 
 #include "pico/stdlib.h"
+#include "pico/cyw43_arch.h"
 #include "hardware/watchdog.h"
 
 #include "config.h"
@@ -38,11 +39,15 @@ int main(void) {
         debug("reset by watchdog");
     }
 
+    if (cyw43_arch_init()) {
+        debug("cyw43_arch failed");
+    }
+
     debug("fat_disk_init");
     fat_disk_init();
 
-    // trigger after 500ms
-    watchdog_enable(500, 1);
+    // trigger after 1000ms
+    watchdog_enable(1000, 1);
 
     debug("init done");
 

src/util.c

@@ -21,16 +21,16 @@
 #include "pico/bootrom.h"
 #include "hardware/watchdog.h"
 
+#ifdef CYW43_WL_GPIO_LED_PIN
+#include "pico/cyw43_arch.h"
+#endif // CYW43_WL_GPIO_LED_PIN
+
 #include "config.h"
 #include "log.h"
 #include "util.h"
 
 #define HEARTBEAT_INTERVAL_MS 500
 
-#ifdef PICO_DEFAULT_LED_PIN
-static uint32_t last_heartbeat = 0;
-#endif // PICO_DEFAULT_LED_PIN
-
 void heartbeat_init(void) {
 #ifdef PICO_DEFAULT_LED_PIN
     gpio_init(PICO_DEFAULT_LED_PIN);
@@ -40,13 +40,19 @@ void heartbeat_init(void) {
 }
 
 void heartbeat_run(void) {
-#ifdef PICO_DEFAULT_LED_PIN
+#if defined(PICO_DEFAULT_LED_PIN) || defined(CYW43_WL_GPIO_LED_PIN)
+    static uint32_t last_heartbeat = 0;
     uint32_t now = to_ms_since_boot(get_absolute_time());
     if (now >= (last_heartbeat + HEARTBEAT_INTERVAL_MS)) {
         last_heartbeat = now;
+#ifdef PICO_DEFAULT_LED_PIN
         gpio_xor_mask(1 << PICO_DEFAULT_LED_PIN);
-    }
 #endif // PICO_DEFAULT_LED_PIN
+#ifdef CYW43_WL_GPIO_LED_PIN
+        cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, !cyw43_arch_gpio_get(CYW43_WL_GPIO_LED_PIN));
+#endif // CYW43_WL_GPIO_LED_PIN
+    }
+#endif // defined(PICO_DEFAULT_LED_PIN) || defined(CYW43_WL_GPIO_LED_PIN)
 }
 
 bool str_startswith(const char *str, const char *start) {