max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/stm32h7/src/bin/adc.rs
View File

@ -6,7 +6,7 @@ use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::adc::{Adc, SampleTime};
use embassy_stm32::Config;
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -55,6 +55,6 @@ async fn main(_spawner: Spawner) {
info!("vrefint: {}", vrefint);
let measured = adc.read(&mut p.PC0);
info!("measured: {}", measured);
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

6
examples/stm32h7/src/bin/blinky.rs
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 _};
#[embassy_executor::main]
@ -18,10 +18,10 @@ async fn main(_spawner: Spawner) {
loop {
info!("high");
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
info!("low");
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

12
examples/stm32h7/src/bin/camera.rs
View File

@ -9,7 +9,7 @@ use embassy_stm32::i2c::I2c;
use embassy_stm32::rcc::{Mco, Mco1Source, McoPrescaler};
use embassy_stm32::time::khz;
use embassy_stm32::{bind_interrupts, i2c, peripherals, Config};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use ov7725::*;
use {defmt_rtt as _, panic_probe as _};
@ -86,11 +86,11 @@ async fn main(_spawner: Spawner) {
loop {
defmt::info!("high");
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
defmt::info!("low");
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}
@ -99,7 +99,7 @@ mod ov7725 {
use defmt::Format;
use embassy_stm32::rcc::{Mco, McoInstance};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_hal_async::i2c::I2c;
#[repr(u8)]
@ -210,9 +210,9 @@ mod ov7725 {
}
pub async fn init(&mut self) -> Result<(), Error<Bus::Error>> {
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
self.reset_regs().await?;
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
self.set_pixformat().await?;
self.set_resolution().await?;
Ok(())

6
examples/stm32h7/src/bin/eth.rs
View File

@ -11,7 +11,7 @@ use embassy_stm32::eth::{Ethernet, PacketQueue};
use embassy_stm32::peripherals::ETH;
use embassy_stm32::rng::Rng;
use embassy_stm32::{bind_interrupts, eth, peripherals, rng, Config};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_io_async::Write;
use rand_core::RngCore;
use static_cell::make_static;
@ -118,7 +118,7 @@ async fn main(spawner: Spawner) -> ! {
let r = socket.connect(remote_endpoint).await;
if let Err(e) = r {
info!("connect error: {:?}", e);
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
continue;
}
info!("connected!");
@ -128,7 +128,7 @@ async fn main(spawner: Spawner) -> ! {
info!("write error: {:?}", e);
break;
}
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}
}

6
examples/stm32h7/src/bin/eth_client.rs
View File

@ -11,7 +11,7 @@ use embassy_stm32::eth::{Ethernet, PacketQueue};
use embassy_stm32::peripherals::ETH;
use embassy_stm32::rng::Rng;
use embassy_stm32::{bind_interrupts, eth, peripherals, rng, Config};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_io_async::Write;
use embedded_nal_async::{Ipv4Addr, SocketAddr, SocketAddrV4, TcpConnect};
use rand_core::RngCore;
@ -115,7 +115,7 @@ async fn main(spawner: Spawner) -> ! {
let r = client.connect(addr).await;
if let Err(e) = r {
info!("connect error: {:?}", e);
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
continue;
}
let mut connection = r.unwrap();
@ -126,7 +126,7 @@ async fn main(spawner: Spawner) -> ! {
info!("write error: {:?}", e);
break;
}
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}
}

4
examples/stm32h7/src/bin/flash.rs
View File

@ -5,7 +5,7 @@
use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_stm32::flash::Flash;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -16,7 +16,7 @@ async fn main(_spawner: Spawner) {
const ADDR: u32 = 0; // This is the offset into bank 2, the absolute address is 0x8_0000
// wait a bit before accessing the flash
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
let mut f = Flash::new_blocking(p.FLASH).into_blocking_regions().bank2_region;

4
examples/stm32h7/src/bin/fmc.rs
View File

@ -6,7 +6,7 @@ use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::fmc::Fmc;
use embassy_stm32::Config;
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -212,6 +212,6 @@ async fn main(_spawner: Spawner) {
info!("Assertions succeeded.");
loop {
Timer::after(Duration::from_millis(1000)).await;
Timer::after_millis(1000).await;
}
}

10
examples/stm32h7/src/bin/low_level_timer_api.rs
View File

@ -9,7 +9,7 @@ use embassy_stm32::gpio::Speed;
use embassy_stm32::time::{khz, Hertz};
use embassy_stm32::timer::*;
use embassy_stm32::{into_ref, Config, Peripheral, PeripheralRef};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -49,13 +49,13 @@ async fn main(_spawner: Spawner) {
loop {
pwm.set_duty(Channel::Ch1, 0);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
pwm.set_duty(Channel::Ch1, max / 4);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
pwm.set_duty(Channel::Ch1, max / 2);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
pwm.set_duty(Channel::Ch1, max - 1);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}
pub struct SimplePwm32<'d, T: CaptureCompare32bitInstance> {

6
examples/stm32h7/src/bin/mco.rs
View File

@ -6,7 +6,7 @@ use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::rcc::{Mco, Mco1Source, McoPrescaler};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -21,10 +21,10 @@ async fn main(_spawner: Spawner) {
loop {
info!("high");
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
info!("low");
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

10
examples/stm32h7/src/bin/pwm.rs
View File

@ -9,7 +9,7 @@ use embassy_stm32::time::khz;
use embassy_stm32::timer::simple_pwm::{PwmPin, SimplePwm};
use embassy_stm32::timer::Channel;
use embassy_stm32::Config;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -48,12 +48,12 @@ async fn main(_spawner: Spawner) {
loop {
pwm.set_duty(Channel::Ch1, 0);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
pwm.set_duty(Channel::Ch1, max / 4);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
pwm.set_duty(Channel::Ch1, max / 2);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
pwm.set_duty(Channel::Ch1, max - 1);
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}

4
examples/stm32h7/src/bin/rtc.rs
View File

@ -8,7 +8,7 @@ use embassy_executor::Spawner;
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 {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -30,7 +30,7 @@ async fn main(_spawner: Spawner) {
rtc.set_datetime(now.into()).expect("datetime not set");
// In reality the delay would be much longer
Timer::after(Duration::from_millis(20000)).await;
Timer::after_millis(20000).await;
let then: NaiveDateTime = rtc.now().unwrap().into();
info!("Got RTC! {:?}", then.timestamp());

4
examples/stm32h7/src/bin/signal.rs
View File

@ -6,7 +6,7 @@ use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
use embassy_sync::signal::Signal;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
static SIGNAL: Signal<CriticalSectionRawMutex, u32> = Signal::new();
@ -16,7 +16,7 @@ async fn my_sending_task() {
let mut counter: u32 = 0;
loop {
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
SIGNAL.signal(counter);

4
examples/stm32h7/src/bin/wdg.rs
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]
@ -18,7 +18,7 @@ async fn main(_spawner: Spawner) {
wdg.unleash();
loop {
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
wdg.pet();
}
}