nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-25 08:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2931 from timbod7/timbod7-rp-usb-serial-example

Browse Source 
refactor rp usb_serial example to use a task to run the usb
This commit is contained in:
Dario Nieuwenhuis 2024-05-12 23:07:48 +00:00 committed by GitHub
commit fd97c52d78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
examples/rp/src/bin/usb_serial.rs
View File

@ -5,15 +5,15 @@
#![no_std] #![no_std]
#![no_main] #![no_main]
use defmt::{info, panic}; use defmt::{info, panic, unwrap};
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_futures::join::join;
use embassy_rp::bind_interrupts; use embassy_rp::bind_interrupts;
use embassy_rp::peripherals::USB; use embassy_rp::peripherals::USB;
use embassy_rp::usb::{Driver, Instance, InterruptHandler}; use embassy_rp::usb::{Driver, Instance, InterruptHandler};
use embassy_usb::class::cdc_acm::{CdcAcmClass, State}; use embassy_usb::class::cdc_acm::{CdcAcmClass, State};
use embassy_usb::driver::EndpointError; use embassy_usb::driver::EndpointError;
use embassy_usb::{Builder, Config}; use embassy_usb::UsbDevice;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _}; use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs { bind_interrupts!(struct Irqs {
@ -21,7 +21,7 @@ bind_interrupts!(struct Irqs {
}); });
#[embassy_executor::main] #[embassy_executor::main]
async fn main(_spawner: Spawner) { async fn main(spawner: Spawner) {
info!("Hello there!"); info!("Hello there!");
let p = embassy_rp::init(Default::default()); let p = embassy_rp::init(Default::default());
@ -30,59 +30,69 @@ async fn main(_spawner: Spawner) {
let driver = Driver::new(p.USB, Irqs); let driver = Driver::new(p.USB, Irqs);
// Create embassy-usb Config // Create embassy-usb Config
let mut config = Config::new(0xc0de, 0xcafe); let config = {
config.manufacturer = Some("Embassy"); let mut config = embassy_usb::Config::new(0xc0de, 0xcafe);
config.product = Some("USB-serial example"); config.manufacturer = Some("Embassy");
config.serial_number = Some("12345678"); config.product = Some("USB-serial example");
config.max_power = 100; config.serial_number = Some("12345678");
config.max_packet_size_0 = 64; config.max_power = 100;
config.max_packet_size_0 = 64;
// Required for windows compatibility. // Required for windows compatibility.
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help // https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
config.device_class = 0xEF; config.device_class = 0xEF;
config.device_sub_class = 0x02; config.device_sub_class = 0x02;
config.device_protocol = 0x01; config.device_protocol = 0x01;
config.composite_with_iads = true; config.composite_with_iads = true;
config
};
// Create embassy-usb DeviceBuilder using the driver and config. // Create embassy-usb DeviceBuilder using the driver and config.
// It needs some buffers for building the descriptors. // It needs some buffers for building the descriptors.
let mut config_descriptor = [0; 256]; let mut builder = {
let mut bos_descriptor = [0; 256]; static CONFIG_DESCRIPTOR: StaticCell<[u8; 256]> = StaticCell::new();
let mut control_buf = [0; 64]; static BOS_DESCRIPTOR: StaticCell<[u8; 256]> = StaticCell::new();
static CONTROL_BUF: StaticCell<[u8; 64]> = StaticCell::new();
let mut state = State::new(); let builder = embassy_usb::Builder::new(
driver,
let mut builder = Builder::new( config,
driver, CONFIG_DESCRIPTOR.init([0; 256]),
config, BOS_DESCRIPTOR.init([0; 256]),
&mut config_descriptor, &mut [], // no msos descriptors
&mut bos_descriptor, CONTROL_BUF.init([0; 64]),
&mut [], // no msos descriptors );
&mut control_buf, builder
);
// Create classes on the builder.
let mut class = CdcAcmClass::new(&mut builder, &mut state, 64);
// Build the builder.
let mut usb = builder.build();
// Run the USB device.
let usb_fut = usb.run();
// Do stuff with the class!
let echo_fut = async {
loop {
class.wait_connection().await;
info!("Connected");
let _ = echo(&mut class).await;
info!("Disconnected");
}
}; };
// Run everything concurrently. // Create classes on the builder.
// If we had made everything `'static` above instead, we could do this using separate tasks instead. let mut class = {
join(usb_fut, echo_fut).await; static STATE: StaticCell<State> = StaticCell::new();
let state = STATE.init(State::new());
CdcAcmClass::new(&mut builder, state, 64)
};
// Build the builder.
let usb = builder.build();
// Run the USB device.
unwrap!(spawner.spawn(usb_task(usb)));
// Do stuff with the class!
loop {
class.wait_connection().await;
info!("Connected");
let _ = echo(&mut class).await;
info!("Disconnected");
}
}
type MyUsbDriver = Driver<'static, USB>;
type MyUsbDevice = UsbDevice<'static, MyUsbDriver>;
#[embassy_executor::task]
async fn usb_task(mut usb: MyUsbDevice) -> ! {
usb.run().await
} }
struct Disconnected {} struct Disconnected {}