diff options
Diffstat (limited to 'examples/nrf/src/bin/usb_serial_multitask.rs')
| -rw-r--r-- | examples/nrf/src/bin/usb_serial_multitask.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/nrf/src/bin/usb_serial_multitask.rs b/examples/nrf/src/bin/usb_serial_multitask.rs index 3806da5a0..956315322 100644 --- a/examples/nrf/src/bin/usb_serial_multitask.rs +++ b/examples/nrf/src/bin/usb_serial_multitask.rs | |||
| @@ -6,23 +6,23 @@ | |||
| 6 | use core::mem; | 6 | use core::mem; |
| 7 | 7 | ||
| 8 | use defmt::{info, panic, unwrap}; | 8 | use defmt::{info, panic, unwrap}; |
| 9 | use embassy::executor::Spawner; | 9 | use embassy_executor::executor::Spawner; |
| 10 | use embassy::util::Forever; | ||
| 11 | use embassy_nrf::usb::{Driver, PowerUsb}; | 10 | use embassy_nrf::usb::{Driver, PowerUsb}; |
| 12 | use embassy_nrf::{interrupt, pac, peripherals, Peripherals}; | 11 | use embassy_nrf::{interrupt, pac, peripherals, Peripherals}; |
| 13 | use embassy_usb::driver::EndpointError; | 12 | use embassy_usb::driver::EndpointError; |
| 14 | use embassy_usb::{Builder, Config, UsbDevice}; | 13 | use embassy_usb::{Builder, Config, UsbDevice}; |
| 15 | use embassy_usb_serial::{CdcAcmClass, State}; | 14 | use embassy_usb_serial::{CdcAcmClass, State}; |
| 15 | use embassy_util::Forever; | ||
| 16 | use {defmt_rtt as _, panic_probe as _}; | 16 | use {defmt_rtt as _, panic_probe as _}; |
| 17 | 17 | ||
| 18 | type MyDriver = Driver<'static, peripherals::USBD, PowerUsb>; | 18 | type MyDriver = Driver<'static, peripherals::USBD, PowerUsb>; |
| 19 | 19 | ||
| 20 | #[embassy::task] | 20 | #[embassy_executor::task] |
| 21 | async fn usb_task(mut device: UsbDevice<'static, MyDriver>) { | 21 | async fn usb_task(mut device: UsbDevice<'static, MyDriver>) { |
| 22 | device.run().await; | 22 | device.run().await; |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | #[embassy::task] | 25 | #[embassy_executor::task] |
| 26 | async fn echo_task(mut class: CdcAcmClass<'static, MyDriver>) { | 26 | async fn echo_task(mut class: CdcAcmClass<'static, MyDriver>) { |
| 27 | loop { | 27 | loop { |
| 28 | class.wait_connection().await; | 28 | class.wait_connection().await; |
| @@ -32,7 +32,7 @@ async fn echo_task(mut class: CdcAcmClass<'static, MyDriver>) { | |||
| 32 | } | 32 | } |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | #[embassy::main] | 35 | #[embassy_executor::main] |
| 36 | async fn main(spawner: Spawner, p: Peripherals) { | 36 | async fn main(spawner: Spawner, p: Peripherals) { |
| 37 | let clock: pac::CLOCK = unsafe { mem::transmute(()) }; | 37 | let clock: pac::CLOCK = unsafe { mem::transmute(()) }; |
| 38 | 38 | ||
