From 5e8608c7a5b1e4e92f1fb650ea0ef47e5a6df563 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sun, 1 Nov 2020 17:17:24 +0100 Subject: Make defmt optional with new `anyfmt` crate --- examples/src/bin/gpiote.rs | 22 +++++++--------------- examples/src/bin/multiprio.rs | 16 ++++++++++------ examples/src/bin/qspi.rs | 7 ++++--- examples/src/bin/rtc_async.rs | 6 +++--- examples/src/bin/rtc_raw.rs | 2 +- examples/src/bin/uart.rs | 12 ++++++------ 6 files changed, 31 insertions(+), 34 deletions(-) (limited to 'examples/src/bin') diff --git a/examples/src/bin/gpiote.rs b/examples/src/bin/gpiote.rs index 16b4f06d7..d8394155d 100644 --- a/examples/src/bin/gpiote.rs +++ b/examples/src/bin/gpiote.rs @@ -15,7 +15,7 @@ use embassy_nrf::gpiote; #[task] async fn run() { - let p = embassy_nrf::pac::Peripherals::take().dewrap(); + let p = unwrap!(embassy_nrf::pac::Peripherals::take()); let port0 = gpio::p0::Parts::new(p.P0); let g = gpiote::Gpiote::new(p.GPIOTE); @@ -24,9 +24,7 @@ async fn run() { let pin1 = port0.p0_11.into_pullup_input().degrade(); let button1 = async { - let ch = g - .new_input_channel(pin1, gpiote::EventPolarity::HiToLo) - .dewrap(); + let ch = unwrap!(g.new_input_channel(pin1, gpiote::EventPolarity::HiToLo)); loop { ch.wait().await; @@ -36,9 +34,7 @@ async fn run() { let pin2 = port0.p0_12.into_pullup_input().degrade(); let button2 = async { - let ch = g - .new_input_channel(pin2, gpiote::EventPolarity::LoToHi) - .dewrap(); + let ch = unwrap!(g.new_input_channel(pin2, gpiote::EventPolarity::LoToHi)); loop { ch.wait().await; @@ -48,9 +44,7 @@ async fn run() { let pin3 = port0.p0_24.into_pullup_input().degrade(); let button3 = async { - let ch = g - .new_input_channel(pin3, gpiote::EventPolarity::Toggle) - .dewrap(); + let ch = unwrap!(g.new_input_channel(pin3, gpiote::EventPolarity::Toggle)); loop { ch.wait().await; @@ -60,9 +54,7 @@ async fn run() { let pin4 = port0.p0_25.into_pullup_input().degrade(); let button4 = async { - let ch = g - .new_input_channel(pin4, gpiote::EventPolarity::Toggle) - .dewrap(); + let ch = unwrap!(g.new_input_channel(pin4, gpiote::EventPolarity::Toggle)); loop { ch.wait().await; @@ -79,8 +71,8 @@ static EXECUTOR: Forever = Forever::new(); fn main() -> ! { info!("Hello World!"); - let executor = EXECUTOR.put(Executor::new(cortex_m::asm::wfi)); - executor.spawn(run()).dewrap(); + let executor = EXECUTOR.put(Executor::new(cortex_m::asm::sev)); + unwrap!(executor.spawn(run())); loop { executor.run(); diff --git a/examples/src/bin/multiprio.rs b/examples/src/bin/multiprio.rs index dbca491e0..e73747ac6 100644 --- a/examples/src/bin/multiprio.rs +++ b/examples/src/bin/multiprio.rs @@ -120,7 +120,7 @@ static EXECUTOR_HIGH: Forever>> = Forever::n fn main() -> ! { info!("Hello World!"); - let p = embassy_nrf::pac::Peripherals::take().dewrap(); + let p = unwrap!(embassy_nrf::pac::Peripherals::take()); clocks::Clocks::new(p.CLOCK) .enable_ext_hfosc() @@ -132,17 +132,21 @@ fn main() -> ! { unsafe { embassy::time::set_clock(rtc) }; let executor_low = EXECUTOR_LOW.put(TimerExecutor::new(rtc.alarm0(), cortex_m::asm::sev)); - let executor_med = EXECUTOR_MED.put(TimerExecutor::new(rtc.alarm1(), cortex_m::asm::sev)); - let executor_high = EXECUTOR_HIGH.put(TimerExecutor::new(rtc.alarm2(), cortex_m::asm::sev)); + let executor_med = EXECUTOR_MED.put(TimerExecutor::new(rtc.alarm1(), || { + interrupt::pend(interrupt::SWI0_EGU0) + })); + let executor_high = EXECUTOR_HIGH.put(TimerExecutor::new(rtc.alarm2(), || { + interrupt::pend(interrupt::SWI1_EGU1) + })); interrupt::set_priority(interrupt::SWI0_EGU0, interrupt::Priority::Level7); interrupt::set_priority(interrupt::SWI1_EGU1, interrupt::Priority::Level6); interrupt::enable(interrupt::SWI0_EGU0); interrupt::enable(interrupt::SWI1_EGU1); - executor_low.spawn(run_low()).dewrap(); - executor_med.spawn(run_med()).dewrap(); - executor_high.spawn(run_high()).dewrap(); + unwrap!(executor_low.spawn(run_low())); + unwrap!(executor_med.spawn(run_med())); + unwrap!(executor_high.spawn(run_high())); loop { executor_low.run(); diff --git a/examples/src/bin/qspi.rs b/examples/src/bin/qspi.rs index caabac8ba..a7f668ca7 100644 --- a/examples/src/bin/qspi.rs +++ b/examples/src/bin/qspi.rs @@ -6,6 +6,7 @@ mod example_common; use example_common::*; +use anyfmt::panic; use cortex_m_rt::entry; use nrf52840_hal::gpio; @@ -23,7 +24,7 @@ struct AlignedBuf([u8; 4096]); #[task] async fn run() { - let p = embassy_nrf::pac::Peripherals::take().dewrap(); + let p = unwrap!(embassy_nrf::pac::Peripherals::take()); let port0 = gpio::p0::Parts::new(p.P0); @@ -121,8 +122,8 @@ static EXECUTOR: Forever = Forever::new(); fn main() -> ! { info!("Hello World!"); - let executor = EXECUTOR.put(Executor::new(cortex_m::asm::wfi)); - executor.spawn(run()).dewrap(); + let executor = EXECUTOR.put(Executor::new(cortex_m::asm::sev)); + unwrap!(executor.spawn(run())); loop { executor.run(); diff --git a/examples/src/bin/rtc_async.rs b/examples/src/bin/rtc_async.rs index 5126a2cc8..b4ee736b7 100644 --- a/examples/src/bin/rtc_async.rs +++ b/examples/src/bin/rtc_async.rs @@ -39,7 +39,7 @@ static EXECUTOR: Forever>> = Forever::new(); fn main() -> ! { info!("Hello World!"); - let p = embassy_nrf::pac::Peripherals::take().dewrap(); + let p = unwrap!(embassy_nrf::pac::Peripherals::take()); clocks::Clocks::new(p.CLOCK) .enable_ext_hfosc() @@ -53,8 +53,8 @@ fn main() -> ! { let executor = EXECUTOR.put(TimerExecutor::new(rtc.alarm0(), cortex_m::asm::sev)); - executor.spawn(run1()).dewrap(); - executor.spawn(run2()).dewrap(); + unwrap!(executor.spawn(run1())); + unwrap!(executor.spawn(run2())); loop { executor.run(); diff --git a/examples/src/bin/rtc_raw.rs b/examples/src/bin/rtc_raw.rs index 4453ecae1..ad5fab246 100644 --- a/examples/src/bin/rtc_raw.rs +++ b/examples/src/bin/rtc_raw.rs @@ -18,7 +18,7 @@ static mut RTC: MaybeUninit> = MaybeUninit::uni fn main() -> ! { info!("Hello World!"); - let p = embassy_nrf::pac::Peripherals::take().dewrap(); + let p = unwrap!(embassy_nrf::pac::Peripherals::take()); clocks::Clocks::new(p.CLOCK) .enable_ext_hfosc() diff --git a/examples/src/bin/uart.rs b/examples/src/bin/uart.rs index eeaf5fee6..553bbb356 100644 --- a/examples/src/bin/uart.rs +++ b/examples/src/bin/uart.rs @@ -17,7 +17,7 @@ use embassy_nrf::uarte; #[task] async fn run() { - let p = embassy_nrf::pac::Peripherals::take().dewrap(); + let p = unwrap!(embassy_nrf::pac::Peripherals::take()); let port0 = gpio::p0::Parts::new(p.P0); @@ -41,14 +41,14 @@ async fn run() { info!("uarte initialized!"); - u.write_all(b"Hello!\r\n").await.dewrap(); + unwrap!(u.write_all(b"Hello!\r\n").await); info!("wrote hello in uart!"); // Simple demo, reading 8-char chunks and echoing them back reversed. loop { info!("reading..."); let mut buf = [0u8; 8]; - u.read_exact(&mut buf).await.dewrap(); + unwrap!(u.read_exact(&mut buf).await); info!("read done, got {:[u8]}", buf); // Reverse buf @@ -59,7 +59,7 @@ async fn run() { } info!("writing..."); - u.write_all(&buf).await.dewrap(); + unwrap!(u.write_all(&buf).await); info!("write done"); } } @@ -70,8 +70,8 @@ static EXECUTOR: Forever = Forever::new(); fn main() -> ! { info!("Hello World!"); - let executor = EXECUTOR.put(Executor::new(cortex_m::asm::wfi)); - executor.spawn(run()).dewrap(); + let executor = EXECUTOR.put(Executor::new(cortex_m::asm::sev)); + unwrap!(executor.spawn(run())); loop { executor.run(); -- cgit