diff options
| author | Adam Greig <[email protected]> | 2023-10-15 00:57:25 +0100 |
|---|---|---|
| committer | Adam Greig <[email protected]> | 2023-10-15 01:30:12 +0100 |
| commit | 0621e957a0ddc7010d46b3ea3ddc8b9852bc8333 (patch) | |
| tree | f6caefe939109e55a73e9141c736d2f6c20f51e8 /examples/stm32f0/src/bin | |
| parent | 7559f9e5834799b041d899767ef4305dcfdf0181 (diff) | |
time: Update examples, tests, and other code to use new Timer::after_x convenience methods
Diffstat (limited to 'examples/stm32f0/src/bin')
| -rw-r--r-- | examples/stm32f0/src/bin/adc.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f0/src/bin/blinky.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f0/src/bin/button_controlled_blink.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f0/src/bin/hello.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f0/src/bin/multiprio.rs | 8 | ||||
| -rw-r--r-- | examples/stm32f0/src/bin/wdg.rs | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/examples/stm32f0/src/bin/adc.rs b/examples/stm32f0/src/bin/adc.rs index 1564ecfc0..96f234402 100644 --- a/examples/stm32f0/src/bin/adc.rs +++ b/examples/stm32f0/src/bin/adc.rs | |||
| @@ -7,7 +7,7 @@ use embassy_executor::Spawner; | |||
| 7 | use embassy_stm32::adc::{Adc, SampleTime}; | 7 | use embassy_stm32::adc::{Adc, SampleTime}; |
| 8 | use embassy_stm32::peripherals::ADC; | 8 | use embassy_stm32::peripherals::ADC; |
| 9 | use embassy_stm32::{adc, bind_interrupts}; | 9 | use embassy_stm32::{adc, bind_interrupts}; |
| 10 | use embassy_time::{Delay, Duration, Timer}; | 10 | use embassy_time::{Delay, Timer}; |
| 11 | use {defmt_rtt as _, panic_probe as _}; | 11 | use {defmt_rtt as _, panic_probe as _}; |
| 12 | 12 | ||
| 13 | bind_interrupts!(struct Irqs { | 13 | bind_interrupts!(struct Irqs { |
| @@ -36,6 +36,6 @@ async fn main(_spawner: Spawner) { | |||
| 36 | loop { | 36 | loop { |
| 37 | let v = adc.read(&mut pin).await; | 37 | let v = adc.read(&mut pin).await; |
| 38 | info!("--> {} - {} mV", v, convert_to_millivolts(v)); | 38 | info!("--> {} - {} mV", v, convert_to_millivolts(v)); |
| 39 | Timer::after(Duration::from_millis(100)).await; | 39 | Timer::after_millis(100).await; |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
diff --git a/examples/stm32f0/src/bin/blinky.rs b/examples/stm32f0/src/bin/blinky.rs index 9f923399c..899394546 100644 --- a/examples/stm32f0/src/bin/blinky.rs +++ b/examples/stm32f0/src/bin/blinky.rs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | use defmt::*; | 5 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::gpio::{Level, Output, Speed}; | 7 | use embassy_stm32::gpio::{Level, Output, Speed}; |
| 8 | use embassy_time::{Duration, Timer}; | 8 | use embassy_time::Timer; |
| 9 | use {defmt_rtt as _, panic_probe as _}; | 9 | use {defmt_rtt as _, panic_probe as _}; |
| 10 | 10 | ||
| 11 | // main is itself an async function. | 11 | // main is itself an async function. |
| @@ -19,10 +19,10 @@ async fn main(_spawner: Spawner) { | |||
| 19 | loop { | 19 | loop { |
| 20 | info!("high"); | 20 | info!("high"); |
| 21 | led.set_high(); | 21 | led.set_high(); |
| 22 | Timer::after(Duration::from_millis(300)).await; | 22 | Timer::after_millis(300).await; |
| 23 | 23 | ||
| 24 | info!("low"); | 24 | info!("low"); |
| 25 | led.set_low(); | 25 | led.set_low(); |
| 26 | Timer::after(Duration::from_millis(300)).await; | 26 | Timer::after_millis(300).await; |
| 27 | } | 27 | } |
| 28 | } | 28 | } |
diff --git a/examples/stm32f0/src/bin/button_controlled_blink.rs b/examples/stm32f0/src/bin/button_controlled_blink.rs index f362c53f5..306df1752 100644 --- a/examples/stm32f0/src/bin/button_controlled_blink.rs +++ b/examples/stm32f0/src/bin/button_controlled_blink.rs | |||
| @@ -10,7 +10,7 @@ use defmt::info; | |||
| 10 | use embassy_executor::Spawner; | 10 | use embassy_executor::Spawner; |
| 11 | use embassy_stm32::exti::ExtiInput; | 11 | use embassy_stm32::exti::ExtiInput; |
| 12 | use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed}; | 12 | use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed}; |
| 13 | use embassy_time::{Duration, Timer}; | 13 | use embassy_time::Timer; |
| 14 | use {defmt_rtt as _, panic_probe as _}; | 14 | use {defmt_rtt as _, panic_probe as _}; |
| 15 | 15 | ||
| 16 | static BLINK_MS: AtomicU32 = AtomicU32::new(0); | 16 | static BLINK_MS: AtomicU32 = AtomicU32::new(0); |
| @@ -24,7 +24,7 @@ async fn led_task(led: AnyPin) { | |||
| 24 | loop { | 24 | loop { |
| 25 | let del = BLINK_MS.load(Ordering::Relaxed); | 25 | let del = BLINK_MS.load(Ordering::Relaxed); |
| 26 | info!("Value of del is {}", del); | 26 | info!("Value of del is {}", del); |
| 27 | Timer::after(Duration::from_millis(del.into())).await; | 27 | Timer::after_millis(del.into()).await; |
| 28 | info!("LED toggling"); | 28 | info!("LED toggling"); |
| 29 | led.toggle(); | 29 | led.toggle(); |
| 30 | } | 30 | } |
diff --git a/examples/stm32f0/src/bin/hello.rs b/examples/stm32f0/src/bin/hello.rs index db78233ea..0f98d9865 100644 --- a/examples/stm32f0/src/bin/hello.rs +++ b/examples/stm32f0/src/bin/hello.rs | |||
| @@ -4,14 +4,14 @@ | |||
| 4 | 4 | ||
| 5 | use defmt::info; | 5 | use defmt::info; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_time::{Duration, Timer}; | 7 | use embassy_time::Timer; |
| 8 | use {defmt_rtt as _, panic_probe as _}; | 8 | use {defmt_rtt as _, panic_probe as _}; |
| 9 | 9 | ||
| 10 | #[embassy_executor::main] | 10 | #[embassy_executor::main] |
| 11 | async fn main(_spawner: Spawner) -> ! { | 11 | async fn main(_spawner: Spawner) -> ! { |
| 12 | let _p = embassy_stm32::init(Default::default()); | 12 | let _p = embassy_stm32::init(Default::default()); |
| 13 | loop { | 13 | loop { |
| 14 | Timer::after(Duration::from_secs(1)).await; | 14 | Timer::after_secs(1).await; |
| 15 | info!("Hello"); | 15 | info!("Hello"); |
| 16 | } | 16 | } |
| 17 | } | 17 | } |
diff --git a/examples/stm32f0/src/bin/multiprio.rs b/examples/stm32f0/src/bin/multiprio.rs index 988ffeef1..870c7c45b 100644 --- a/examples/stm32f0/src/bin/multiprio.rs +++ b/examples/stm32f0/src/bin/multiprio.rs | |||
| @@ -62,7 +62,7 @@ use defmt::*; | |||
| 62 | use embassy_executor::{Executor, InterruptExecutor}; | 62 | use embassy_executor::{Executor, InterruptExecutor}; |
| 63 | use embassy_stm32::interrupt; | 63 | use embassy_stm32::interrupt; |
| 64 | use embassy_stm32::interrupt::{InterruptExt, Priority}; | 64 | use embassy_stm32::interrupt::{InterruptExt, Priority}; |
| 65 | use embassy_time::{Duration, Instant, Timer}; | 65 | use embassy_time::{Instant, Timer}; |
| 66 | use static_cell::StaticCell; | 66 | use static_cell::StaticCell; |
| 67 | use {defmt_rtt as _, panic_probe as _}; | 67 | use {defmt_rtt as _, panic_probe as _}; |
| 68 | 68 | ||
| @@ -70,7 +70,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 70 | async fn run_high() { | 70 | async fn run_high() { |
| 71 | loop { | 71 | loop { |
| 72 | // info!(" [high] tick!"); | 72 | // info!(" [high] tick!"); |
| 73 | Timer::after(Duration::from_ticks(27374)).await; | 73 | Timer::after_ticks(27374).await; |
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | 76 | ||
| @@ -87,7 +87,7 @@ async fn run_med() { | |||
| 87 | let ms = end.duration_since(start).as_ticks() / 33; | 87 | let ms = end.duration_since(start).as_ticks() / 33; |
| 88 | info!(" [med] done in {} ms", ms); | 88 | info!(" [med] done in {} ms", ms); |
| 89 | 89 | ||
| 90 | Timer::after(Duration::from_ticks(23421)).await; | 90 | Timer::after_ticks(23421).await; |
| 91 | } | 91 | } |
| 92 | } | 92 | } |
| 93 | 93 | ||
| @@ -104,7 +104,7 @@ async fn run_low() { | |||
| 104 | let ms = end.duration_since(start).as_ticks() / 33; | 104 | let ms = end.duration_since(start).as_ticks() / 33; |
| 105 | info!("[low] done in {} ms", ms); | 105 | info!("[low] done in {} ms", ms); |
| 106 | 106 | ||
| 107 | Timer::after(Duration::from_ticks(32983)).await; | 107 | Timer::after_ticks(32983).await; |
| 108 | } | 108 | } |
| 109 | } | 109 | } |
| 110 | 110 | ||
diff --git a/examples/stm32f0/src/bin/wdg.rs b/examples/stm32f0/src/bin/wdg.rs index a44b17528..b51dee8ee 100644 --- a/examples/stm32f0/src/bin/wdg.rs +++ b/examples/stm32f0/src/bin/wdg.rs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | use defmt::*; | 5 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::wdg::IndependentWatchdog; | 7 | use embassy_stm32::wdg::IndependentWatchdog; |
| 8 | use embassy_time::{Duration, Timer}; | 8 | use embassy_time::Timer; |
| 9 | use {defmt_rtt as _, panic_probe as _}; | 9 | use {defmt_rtt as _, panic_probe as _}; |
| 10 | 10 | ||
| 11 | #[embassy_executor::main] | 11 | #[embassy_executor::main] |
| @@ -19,7 +19,7 @@ async fn main(_spawner: Spawner) { | |||
| 19 | wdg.unleash(); | 19 | wdg.unleash(); |
| 20 | 20 | ||
| 21 | loop { | 21 | loop { |
| 22 | Timer::after(Duration::from_secs(1)).await; | 22 | Timer::after_secs(1).await; |
| 23 | wdg.pet(); | 23 | wdg.pet(); |
| 24 | } | 24 | } |
| 25 | } | 25 | } |
