time: Update examples, tests, and other code to use new Timer::after_x convenience methods

This commit is contained in:
Adam Greig
2023-10-15 00:57:25 +01:00
parent 7559f9e583
commit 0621e957a0
174 changed files with 496 additions and 501 deletions

View File

@ -7,7 +7,7 @@ use embassy_executor::Spawner;
use embassy_stm32::adc::{Adc, SampleTime};
use embassy_stm32::peripherals::ADC;
use embassy_stm32::{adc, bind_interrupts};
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
@ -36,6 +36,6 @@ async fn main(_spawner: Spawner) {
loop {
let v = adc.read(&mut pin).await;
info!("--> {} - {} mV", v, convert_to_millivolts(v));
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}

View File

@ -5,7 +5,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
// main is itself an async function.
@ -19,10 +19,10 @@ async fn main(_spawner: Spawner) {
loop {
info!("high");
led.set_high();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
info!("low");
led.set_low();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}

View File

@ -10,7 +10,7 @@ use defmt::info;
use embassy_executor::Spawner;
use embassy_stm32::exti::ExtiInput;
use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
static BLINK_MS: AtomicU32 = AtomicU32::new(0);
@ -24,7 +24,7 @@ async fn led_task(led: AnyPin) {
loop {
let del = BLINK_MS.load(Ordering::Relaxed);
info!("Value of del is {}", del);
Timer::after(Duration::from_millis(del.into())).await;
Timer::after_millis(del.into()).await;
info!("LED toggling");
led.toggle();
}

View File

@ -4,14 +4,14 @@
use defmt::info;
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
async fn main(_spawner: Spawner) -> ! {
let _p = embassy_stm32::init(Default::default());
loop {
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
info!("Hello");
}
}

View File

@ -62,7 +62,7 @@ use defmt::*;
use embassy_executor::{Executor, InterruptExecutor};
use embassy_stm32::interrupt;
use embassy_stm32::interrupt::{InterruptExt, Priority};
use embassy_time::{Duration, Instant, Timer};
use embassy_time::{Instant, Timer};
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@ -70,7 +70,7 @@ use {defmt_rtt as _, panic_probe as _};
async fn run_high() {
loop {
// info!(" [high] tick!");
Timer::after(Duration::from_ticks(27374)).await;
Timer::after_ticks(27374).await;
}
}
@ -87,7 +87,7 @@ async fn run_med() {
let ms = end.duration_since(start).as_ticks() / 33;
info!(" [med] done in {} ms", ms);
Timer::after(Duration::from_ticks(23421)).await;
Timer::after_ticks(23421).await;
}
}
@ -104,7 +104,7 @@ async fn run_low() {
let ms = end.duration_since(start).as_ticks() / 33;
info!("[low] done in {} ms", ms);
Timer::after(Duration::from_ticks(32983)).await;
Timer::after_ticks(32983).await;
}
}

View File

@ -5,7 +5,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::wdg::IndependentWatchdog;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -19,7 +19,7 @@ async fn main(_spawner: Spawner) {
wdg.unleash();
loop {
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
wdg.pet();
}
}