Add status LED support

will-v-pi · will-v-pi · commit bc3559be11cb · 2025-08-15T16:51:19.000+01:00
Also I2C, SPI, and cyw43
diff --git a/src/boards/include/boards/rp2040_configurable.h b/src/boards/include/boards/rp2040_configurable.h
@@ -15,9 +15,10 @@
 #define _BOARDS_RP2040_CONFIGURABLE_H
 
 pico_board_cmake_set(PICO_PLATFORM, rp2040)
+pico_board_cmake_set(PICO_CYW43_SUPPORTED, 1)
 
 // For board detection
-#define RASPBERRYPI_RP2040
+#define RASPBERRYPI_RP2040_CONFIGURABLE
 
 // For post-compile configuration
 pico_board_cmake_set(PICO_SUPPORT_CONFIGURABLE_PINS, 1)
diff --git a/src/boards/include/boards/rp2350_configurable.h b/src/boards/include/boards/rp2350_configurable.h
@@ -15,9 +15,10 @@
 #define _BOARDS_RP2350_CONFIGURABLE_H
 
 pico_board_cmake_set(PICO_PLATFORM, rp2350)
+pico_board_cmake_set(PICO_CYW43_SUPPORTED, 1)
 
 // For board detection
-#define RASPBERRYPI_RP2350
+#define RASPBERRYPI_RP2350_CONFIGURABLE
 
 // For post-compile configuration
 pico_board_cmake_set(PICO_SUPPORT_CONFIGURABLE_PINS, 1)
diff --git a/src/common/pico_configurable_pins/configurable_pins.c b/src/common/pico_configurable_pins/configurable_pins.c
@@ -18,6 +18,9 @@ bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CO
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_uart_tx_pin, 0));
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_uart_rx_pin, 1));
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_led_pin, 25));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_led_pin_inverted, 0));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_ws2812_pin, -1));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_ws2812_power_pin, -1));
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_i2c, 0));
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_i2c_sda_pin, 4));
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_default_i2c_scl_pin, 5));
@@ -30,4 +33,15 @@ bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CO
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_vbus_pin, 24));
 bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_vsys_pin, 29));
 
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_cyw43_wl_reg_on_pin, 23));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_cyw43_wl_data_out_pin, 24));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_cyw43_wl_data_in_pin, 24));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_cyw43_wl_host_wake_pin, 24));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_cyw43_wl_clock_pin, 29));
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_cyw43_wl_cs_pin, 25));
+
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_cyw43_wl_gpio_led_pin, -1));
+
+bi_decl(bi_ptr_global_int32(BINARY_INFO_TAG_CONFIGURABLE_PINS, BINARY_INFO_ID_CONFIGURABLE_PINS, pico_colored_status_led_uses_wrgb, 0));
+
 #endif
diff --git a/src/common/pico_configurable_pins/include/pico/configurable_pins.h b/src/common/pico_configurable_pins/include/pico/configurable_pins.h
@@ -19,6 +19,12 @@ extern const int pico_default_uart_tx_pin;
 extern const int pico_default_uart_rx_pin;
 #define PICO_DEFAULT_LED_PIN pico_default_led_pin
 extern const int pico_default_led_pin;
+#define PICO_DEFAULT_LED_PIN_INVERTED pico_default_led_pin_inverted
+extern const int pico_default_led_pin_inverted;
+#define PICO_DEFAULT_WS2812_PIN pico_default_ws2812_pin
+extern const int pico_default_ws2812_pin;
+#define PICO_DEFAULT_WS2812_POWER_PIN pico_default_ws2812_power_pin
+extern const int pico_default_ws2812_power_pin;
 #define PICO_DEFAULT_I2C pico_default_i2c
 extern const int pico_default_i2c;
 #define PICO_DEFAULT_I2C_SDA_PIN pico_default_i2c_sda_pin
@@ -42,6 +48,25 @@ extern const int pico_vbus_pin;
 #define PICO_VSYS_PIN pico_vsys_pin
 extern const int pico_vsys_pin;
 
+#define CYW43_DEFAULT_PIN_WL_REG_ON pico_cyw43_wl_reg_on_pin
+extern const int pico_cyw43_wl_reg_on_pin;
+#define CYW43_DEFAULT_PIN_WL_DATA_OUT pico_cyw43_wl_data_out_pin
+extern const int pico_cyw43_wl_data_out_pin;
+#define CYW43_DEFAULT_PIN_WL_DATA_IN pico_cyw43_wl_data_in_pin
+extern const int pico_cyw43_wl_data_in_pin;
+#define CYW43_DEFAULT_PIN_WL_HOST_WAKE pico_cyw43_wl_host_wake_pin
+extern const int pico_cyw43_wl_host_wake_pin;
+#define CYW43_DEFAULT_PIN_WL_CLOCK pico_cyw43_wl_clock_pin
+extern const int pico_cyw43_wl_clock_pin;
+#define CYW43_DEFAULT_PIN_WL_CS pico_cyw43_wl_cs_pin
+extern const int pico_cyw43_wl_cs_pin;
+
+#define CYW43_WL_GPIO_LED_PIN pico_cyw43_wl_gpio_led_pin
+extern const int pico_cyw43_wl_gpio_led_pin;
+
+#define PICO_COLORED_STATUS_LED_USES_WRGB pico_colored_status_led_uses_wrgb
+extern const int pico_colored_status_led_uses_wrgb;
+
 #endif
 
 #endif
diff --git a/src/rp2_common/hardware_i2c/BUILD.bazel b/src/rp2_common/hardware_i2c/BUILD.bazel
@@ -10,6 +10,7 @@ cc_library(
     target_compatible_with = compatible_with_rp2(),
     deps = [
         "//src/common/pico_time",
+        "//src/common/pico_configurable_pins",
         "//src/rp2_common:hardware_regs",
         "//src/rp2_common:hardware_structs",
         "//src/rp2_common:pico_platform",
diff --git a/src/rp2_common/hardware_i2c/CMakeLists.txt b/src/rp2_common/hardware_i2c/CMakeLists.txt
@@ -1,2 +1,2 @@
 pico_simple_hardware_target(i2c)
-pico_mirrored_target_link_libraries(hardware_i2c INTERFACE pico_time hardware_resets hardware_clocks)
+pico_mirrored_target_link_libraries(hardware_i2c INTERFACE pico_time hardware_resets hardware_clocks pico_configurable_pins)
diff --git a/src/rp2_common/hardware_i2c/i2c.c b/src/rp2_common/hardware_i2c/i2c.c
@@ -356,3 +356,16 @@ int i2c_read_burst_blocking(i2c_inst_t *i2c, uint8_t addr, uint8_t *dst, size_t
     i2c->restart_on_next = false;
     return rc;
 }
+
+#if PICO_SUPPORT_CONFIGURABLE_PINS
+#include "pico/configurable_pins.h"
+i2c_inst_t *pico_get_default_i2c_instance(void) {
+    if (pico_default_i2c == 0) {
+        return i2c0;
+    } else if (pico_default_i2c == 1) {
+        return i2c1;
+    } else {
+        panic("Invalid I2C instance %d", pico_default_i2c);
+    }
+}
+#endif
diff --git a/src/rp2_common/hardware_i2c/include/hardware/i2c.h b/src/rp2_common/hardware_i2c/include/hardware/i2c.h
@@ -71,9 +71,15 @@ extern i2c_inst_t i2c1_inst;
 #define i2c0 (&i2c0_inst) ///< Identifier for I2C HW Block 0
 #define i2c1 (&i2c1_inst) ///< Identifier for I2C HW Block 1
 
-#if !defined(PICO_DEFAULT_I2C_INSTANCE) && defined(PICO_DEFAULT_I2C)
+#if !defined(PICO_DEFAULT_I2C_INSTANCE)
+#if PICO_SUPPORT_CONFIGURABLE_PINS
+#include "pico/configurable_pins.h"
+i2c_inst_t *pico_get_default_i2c_instance(void);
+#define PICO_DEFAULT_I2C_INSTANCE() pico_get_default_i2c_instance()
+#elif defined(PICO_DEFAULT_I2C)
 #define PICO_DEFAULT_I2C_INSTANCE() (__CONCAT(i2c,PICO_DEFAULT_I2C))
 #endif
+#endif
 
 /**
  * \def PICO_DEFAULT_I2C
diff --git a/src/rp2_common/hardware_spi/BUILD.bazel b/src/rp2_common/hardware_spi/BUILD.bazel
@@ -9,6 +9,7 @@ cc_library(
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
     deps = [
+        "//src/common/pico_configurable_pins",
         "//src/rp2_common:hardware_regs",
         "//src/rp2_common:hardware_structs",
         "//src/rp2_common:pico_platform",
diff --git a/src/rp2_common/hardware_spi/CMakeLists.txt b/src/rp2_common/hardware_spi/CMakeLists.txt
@@ -1,3 +1,3 @@
 pico_simple_hardware_target(spi)
 
-pico_mirrored_target_link_libraries(hardware_spi INTERFACE hardware_resets hardware_clocks)
+pico_mirrored_target_link_libraries(hardware_spi INTERFACE hardware_resets hardware_clocks pico_configurable_pins)
diff --git a/src/rp2_common/hardware_spi/include/hardware/spi.h b/src/rp2_common/hardware_spi/include/hardware/spi.h
@@ -72,9 +72,15 @@ typedef struct spi_inst spi_inst_t;
  * \hideinitializer
  * \brief Returns the default SPI instance
  */
-#if !defined(PICO_DEFAULT_SPI_INSTANCE) && defined(PICO_DEFAULT_SPI)
+#if !defined(PICO_DEFAULT_SPI_INSTANCE)
+#if PICO_SUPPORT_CONFIGURABLE_PINS
+#include "pico/configurable_pins.h"
+spi_inst_t *pico_get_default_spi_instance(void);
+#define PICO_DEFAULT_SPI_INSTANCE() pico_get_default_spi_instance()
+#elif defined(PICO_DEFAULT_SPI)
 #define PICO_DEFAULT_SPI_INSTANCE() (__CONCAT(spi,PICO_DEFAULT_SPI))
 #endif
+#endif
 
 /**
  * \def PICO_DEFAULT_SPI
diff --git a/src/rp2_common/hardware_spi/spi.c b/src/rp2_common/hardware_spi/spi.c
@@ -218,3 +218,14 @@ int __not_in_flash_func(spi_read16_blocking)(spi_inst_t *spi, uint16_t repeated_
 
     return (int)len;
 }
+
+#if PICO_SUPPORT_CONFIGURABLE_PINS
+#include "pico/configurable_pins.h"
+spi_inst_t *pico_get_default_spi_instance(void) {
+    if (pico_default_spi == 0) {
+        return spi0;
+    } else if (pico_default_spi == 1) {
+        return spi1;
+    }
+}
+#endif
diff --git a/src/rp2_common/hardware_uart/BUILD.bazel b/src/rp2_common/hardware_uart/BUILD.bazel
@@ -17,6 +17,7 @@ cc_library(
     target_compatible_with = compatible_with_rp2(),
     deps = [
         ":PICO_DEFAULT_UART_BAUD_RATE",
+        "//src/common/pico_configurable_pins",
         "//src/rp2_common:hardware_regs",
         "//src/rp2_common:hardware_structs",
         "//src/rp2_common:pico_platform",
diff --git a/src/rp2_common/pico_cyw43_driver/BUILD.bazel b/src/rp2_common/pico_cyw43_driver/BUILD.bazel
@@ -28,6 +28,7 @@ cc_library(
         ":cyw43_bus_pio",
         ":cyw43_configport",
         ":pico_btstack_cyw43",
+        "//src/common/pico_configurable_pins",
         "//src/rp2_common:pico_platform",
         "//src/rp2_common/hardware_clocks",
         "//src/rp2_common/hardware_dma",
diff --git a/src/rp2_common/pico_cyw43_driver/CMakeLists.txt b/src/rp2_common/pico_cyw43_driver/CMakeLists.txt
@@ -41,7 +41,7 @@ if (EXISTS ${PICO_CYW43_DRIVER_PATH}/${CYW43_DRIVER_TEST_FILE})
     target_sources(pico_cyw43_driver INTERFACE
             cyw43_driver.c)
     target_include_directories(pico_cyw43_driver_headers SYSTEM INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
-    pico_mirrored_target_link_libraries(pico_cyw43_driver INTERFACE cyw43_driver pico_unique_id)
+    pico_mirrored_target_link_libraries(pico_cyw43_driver INTERFACE cyw43_driver pico_unique_id pico_configurable_pins)
 
     # cyw43_driver_picow is cyw43_driver plus Pico W specific bus implementation
     pico_add_library(cyw43_driver_picow NOFLAG)
diff --git a/src/rp2_common/pico_cyw43_driver/include/cyw43_configport.h b/src/rp2_common/pico_cyw43_driver/include/cyw43_configport.h
@@ -12,6 +12,7 @@
 #include "pico.h"
 #include "hardware/gpio.h"
 #include "pico/time.h"
+#include "pico/configurable_pins.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/rp2_common/pico_status_led/BUILD.bazel b/src/rp2_common/pico_status_led/BUILD.bazel
@@ -9,6 +9,7 @@ cc_library(
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
     deps = [
+        "//src/common/pico_configurable_pins",
         "//src/rp2_common/hardware_gpio",
         "//src/rp2_common/hardware_pio",
     ] + select({
diff --git a/src/rp2_common/pico_status_led/CMakeLists.txt b/src/rp2_common/pico_status_led/CMakeLists.txt
@@ -8,6 +8,7 @@ target_include_directories(pico_status_led_headers SYSTEM INTERFACE
 pico_mirrored_target_link_libraries(pico_status_led INTERFACE
     hardware_gpio
     hardware_pio
+    pico_configurable_pins
 )
 if (PICO_CYW43_SUPPORTED)
     pico_mirrored_target_link_libraries(pico_status_led INTERFACE
diff --git a/src/rp2_common/pico_status_led/include/pico/status_led.h b/src/rp2_common/pico_status_led/include/pico/status_led.h
@@ -18,6 +18,7 @@
 #define _PICO_STATUS_LED_H
 
 #include "hardware/gpio.h"
+#include "pico/configurable_pins.h"
 
 #if defined(CYW43_WL_GPIO_LED_PIN)
 #include "cyw43.h"
@@ -29,6 +30,11 @@ struct async_context;
 extern "C" {
 #endif
 
+#if PICO_SUPPORT_CONFIGURABLE_PINS
+#define PICO_STATUS_LED_AVAILABLE (PICO_DEFAULT_LED_PIN >= 0 || CYW43_WL_GPIO_LED_PIN >= 0)
+#define PICO_COLORED_STATUS_LED_AVAILABLE (PICO_DEFAULT_WS2812_PIN >= 0)
+#endif
+
 // PICO_CONFIG: PICO_STATUS_LED_AVAILABLE, Indicate whether a single-color status LED is available, type=bool, default=1 if PICO_DEFAULT_LED_PIN or CYW43_WL_GPIO_LED_PIN is defined; may be set by the user to 0 to not use either even if they are available, group=pico_status_led
 #ifndef PICO_STATUS_LED_AVAILABLE
 #if defined(PICO_DEFAULT_LED_PIN) || defined(CYW43_WL_GPIO_LED_PIN)
@@ -197,16 +203,21 @@ static inline bool status_led_set_state(bool led_on) {
     if (status_led_via_colored_status_led()) {
         return colored_status_led_set_state(led_on);
     } else if (status_led_supported()) {
-#if defined(PICO_DEFAULT_LED_PIN)
-    #if PICO_DEFAULT_LED_PIN_INVERTED
-        gpio_put(PICO_DEFAULT_LED_PIN, !led_on);
-    #else
-        gpio_put(PICO_DEFAULT_LED_PIN, led_on);
-    #endif
+#ifdef PICO_DEFAULT_LED_PIN
+    if (PICO_DEFAULT_LED_PIN >= 0) {
+        if (PICO_DEFAULT_LED_PIN_INVERTED) {
+            gpio_put(PICO_DEFAULT_LED_PIN, !led_on);
+        } else {
+            gpio_put(PICO_DEFAULT_LED_PIN, led_on);
+        }
         return true;
-#elif defined(CYW43_WL_GPIO_LED_PIN)
+    }
+#endif
+#ifdef CYW43_WL_GPIO_LED_PIN
+    if (CYW43_WL_GPIO_LED_PIN >= 0) {
         cyw43_gpio_set(&cyw43_state, CYW43_WL_GPIO_LED_PIN, led_on);
         return true;
+    }
 #endif
     }
     return false;
@@ -223,16 +234,21 @@ static inline bool status_led_get_state() {
     if (status_led_via_colored_status_led()) {
         return colored_status_led_get_state();
     } else if (status_led_supported()) {
-#if defined(PICO_DEFAULT_LED_PIN)
-    #if PICO_DEFAULT_LED_PIN_INVERTED
-        return !gpio_get(PICO_DEFAULT_LED_PIN);
-    #else
-        return gpio_get(PICO_DEFAULT_LED_PIN);
-    #endif
-#elif defined CYW43_WL_GPIO_LED_PIN
+#ifdef PICO_DEFAULT_LED_PIN
+    if (PICO_DEFAULT_LED_PIN >= 0) {
+        if (PICO_DEFAULT_LED_PIN_INVERTED) {
+            return !gpio_get(PICO_DEFAULT_LED_PIN);
+        } else {
+            return gpio_get(PICO_DEFAULT_LED_PIN);
+        }
+    }
+#endif
+#ifdef CYW43_WL_GPIO_LED_PIN
+    if (CYW43_WL_GPIO_LED_PIN >= 0) {
         bool value = false;
         cyw43_gpio_get(&cyw43_state, CYW43_WL_GPIO_LED_PIN, &value);
         return value;
+    }
 #endif
     }
     return false;
diff --git a/src/rp2_common/pico_status_led/status_led.c b/src/rp2_common/pico_status_led/status_led.c

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`pico_simple_hardware_target(i2c)`
`2`		`-pico_mirrored_target_link_libraries(hardware_i2c INTERFACE pico_time hardware_resets hardware_clocks)`
	`2`	`+pico_mirrored_target_link_libraries(hardware_i2c INTERFACE pico_time hardware_resets hardware_clocks pico_configurable_pins)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`pico_simple_hardware_target(spi)`
`2`	`2`
`3`		`-pico_mirrored_target_link_libraries(hardware_spi INTERFACE hardware_resets hardware_clocks)`
	`3`	`+pico_mirrored_target_link_libraries(hardware_spi INTERFACE hardware_resets hardware_clocks pico_configurable_pins)`