time: Update examples, tests, and other code to use new Timer::after_x convenience methods
This commit is contained in:
@ -12,7 +12,7 @@ use embassy_executor::Spawner;
|
||||
use embassy_stm32::adc::Adc;
|
||||
use embassy_stm32::dac::{DacCh1, DacChannel, Value};
|
||||
use embassy_stm32::dma::NoDma;
|
||||
use embassy_time::{Delay, Duration, Timer};
|
||||
use embassy_time::{Delay, Timer};
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -38,7 +38,7 @@ async fn main(_spawner: Spawner) {
|
||||
|
||||
unwrap!(dac.set(Value::Bit8(0)));
|
||||
// Now wait a little to obtain a stable value
|
||||
Timer::after(Duration::from_millis(30)).await;
|
||||
Timer::after_millis(30).await;
|
||||
let offset = adc.read(&mut unsafe { embassy_stm32::Peripherals::steal() }.PA4);
|
||||
|
||||
for v in 0..=255 {
|
||||
@ -47,7 +47,7 @@ async fn main(_spawner: Spawner) {
|
||||
unwrap!(dac.set(Value::Bit8(dac_output_val)));
|
||||
|
||||
// Now wait a little to obtain a stable value
|
||||
Timer::after(Duration::from_millis(30)).await;
|
||||
Timer::after_millis(30).await;
|
||||
|
||||
// Need to steal the peripherals here because PA4 is obviously in use already
|
||||
let measured = adc.read(&mut unsafe { embassy_stm32::Peripherals::steal() }.PA4);
|
||||
|
@ -12,7 +12,7 @@ use defmt::assert;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::rcc::LsConfig;
|
||||
use embassy_stm32::rtc::{Rtc, RtcConfig};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
|
||||
#[embassy_executor::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
@ -32,7 +32,7 @@ async fn main(_spawner: Spawner) {
|
||||
rtc.set_datetime(now.into()).expect("datetime not set");
|
||||
|
||||
info!("Waiting 5 seconds");
|
||||
Timer::after(Duration::from_millis(5000)).await;
|
||||
Timer::after_millis(5000).await;
|
||||
|
||||
let then: NaiveDateTime = rtc.now().unwrap().into();
|
||||
let seconds = (then - now).num_seconds();
|
||||
|
@ -14,7 +14,7 @@ use embassy_stm32::low_power::{stop_with_rtc, Executor};
|
||||
use embassy_stm32::rcc::LsConfig;
|
||||
use embassy_stm32::rtc::{Rtc, RtcConfig};
|
||||
use embassy_stm32::Config;
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use static_cell::make_static;
|
||||
|
||||
#[entry]
|
||||
@ -28,7 +28,7 @@ fn main() -> ! {
|
||||
async fn task_1() {
|
||||
for _ in 0..9 {
|
||||
info!("task 1: waiting for 500ms...");
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ async fn task_1() {
|
||||
async fn task_2() {
|
||||
for _ in 0..5 {
|
||||
info!("task 2: waiting for 1000ms...");
|
||||
Timer::after(Duration::from_millis(1000)).await;
|
||||
Timer::after_millis(1000).await;
|
||||
}
|
||||
|
||||
info!("Test OK");
|
||||
|
@ -7,7 +7,7 @@ mod common;
|
||||
use common::*;
|
||||
use defmt::assert;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_time::{Duration, Instant, Timer};
|
||||
use embassy_time::{Instant, Timer};
|
||||
|
||||
#[embassy_executor::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
@ -15,7 +15,7 @@ async fn main(_spawner: Spawner) {
|
||||
info!("Hello World!");
|
||||
|
||||
let start = Instant::now();
|
||||
Timer::after(Duration::from_millis(100)).await;
|
||||
Timer::after_millis(100).await;
|
||||
let end = Instant::now();
|
||||
let ms = (end - start).as_millis();
|
||||
info!("slept for {} ms", ms);
|
||||
|
@ -10,7 +10,7 @@ use common::*;
|
||||
use defmt::{assert_eq, panic};
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::usart::{Config, DataBits, Parity, RingBufferedUartRx, StopBits, Uart, UartTx};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use rand_chacha::ChaCha8Rng;
|
||||
use rand_core::{RngCore, SeedableRng};
|
||||
|
||||
@ -54,7 +54,7 @@ async fn main(spawner: Spawner) {
|
||||
#[embassy_executor::task]
|
||||
async fn transmit_task(mut tx: UartTx<'static, peris::UART, peris::UART_TX_DMA>) {
|
||||
// workaround https://github.com/embassy-rs/embassy/issues/1426
|
||||
Timer::after(Duration::from_millis(100) as _).await;
|
||||
Timer::after_millis(100).await;
|
||||
|
||||
let mut rng = ChaCha8Rng::seed_from_u64(1337);
|
||||
|
||||
@ -70,7 +70,7 @@ async fn transmit_task(mut tx: UartTx<'static, peris::UART, peris::UART_TX_DMA>)
|
||||
}
|
||||
|
||||
tx.write(&buf[..len]).await.unwrap();
|
||||
Timer::after(Duration::from_micros((rng.next_u32() % 1000) as _)).await;
|
||||
Timer::after_micros((rng.next_u32() % 1000) as _).await;
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,7 +98,7 @@ async fn receive_task(mut rx: RingBufferedUartRx<'static, peris::UART, peris::UA
|
||||
}
|
||||
|
||||
if received < max_len {
|
||||
Timer::after(Duration::from_micros((rng.next_u32() % 1000) as _)).await;
|
||||
Timer::after_micros((rng.next_u32() % 1000) as _).await;
|
||||
}
|
||||
|
||||
i += received;
|
||||
|
Reference in New Issue
Block a user