diff options
| author | pennae <[email protected]> | 2023-05-15 15:21:05 +0200 |
|---|---|---|
| committer | pennae <[email protected]> | 2023-05-15 15:24:56 +0200 |
| commit | 14a5d03af2a74eccaa9930bdf81eef43791a4b33 (patch) | |
| tree | 3a0879c21cf09702c670b14672e62b940a2157f0 /examples/rp/src/bin/usb_logger.rs | |
| parent | 82f7e104d90a6628d1873017ea5ef6a7afb3b3f7 (diff) | |
rp: remove take!, add bind_interrupts!
Diffstat (limited to 'examples/rp/src/bin/usb_logger.rs')
| -rw-r--r-- | examples/rp/src/bin/usb_logger.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/examples/rp/src/bin/usb_logger.rs b/examples/rp/src/bin/usb_logger.rs index 52417a02e..7c90d0ca3 100644 --- a/examples/rp/src/bin/usb_logger.rs +++ b/examples/rp/src/bin/usb_logger.rs | |||
| @@ -3,12 +3,16 @@ | |||
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | use embassy_executor::Spawner; | 5 | use embassy_executor::Spawner; |
| 6 | use embassy_rp::interrupt; | 6 | use embassy_rp::bind_interrupts; |
| 7 | use embassy_rp::peripherals::USB; | 7 | use embassy_rp::peripherals::USB; |
| 8 | use embassy_rp::usb::Driver; | 8 | use embassy_rp::usb::{Driver, InterruptHandler}; |
| 9 | use embassy_time::{Duration, Timer}; | 9 | use embassy_time::{Duration, Timer}; |
| 10 | use {defmt_rtt as _, panic_probe as _}; | 10 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 11 | ||
| 12 | bind_interrupts!(struct Irqs { | ||
| 13 | USBCTRL_IRQ => InterruptHandler<USB>; | ||
| 14 | }); | ||
| 15 | |||
| 12 | #[embassy_executor::task] | 16 | #[embassy_executor::task] |
| 13 | async fn logger_task(driver: Driver<'static, USB>) { | 17 | async fn logger_task(driver: Driver<'static, USB>) { |
| 14 | embassy_usb_logger::run!(1024, log::LevelFilter::Info, driver); | 18 | embassy_usb_logger::run!(1024, log::LevelFilter::Info, driver); |
| @@ -17,8 +21,7 @@ async fn logger_task(driver: Driver<'static, USB>) { | |||
| 17 | #[embassy_executor::main] | 21 | #[embassy_executor::main] |
| 18 | async fn main(spawner: Spawner) { | 22 | async fn main(spawner: Spawner) { |
| 19 | let p = embassy_rp::init(Default::default()); | 23 | let p = embassy_rp::init(Default::default()); |
| 20 | let irq = interrupt::take!(USBCTRL_IRQ); | 24 | let driver = Driver::new(p.USB, Irqs); |
| 21 | let driver = Driver::new(p.USB, irq); | ||
| 22 | spawner.spawn(logger_task(driver)).unwrap(); | 25 | spawner.spawn(logger_task(driver)).unwrap(); |
| 23 | 26 | ||
| 24 | let mut counter = 0; | 27 | let mut counter = 0; |
