diff --git a/.gitignore b/.gitignore index 352c1f1af..2d7cbc4fe 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ out/ .zed .neoconf.json *.vim +**/.idea \ No newline at end of file diff --git a/ci.sh b/ci.sh index ae0a56032..e32105b16 100755 --- a/ci.sh +++ b/ci.sh @@ -209,7 +209,7 @@ cargo batch \ --- build --release --manifest-path examples/nrf9151/ns/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/nrf9151/ns \ --- build --release --manifest-path examples/nrf51/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/nrf51 \ --- build --release --manifest-path examples/rp/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/rp \ - --- build --release --manifest-path examples/rp23/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/rp23 \ + --- build --release --manifest-path examples/rp235x/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/rp235x \ --- build --release --manifest-path examples/stm32f0/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/stm32f0 \ --- build --release --manifest-path examples/stm32f1/Cargo.toml --target thumbv7m-none-eabi --artifact-dir out/examples/stm32f1 \ --- build --release --manifest-path examples/stm32f2/Cargo.toml --target thumbv7m-none-eabi --artifact-dir out/examples/stm32f2 \ diff --git a/examples/rp23/.cargo/config.toml b/examples/rp235x/.cargo/config.toml similarity index 100% rename from examples/rp23/.cargo/config.toml rename to examples/rp235x/.cargo/config.toml diff --git a/examples/rp23/Cargo.toml b/examples/rp235x/Cargo.toml similarity index 100% rename from examples/rp23/Cargo.toml rename to examples/rp235x/Cargo.toml diff --git a/examples/rp23/assets/ferris.raw b/examples/rp235x/assets/ferris.raw similarity index 100% rename from examples/rp23/assets/ferris.raw rename to examples/rp235x/assets/ferris.raw diff --git a/examples/rp23/build.rs b/examples/rp235x/build.rs similarity index 100% rename from examples/rp23/build.rs rename to examples/rp235x/build.rs diff --git a/examples/rp23/memory.x b/examples/rp235x/memory.x similarity index 100% rename from examples/rp23/memory.x rename to examples/rp235x/memory.x diff --git a/examples/rp23/src/bin/adc.rs b/examples/rp235x/src/bin/adc.rs similarity index 100% rename from examples/rp23/src/bin/adc.rs rename to examples/rp235x/src/bin/adc.rs diff --git a/examples/rp23/src/bin/adc_dma.rs b/examples/rp235x/src/bin/adc_dma.rs similarity index 100% rename from examples/rp23/src/bin/adc_dma.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/assign_resources.rs rename to examples/rp235x/src/bin/assign_resources.rs diff --git a/examples/rp23/src/bin/blinky.rs b/examples/rp235x/src/bin/blinky.rs similarity index 100% rename from examples/rp23/src/bin/blinky.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/blinky_two_channels.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/blinky_two_tasks.rs rename to 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; +}); + +#[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 = 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 similarity index 97% rename from examples/rp23/src/bin/wifi_blinky_pico_plus_2.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/button.rs rename to examples/rp235x/src/bin/button.rs diff --git a/examples/rp23/src/bin/debounce.rs b/examples/rp235x/src/bin/debounce.rs similarity index 100% rename from examples/rp23/src/bin/debounce.rs rename to examples/rp235x/src/bin/debounce.rs diff --git a/examples/rp23/src/bin/flash.rs b/examples/rp235x/src/bin/flash.rs similarity index 100% rename from examples/rp23/src/bin/flash.rs rename to examples/rp235x/src/bin/flash.rs diff --git a/examples/rp23/src/bin/gpio_async.rs b/examples/rp235x/src/bin/gpio_async.rs similarity index 100% rename from examples/rp23/src/bin/gpio_async.rs rename to examples/rp235x/src/bin/gpio_async.rs diff --git a/examples/rp23/src/bin/gpout.rs b/examples/rp235x/src/bin/gpout.rs similarity index 100% rename from examples/rp23/src/bin/gpout.rs rename to examples/rp235x/src/bin/gpout.rs diff --git a/examples/rp23/src/bin/i2c_async.rs b/examples/rp235x/src/bin/i2c_async.rs similarity index 100% rename from examples/rp23/src/bin/i2c_async.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/i2c_async_embassy.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/i2c_blocking.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/i2c_slave.rs rename to examples/rp235x/src/bin/i2c_slave.rs diff --git a/examples/rp23/src/bin/interrupt.rs b/examples/rp235x/src/bin/interrupt.rs similarity index 100% rename from examples/rp23/src/bin/interrupt.rs rename to examples/rp235x/src/bin/interrupt.rs diff --git a/examples/rp23/src/bin/multicore.rs b/examples/rp235x/src/bin/multicore.rs similarity index 100% rename from examples/rp23/src/bin/multicore.rs rename to examples/rp235x/src/bin/multicore.rs diff --git a/examples/rp23/src/bin/multiprio.rs b/examples/rp235x/src/bin/multiprio.rs similarity index 100% rename from examples/rp23/src/bin/multiprio.rs rename to examples/rp235x/src/bin/multiprio.rs diff --git a/examples/rp23/src/bin/otp.rs b/examples/rp235x/src/bin/otp.rs similarity index 100% rename from examples/rp23/src/bin/otp.rs rename to examples/rp235x/src/bin/otp.rs diff --git a/examples/rp23/src/bin/pio_async.rs b/examples/rp235x/src/bin/pio_async.rs similarity index 100% rename from examples/rp23/src/bin/pio_async.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_dma.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_hd44780.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_i2s.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_onewire.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_pwm.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_rotary_encoder.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_rotary_encoder_rxf.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_servo.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_stepper.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_uart.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pio_ws2812.rs rename to examples/rp235x/src/bin/pio_ws2812.rs diff --git a/examples/rp23/src/bin/pwm.rs b/examples/rp235x/src/bin/pwm.rs similarity index 100% rename from examples/rp23/src/bin/pwm.rs rename to examples/rp235x/src/bin/pwm.rs diff --git a/examples/rp23/src/bin/pwm_input.rs b/examples/rp235x/src/bin/pwm_input.rs similarity index 100% rename from examples/rp23/src/bin/pwm_input.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/pwm_tb6612fng_motor_driver.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/rosc.rs rename to examples/rp235x/src/bin/rosc.rs diff --git a/examples/rp23/src/bin/shared_bus.rs b/examples/rp235x/src/bin/shared_bus.rs similarity index 100% rename from examples/rp23/src/bin/shared_bus.rs rename to examples/rp235x/src/bin/shared_bus.rs diff --git a/examples/rp23/src/bin/sharing.rs b/examples/rp235x/src/bin/sharing.rs similarity index 100% rename from examples/rp23/src/bin/sharing.rs rename to examples/rp235x/src/bin/sharing.rs diff --git a/examples/rp23/src/bin/spi.rs b/examples/rp235x/src/bin/spi.rs similarity index 100% rename from examples/rp23/src/bin/spi.rs rename to examples/rp235x/src/bin/spi.rs diff --git a/examples/rp23/src/bin/spi_async.rs b/examples/rp235x/src/bin/spi_async.rs similarity index 100% rename from examples/rp23/src/bin/spi_async.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/spi_display.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/spi_sdmmc.rs rename to examples/rp235x/src/bin/spi_sdmmc.rs diff --git a/examples/rp23/src/bin/trng.rs b/examples/rp235x/src/bin/trng.rs similarity index 100% rename from examples/rp23/src/bin/trng.rs rename to examples/rp235x/src/bin/trng.rs diff --git a/examples/rp23/src/bin/uart.rs b/examples/rp235x/src/bin/uart.rs similarity index 100% rename from examples/rp23/src/bin/uart.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/uart_buffered_split.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/uart_r503.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/uart_unidir.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/usb_hid_keyboard.rs rename to 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 similarity index 100% rename from examples/rp23/src/bin/usb_webusb.rs rename to examples/rp235x/src/bin/usb_webusb.rs diff --git a/examples/rp23/src/bin/watchdog.rs b/examples/rp235x/src/bin/watchdog.rs similarity index 100% rename from examples/rp23/src/bin/watchdog.rs rename to examples/rp235x/src/bin/watchdog.rs diff --git a/examples/rp23/src/bin/zerocopy.rs b/examples/rp235x/src/bin/zerocopy.rs similarity index 100% rename from examples/rp23/src/bin/zerocopy.rs rename to examples/rp235x/src/bin/zerocopy.rs