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/stm32f334/src/bin | |
| parent | 7559f9e5834799b041d899767ef4305dcfdf0181 (diff) | |
time: Update examples, tests, and other code to use new Timer::after_x convenience methods
Diffstat (limited to 'examples/stm32f334/src/bin')
| -rw-r--r-- | examples/stm32f334/src/bin/adc.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f334/src/bin/button.rs | 6 | ||||
| -rw-r--r-- | examples/stm32f334/src/bin/hello.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f334/src/bin/opamp.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f334/src/bin/pwm.rs | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/examples/stm32f334/src/bin/adc.rs b/examples/stm32f334/src/bin/adc.rs index a9286c44c..f259135d2 100644 --- a/examples/stm32f334/src/bin/adc.rs +++ b/examples/stm32f334/src/bin/adc.rs | |||
| @@ -9,7 +9,7 @@ use embassy_stm32::peripherals::ADC1; | |||
| 9 | use embassy_stm32::rcc::{AdcClockSource, Adcpres}; | 9 | use embassy_stm32::rcc::{AdcClockSource, Adcpres}; |
| 10 | use embassy_stm32::time::mhz; | 10 | use embassy_stm32::time::mhz; |
| 11 | use embassy_stm32::{adc, bind_interrupts, Config}; | 11 | use embassy_stm32::{adc, bind_interrupts, Config}; |
| 12 | use embassy_time::{Delay, Duration, Timer}; | 12 | use embassy_time::{Delay, Timer}; |
| 13 | use {defmt_rtt as _, panic_probe as _}; | 13 | use {defmt_rtt as _, panic_probe as _}; |
| 14 | 14 | ||
| 15 | bind_interrupts!(struct Irqs { | 15 | bind_interrupts!(struct Irqs { |
| @@ -51,6 +51,6 @@ async fn main(_spawner: Spawner) -> ! { | |||
| 51 | let pin_mv = (pin as u32 * vrefint.value() as u32 / vref as u32) * 3300 / 4095; | 51 | let pin_mv = (pin as u32 * vrefint.value() as u32 / vref as u32) * 3300 / 4095; |
| 52 | info!("computed pin mv: {}", pin_mv); | 52 | info!("computed pin mv: {}", pin_mv); |
| 53 | 53 | ||
| 54 | Timer::after(Duration::from_millis(500)).await; | 54 | Timer::after_millis(500).await; |
| 55 | } | 55 | } |
| 56 | } | 56 | } |
diff --git a/examples/stm32f334/src/bin/button.rs b/examples/stm32f334/src/bin/button.rs index 599c0f27d..501fb080c 100644 --- a/examples/stm32f334/src/bin/button.rs +++ b/examples/stm32f334/src/bin/button.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 | #[embassy_executor::main] | 11 | #[embassy_executor::main] |
| @@ -17,10 +17,10 @@ async fn main(_spawner: Spawner) { | |||
| 17 | let mut out1 = Output::new(p.PA8, Level::Low, Speed::High); | 17 | let mut out1 = Output::new(p.PA8, Level::Low, Speed::High); |
| 18 | 18 | ||
| 19 | out1.set_high(); | 19 | out1.set_high(); |
| 20 | Timer::after(Duration::from_millis(500)).await; | 20 | Timer::after_millis(500).await; |
| 21 | out1.set_low(); | 21 | out1.set_low(); |
| 22 | 22 | ||
| 23 | Timer::after(Duration::from_millis(500)).await; | 23 | Timer::after_millis(500).await; |
| 24 | info!("end program"); | 24 | info!("end program"); |
| 25 | 25 | ||
| 26 | cortex_m::asm::bkpt(); | 26 | cortex_m::asm::bkpt(); |
diff --git a/examples/stm32f334/src/bin/hello.rs b/examples/stm32f334/src/bin/hello.rs index 65773210d..b3285f3c1 100644 --- a/examples/stm32f334/src/bin/hello.rs +++ b/examples/stm32f334/src/bin/hello.rs | |||
| @@ -6,7 +6,7 @@ use defmt::info; | |||
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::time::Hertz; | 7 | use embassy_stm32::time::Hertz; |
| 8 | use embassy_stm32::Config; | 8 | use embassy_stm32::Config; |
| 9 | use embassy_time::{Duration, Timer}; | 9 | use embassy_time::Timer; |
| 10 | use {defmt_rtt as _, panic_probe as _}; | 10 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 11 | ||
| 12 | #[embassy_executor::main] | 12 | #[embassy_executor::main] |
| @@ -18,6 +18,6 @@ async fn main(_spawner: Spawner) -> ! { | |||
| 18 | 18 | ||
| 19 | loop { | 19 | loop { |
| 20 | info!("Hello World!"); | 20 | info!("Hello World!"); |
| 21 | Timer::after(Duration::from_secs(1)).await; | 21 | Timer::after_secs(1).await; |
| 22 | } | 22 | } |
| 23 | } | 23 | } |
diff --git a/examples/stm32f334/src/bin/opamp.rs b/examples/stm32f334/src/bin/opamp.rs index fb5a85bcb..128001bf2 100644 --- a/examples/stm32f334/src/bin/opamp.rs +++ b/examples/stm32f334/src/bin/opamp.rs | |||
| @@ -10,7 +10,7 @@ use embassy_stm32::peripherals::ADC2; | |||
| 10 | use embassy_stm32::rcc::{AdcClockSource, Adcpres}; | 10 | use embassy_stm32::rcc::{AdcClockSource, Adcpres}; |
| 11 | use embassy_stm32::time::mhz; | 11 | use embassy_stm32::time::mhz; |
| 12 | use embassy_stm32::{adc, bind_interrupts, Config}; | 12 | use embassy_stm32::{adc, bind_interrupts, Config}; |
| 13 | use embassy_time::{Delay, Duration, Timer}; | 13 | use embassy_time::{Delay, Timer}; |
| 14 | use {defmt_rtt as _, panic_probe as _}; | 14 | use {defmt_rtt as _, panic_probe as _}; |
| 15 | 15 | ||
| 16 | bind_interrupts!(struct Irqs { | 16 | bind_interrupts!(struct Irqs { |
| @@ -54,6 +54,6 @@ async fn main(_spawner: Spawner) -> ! { | |||
| 54 | let pin_mv = (buffer as u32 * vrefint.value() as u32 / vref as u32) * 3300 / 4095; | 54 | let pin_mv = (buffer as u32 * vrefint.value() as u32 / vref as u32) * 3300 / 4095; |
| 55 | info!("computed pin mv: {}", pin_mv); | 55 | info!("computed pin mv: {}", pin_mv); |
| 56 | 56 | ||
| 57 | Timer::after(Duration::from_millis(500)).await; | 57 | Timer::after_millis(500).await; |
| 58 | } | 58 | } |
| 59 | } | 59 | } |
diff --git a/examples/stm32f334/src/bin/pwm.rs b/examples/stm32f334/src/bin/pwm.rs index aebc421b3..8040c3f18 100644 --- a/examples/stm32f334/src/bin/pwm.rs +++ b/examples/stm32f334/src/bin/pwm.rs | |||
| @@ -8,7 +8,7 @@ use embassy_stm32::hrtim::*; | |||
| 8 | use embassy_stm32::rcc::HrtimClockSource; | 8 | use embassy_stm32::rcc::HrtimClockSource; |
| 9 | use embassy_stm32::time::{khz, mhz}; | 9 | use embassy_stm32::time::{khz, mhz}; |
| 10 | use embassy_stm32::Config; | 10 | use embassy_stm32::Config; |
| 11 | use embassy_time::{Duration, Timer}; | 11 | use embassy_time::Timer; |
| 12 | use {defmt_rtt as _, panic_probe as _}; | 12 | use {defmt_rtt as _, panic_probe as _}; |
| 13 | 13 | ||
| 14 | #[embassy_executor::main] | 14 | #[embassy_executor::main] |
| @@ -48,7 +48,7 @@ async fn main(_spawner: Spawner) { | |||
| 48 | // .setr(0) | 48 | // .setr(0) |
| 49 | // .modify(|w| w.set_sst(Activeeffect::SETACTIVE)); | 49 | // .modify(|w| w.set_sst(Activeeffect::SETACTIVE)); |
| 50 | // | 50 | // |
| 51 | // Timer::after(Duration::from_millis(500)).await; | 51 | // Timer::after_millis(500).await; |
| 52 | // | 52 | // |
| 53 | // embassy_stm32::pac::HRTIM1 | 53 | // embassy_stm32::pac::HRTIM1 |
| 54 | // .tim(0) | 54 | // .tim(0) |
| @@ -65,7 +65,7 @@ async fn main(_spawner: Spawner) { | |||
| 65 | 65 | ||
| 66 | buck_converter.start(); | 66 | buck_converter.start(); |
| 67 | 67 | ||
| 68 | Timer::after(Duration::from_millis(500)).await; | 68 | Timer::after_millis(500).await; |
| 69 | 69 | ||
| 70 | info!("end program"); | 70 | info!("end program"); |
| 71 | 71 | ||
