Merge pull request #3913 from U007D/rpi-pico-2-w

Add blinky example for RPi Pico 2W board

57 files changed, 90 insertions, 1 deletions

diff --git a/examples/rp23/.cargo/config.toml b/examples/rp235x/.cargo/config.toml
index 40f245785..40f245785 100644
--- a/examples/rp23/.cargo/config.toml
+++ b/examples/rp235x/.cargo/config.toml
diff --git a/examples/rp23/Cargo.toml b/examples/rp235x/Cargo.toml
index f4dfae773..f4dfae773 100644
--- a/examples/rp23/Cargo.toml
+++ b/examples/rp235x/Cargo.toml
diff --git a/examples/rp23/assets/ferris.raw b/examples/rp235x/assets/ferris.raw
index 9733889c5..9733889c5 100644
--- a/examples/rp23/assets/ferris.raw
+++ b/examples/rp235x/assets/ferris.raw
diff --git a/examples/rp23/build.rs b/examples/rp235x/build.rs
index 30691aa97..30691aa97 100644
--- a/examples/rp23/build.rs
+++ b/examples/rp235x/build.rs
diff --git a/examples/rp23/memory.x b/examples/rp235x/memory.x
index c803896f6..c803896f6 100644
--- a/examples/rp23/memory.x
+++ b/examples/rp235x/memory.x
diff --git a/examples/rp23/src/bin/adc.rs b/examples/rp235x/src/bin/adc.rs
index b7324f755..b7324f755 100644
--- a/examples/rp23/src/bin/adc.rs
+++ b/examples/rp235x/src/bin/adc.rs
diff --git a/examples/rp23/src/bin/adc_dma.rs b/examples/rp235x/src/bin/adc_dma.rs
index f755cf5bf..f755cf5bf 100644
--- a/examples/rp23/src/bin/adc_dma.rs
+++ b/examples/rp235x/src/bin/adc_dma.rs
diff --git a/examples/rp23/src/bin/assign_resources.rs b/examples/rp235x/src/bin/assign_resources.rs
index ff6eff4a2..ff6eff4a2 100644
--- a/examples/rp23/src/bin/assign_resources.rs
+++ b/examples/rp235x/src/bin/assign_resources.rs
diff --git a/examples/rp23/src/bin/blinky.rs b/examples/rp235x/src/bin/blinky.rs
index 2d962baca..2d962baca 100644
--- a/examples/rp23/src/bin/blinky.rs
+++ b/examples/rp235x/src/bin/blinky.rs
diff --git a/examples/rp23/src/bin/blinky_two_channels.rs b/examples/rp235x/src/bin/blinky_two_channels.rs
index b2eec2a21..b2eec2a21 100644
--- a/examples/rp23/src/bin/blinky_two_channels.rs
+++ b/examples/rp235x/src/bin/blinky_two_channels.rs
diff --git a/examples/rp23/src/bin/blinky_two_tasks.rs b/examples/rp235x/src/bin/blinky_two_tasks.rs
index a57b513d6..a57b513d6 100644
--- a/examples/rp23/src/bin/blinky_two_tasks.rs
+++ b/examples/rp235x/src/bin/blinky_two_tasks.rs
diff --git a/examples/rp235x/src/bin/blinky_wifi.rs b/examples/rp235x/src/bin/blinky_wifi.rs
new file mode 100644
index 000000000..7aeb38f1e
--- /dev/null
+++ b/examples/rp235x/src/bin/blinky_wifi.rs
@@ -0,0 +1,89 @@
+//! This example tests the RP Pico 2 W onboard LED.
+//!
+//! It does not work with the RP Pico 2 board. See `blinky.rs`.
+
+#![no_std]
+#![no_main]
+
+use cyw43_pio::{PioSpi, DEFAULT_CLOCK_DIVIDER};
+use defmt::*;
+use embassy_executor::Spawner;
+use embassy_rp::bind_interrupts;
+use embassy_rp::gpio::{Level, Output};
+use embassy_rp::peripherals::{DMA_CH0, PIO0};
+use embassy_rp::pio::{InterruptHandler, Pio};
+use embassy_time::{Duration, Timer};
+use static_cell::StaticCell;
+use {defmt_rtt as _, panic_probe as _};
+
+// Program metadata for `picotool info`.
+// This isn't needed, but it's recommended to have these minimal entries.
+#[link_section = ".bi_entries"]
+#[used]
+pub static PICOTOOL_ENTRIES: [embassy_rp::binary_info::EntryAddr; 4] = [
+    embassy_rp::binary_info::rp_program_name!(c"Blinky Example"),
+    embassy_rp::binary_info::rp_program_description!(
+        c"This example tests the RP Pico 2 W's onboard LED, connected to GPIO 0 of the cyw43 \
+        (WiFi chip) via PIO 0 over the SPI bus."
+    ),
+    embassy_rp::binary_info::rp_cargo_version!(),
+    embassy_rp::binary_info::rp_program_build_attribute!(),
+];
+
+bind_interrupts!(struct Irqs {
+    PIO0_IRQ_0 => InterruptHandler<PIO0>;
+});
+
+#[embassy_executor::task]
+async fn cyw43_task(runner: cyw43::Runner<'static, Output<'static>, PioSpi<'static, PIO0, 0, DMA_CH0>>) -> ! {
+    runner.run().await
+}
+
+#[embassy_executor::main]
+async fn main(spawner: Spawner) {
+    let p = embassy_rp::init(Default::default());
+    let fw = include_bytes!("../../../../cyw43-firmware/43439A0.bin");
+    let clm = include_bytes!("../../../../cyw43-firmware/43439A0_clm.bin");
+
+    // To make flashing faster for development, you may want to flash the firmwares independently
+    // at hardcoded addresses, instead of baking them into the program with `include_bytes!`:
+    //     probe-rs download ../../cyw43-firmware/43439A0.bin --binary-format bin --chip RP2040 --base-address 0x10100000
+    //     probe-rs download ../../cyw43-firmware/43439A0_clm.bin --binary-format bin --chip RP2040 --base-address 0x10140000
+    //let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 230321) };
+    //let clm = unsafe { core::slice::from_raw_parts(0x10140000 as *const u8, 4752) };
+
+    let pwr = Output::new(p.PIN_23, Level::Low);
+    let cs = Output::new(p.PIN_25, Level::High);
+    let mut pio = Pio::new(p.PIO0, Irqs);
+    let spi = PioSpi::new(
+        &mut pio.common,
+        pio.sm0,
+        DEFAULT_CLOCK_DIVIDER,
+        pio.irq0,
+        cs,
+        p.PIN_24,
+        p.PIN_29,
+        p.DMA_CH0,
+    );
+
+    static STATE: StaticCell<cyw43::State> = StaticCell::new();
+    let state = STATE.init(cyw43::State::new());
+    let (_net_device, mut control, runner) = cyw43::new(state, pwr, spi, fw).await;
+    unwrap!(spawner.spawn(cyw43_task(runner)));
+
+    control.init(clm).await;
+    control
+        .set_power_management(cyw43::PowerManagementMode::PowerSave)
+        .await;
+
+    let delay = Duration::from_millis(250);
+    loop {
+        info!("led on!");
+        control.gpio_set(0, true).await;
+        Timer::after(delay).await;
+
+        info!("led off!");
+        control.gpio_set(0, false).await;
+        Timer::after(delay).await;
+    }
+}
diff --git a/examples/rp23/src/bin/wifi_blinky_pico_plus_2.rs b/examples/rp235x/src/bin/blinky_wifi_pico_plus_2.rs
index ab7d6a93e..d49d2e34f 100644
--- a/examples/rp23/src/bin/wifi_blinky_pico_plus_2.rs
+++ b/examples/rp235x/src/bin/blinky_wifi_pico_plus_2.rs
@@ -1,6 +1,6 @@
 //! This example test the Pimoroni Pico Plus 2 on board LED.
 //!
-//! It does not work with the RP Pico board. See blinky.rs.
+//! It does not work with the RP Pico 2 board. See `blinky.rs`.
 
 #![no_std]
 #![no_main]
diff --git a/examples/rp23/src/bin/button.rs b/examples/rp235x/src/bin/button.rs
index 4ad2ca3b7..4ad2ca3b7 100644
--- a/examples/rp23/src/bin/button.rs
+++ b/examples/rp235x/src/bin/button.rs
diff --git a/examples/rp23/src/bin/debounce.rs b/examples/rp235x/src/bin/debounce.rs
index 0077f19fc..0077f19fc 100644
--- a/examples/rp23/src/bin/debounce.rs
+++ b/examples/rp235x/src/bin/debounce.rs
diff --git a/examples/rp23/src/bin/flash.rs b/examples/rp235x/src/bin/flash.rs
index 31ad4aafc..31ad4aafc 100644
--- a/examples/rp23/src/bin/flash.rs
+++ b/examples/rp235x/src/bin/flash.rs
diff --git a/examples/rp23/src/bin/gpio_async.rs b/examples/rp235x/src/bin/gpio_async.rs
index b79fb2a15..b79fb2a15 100644
--- a/examples/rp23/src/bin/gpio_async.rs
+++ b/examples/rp235x/src/bin/gpio_async.rs
diff --git a/examples/rp23/src/bin/gpout.rs b/examples/rp235x/src/bin/gpout.rs
index 011359253..011359253 100644
--- a/examples/rp23/src/bin/gpout.rs
+++ b/examples/rp235x/src/bin/gpout.rs
diff --git a/examples/rp23/src/bin/i2c_async.rs b/examples/rp235x/src/bin/i2c_async.rs
index e31cc894c..e31cc894c 100644
--- a/examples/rp23/src/bin/i2c_async.rs
+++ b/examples/rp235x/src/bin/i2c_async.rs
diff --git a/examples/rp23/src/bin/i2c_async_embassy.rs b/examples/rp235x/src/bin/i2c_async_embassy.rs
index a65b71b9f..a65b71b9f 100644
--- a/examples/rp23/src/bin/i2c_async_embassy.rs
+++ b/examples/rp235x/src/bin/i2c_async_embassy.rs
diff --git a/examples/rp23/src/bin/i2c_blocking.rs b/examples/rp235x/src/bin/i2c_blocking.rs
index c9c8a2760..c9c8a2760 100644
--- a/examples/rp23/src/bin/i2c_blocking.rs
+++ b/examples/rp235x/src/bin/i2c_blocking.rs
diff --git a/examples/rp23/src/bin/i2c_slave.rs b/examples/rp235x/src/bin/i2c_slave.rs
index 9fffb4646..9fffb4646 100644
--- a/examples/rp23/src/bin/i2c_slave.rs
+++ b/examples/rp235x/src/bin/i2c_slave.rs
diff --git a/examples/rp23/src/bin/interrupt.rs b/examples/rp235x/src/bin/interrupt.rs
index e9ac76486..e9ac76486 100644
--- a/examples/rp23/src/bin/interrupt.rs
+++ b/examples/rp235x/src/bin/interrupt.rs
diff --git a/examples/rp23/src/bin/multicore.rs b/examples/rp235x/src/bin/multicore.rs
index 7cb546c91..7cb546c91 100644
--- a/examples/rp23/src/bin/multicore.rs
+++ b/examples/rp235x/src/bin/multicore.rs
diff --git a/examples/rp23/src/bin/multiprio.rs b/examples/rp235x/src/bin/multiprio.rs
index 2b397f97d..2b397f97d 100644
--- a/examples/rp23/src/bin/multiprio.rs
+++ b/examples/rp235x/src/bin/multiprio.rs
diff --git a/examples/rp23/src/bin/otp.rs b/examples/rp235x/src/bin/otp.rs
index 5ffbb7610..5ffbb7610 100644
--- a/examples/rp23/src/bin/otp.rs
+++ b/examples/rp235x/src/bin/otp.rs
diff --git a/examples/rp23/src/bin/pio_async.rs b/examples/rp235x/src/bin/pio_async.rs
index 08c702347..08c702347 100644
--- a/examples/rp23/src/bin/pio_async.rs
+++ b/examples/rp235x/src/bin/pio_async.rs
diff --git a/examples/rp23/src/bin/pio_dma.rs b/examples/rp235x/src/bin/pio_dma.rs
index d00ed2142..d00ed2142 100644
--- a/examples/rp23/src/bin/pio_dma.rs
+++ b/examples/rp235x/src/bin/pio_dma.rs
diff --git a/examples/rp23/src/bin/pio_hd44780.rs b/examples/rp235x/src/bin/pio_hd44780.rs
index 164e6f8d3..164e6f8d3 100644
--- a/examples/rp23/src/bin/pio_hd44780.rs
+++ b/examples/rp235x/src/bin/pio_hd44780.rs
diff --git a/examples/rp23/src/bin/pio_i2s.rs b/examples/rp235x/src/bin/pio_i2s.rs
index ae937a4ed..ae937a4ed 100644
--- a/examples/rp23/src/bin/pio_i2s.rs
+++ b/examples/rp235x/src/bin/pio_i2s.rs
diff --git a/examples/rp23/src/bin/pio_onewire.rs b/examples/rp235x/src/bin/pio_onewire.rs
index 991510851..991510851 100644
--- a/examples/rp23/src/bin/pio_onewire.rs
+++ b/examples/rp235x/src/bin/pio_onewire.rs
diff --git a/examples/rp23/src/bin/pio_pwm.rs b/examples/rp235x/src/bin/pio_pwm.rs
index 7eabb2289..7eabb2289 100644
--- a/examples/rp23/src/bin/pio_pwm.rs
+++ b/examples/rp235x/src/bin/pio_pwm.rs
diff --git a/examples/rp23/src/bin/pio_rotary_encoder.rs b/examples/rp235x/src/bin/pio_rotary_encoder.rs
index 2750f61ae..2750f61ae 100644
--- a/examples/rp23/src/bin/pio_rotary_encoder.rs
+++ b/examples/rp235x/src/bin/pio_rotary_encoder.rs
diff --git a/examples/rp23/src/bin/pio_rotary_encoder_rxf.rs b/examples/rp235x/src/bin/pio_rotary_encoder_rxf.rs
index 0216c131b..0216c131b 100644
--- a/examples/rp23/src/bin/pio_rotary_encoder_rxf.rs
+++ b/examples/rp235x/src/bin/pio_rotary_encoder_rxf.rs
diff --git a/examples/rp23/src/bin/pio_servo.rs b/examples/rp235x/src/bin/pio_servo.rs
index c52ee7492..c52ee7492 100644
--- a/examples/rp23/src/bin/pio_servo.rs
+++ b/examples/rp235x/src/bin/pio_servo.rs
diff --git a/examples/rp23/src/bin/pio_stepper.rs b/examples/rp235x/src/bin/pio_stepper.rs
index 3862c248b..3862c248b 100644
--- a/examples/rp23/src/bin/pio_stepper.rs
+++ b/examples/rp235x/src/bin/pio_stepper.rs
diff --git a/examples/rp23/src/bin/pio_uart.rs b/examples/rp235x/src/bin/pio_uart.rs
index 9712984f9..9712984f9 100644
--- a/examples/rp23/src/bin/pio_uart.rs
+++ b/examples/rp235x/src/bin/pio_uart.rs
diff --git a/examples/rp23/src/bin/pio_ws2812.rs b/examples/rp235x/src/bin/pio_ws2812.rs
index d1fcfc471..d1fcfc471 100644
--- a/examples/rp23/src/bin/pio_ws2812.rs
+++ b/examples/rp235x/src/bin/pio_ws2812.rs
diff --git a/examples/rp23/src/bin/pwm.rs b/examples/rp235x/src/bin/pwm.rs
index a3c0f7e49..a3c0f7e49 100644
--- a/examples/rp23/src/bin/pwm.rs
+++ b/examples/rp235x/src/bin/pwm.rs
diff --git a/examples/rp23/src/bin/pwm_input.rs b/examples/rp235x/src/bin/pwm_input.rs
index bf454a936..bf454a936 100644
--- a/examples/rp23/src/bin/pwm_input.rs
+++ b/examples/rp235x/src/bin/pwm_input.rs
diff --git a/examples/rp23/src/bin/pwm_tb6612fng_motor_driver.rs b/examples/rp235x/src/bin/pwm_tb6612fng_motor_driver.rs
index 3b700884c..3b700884c 100644
--- a/examples/rp23/src/bin/pwm_tb6612fng_motor_driver.rs
+++ b/examples/rp235x/src/bin/pwm_tb6612fng_motor_driver.rs
diff --git a/examples/rp23/src/bin/rosc.rs b/examples/rp235x/src/bin/rosc.rs
index 942b72319..942b72319 100644
--- a/examples/rp23/src/bin/rosc.rs
+++ b/examples/rp235x/src/bin/rosc.rs
diff --git a/examples/rp23/src/bin/shared_bus.rs b/examples/rp235x/src/bin/shared_bus.rs
index c6cb5d64c..c6cb5d64c 100644
--- a/examples/rp23/src/bin/shared_bus.rs
+++ b/examples/rp235x/src/bin/shared_bus.rs
diff --git a/examples/rp23/src/bin/sharing.rs b/examples/rp235x/src/bin/sharing.rs
index 5416e20ce..5416e20ce 100644
--- a/examples/rp23/src/bin/sharing.rs
+++ b/examples/rp235x/src/bin/sharing.rs
diff --git a/examples/rp23/src/bin/spi.rs b/examples/rp235x/src/bin/spi.rs
index 4cc4f5210..4cc4f5210 100644
--- a/examples/rp23/src/bin/spi.rs
+++ b/examples/rp235x/src/bin/spi.rs
diff --git a/examples/rp23/src/bin/spi_async.rs b/examples/rp235x/src/bin/spi_async.rs
index 266584efc..266584efc 100644
--- a/examples/rp23/src/bin/spi_async.rs
+++ b/examples/rp235x/src/bin/spi_async.rs
diff --git a/examples/rp23/src/bin/spi_display.rs b/examples/rp235x/src/bin/spi_display.rs
index 9c524ab25..9c524ab25 100644
--- a/examples/rp23/src/bin/spi_display.rs
+++ b/examples/rp235x/src/bin/spi_display.rs
diff --git a/examples/rp23/src/bin/spi_sdmmc.rs b/examples/rp235x/src/bin/spi_sdmmc.rs
index 9808b6a5d..9808b6a5d 100644
--- a/examples/rp23/src/bin/spi_sdmmc.rs
+++ b/examples/rp235x/src/bin/spi_sdmmc.rs
diff --git a/examples/rp23/src/bin/trng.rs b/examples/rp235x/src/bin/trng.rs
index ad19aef3e..ad19aef3e 100644
--- a/examples/rp23/src/bin/trng.rs
+++ b/examples/rp235x/src/bin/trng.rs
diff --git a/examples/rp23/src/bin/uart.rs b/examples/rp235x/src/bin/uart.rs
index a59f537bf..a59f537bf 100644
--- a/examples/rp23/src/bin/uart.rs
+++ b/examples/rp235x/src/bin/uart.rs
diff --git a/examples/rp23/src/bin/uart_buffered_split.rs b/examples/rp235x/src/bin/uart_buffered_split.rs
index 468d2b61a..468d2b61a 100644
--- a/examples/rp23/src/bin/uart_buffered_split.rs
+++ b/examples/rp235x/src/bin/uart_buffered_split.rs
diff --git a/examples/rp23/src/bin/uart_r503.rs b/examples/rp235x/src/bin/uart_r503.rs
index 085be280b..085be280b 100644
--- a/examples/rp23/src/bin/uart_r503.rs
+++ b/examples/rp235x/src/bin/uart_r503.rs
diff --git a/examples/rp23/src/bin/uart_unidir.rs b/examples/rp235x/src/bin/uart_unidir.rs
index a45f40756..a45f40756 100644
--- a/examples/rp23/src/bin/uart_unidir.rs
+++ b/examples/rp235x/src/bin/uart_unidir.rs
diff --git a/examples/rp23/src/bin/usb_hid_keyboard.rs b/examples/rp235x/src/bin/usb_hid_keyboard.rs
index 6f496e23a..6f496e23a 100644
--- a/examples/rp23/src/bin/usb_hid_keyboard.rs
+++ b/examples/rp235x/src/bin/usb_hid_keyboard.rs
diff --git a/examples/rp23/src/bin/usb_webusb.rs b/examples/rp235x/src/bin/usb_webusb.rs
index e73938ac9..e73938ac9 100644
--- a/examples/rp23/src/bin/usb_webusb.rs
+++ b/examples/rp235x/src/bin/usb_webusb.rs
diff --git a/examples/rp23/src/bin/watchdog.rs b/examples/rp235x/src/bin/watchdog.rs
index b9d4ef22f..b9d4ef22f 100644
--- a/examples/rp23/src/bin/watchdog.rs
+++ b/examples/rp235x/src/bin/watchdog.rs
diff --git a/examples/rp23/src/bin/zerocopy.rs b/examples/rp235x/src/bin/zerocopy.rs
index 39f03c8e4..39f03c8e4 100644
--- a/examples/rp23/src/bin/zerocopy.rs
+++ b/examples/rp235x/src/bin/zerocopy.rs