aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Bousquet <[email protected]>2024-05-29 00:53:09 -0400
committerBruno Bousquet <[email protected]>2024-05-29 00:53:09 -0400
commit66122aa60f2e1b23edaa4c46b3457bbdef72d4fc (patch)
tree7a81d6d4014edfa8073bf1ca7d41e797c4a81e51
parent69badfb845c0fb43b4e4c1c2e9f74a535fcd317a (diff)
parent61f1f80e90c3fd8ec505936f3bab0a50d2ba9b79 (diff)
Merge branch 'pwm_input_f103' into pwm_input
-rw-r--r--examples/stm32f1/src/bin/pwm_input.rs3
-rw-r--r--examples/stm32f4/src/bin/pwm_input.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/stm32f1/src/bin/pwm_input.rs b/examples/stm32f1/src/bin/pwm_input.rs
index 718bf0fcf..9ca44d048 100644
--- a/examples/stm32f1/src/bin/pwm_input.rs
+++ b/examples/stm32f1/src/bin/pwm_input.rs
@@ -6,7 +6,8 @@ use defmt::*;
6use embassy_executor::Spawner; 6use embassy_executor::Spawner;
7use embassy_stm32::gpio::{Level, Output, Pull, Speed}; 7use embassy_stm32::gpio::{Level, Output, Pull, Speed};
8use embassy_stm32::time::khz; 8use embassy_stm32::time::khz;
9use embassy_stm32::timer::{self, pwm_input::PwmInput}; 9use embassy_stm32::timer;
10use embassy_stm32::timer::pwm_input::PwmInput;
10use embassy_stm32::{bind_interrupts, peripherals}; 11use embassy_stm32::{bind_interrupts, peripherals};
11use embassy_time::Timer; 12use embassy_time::Timer;
12use {defmt_rtt as _, panic_probe as _}; 13use {defmt_rtt as _, panic_probe as _};
diff --git a/examples/stm32f4/src/bin/pwm_input.rs b/examples/stm32f4/src/bin/pwm_input.rs
index e57e58c22..98ea50df4 100644
--- a/examples/stm32f4/src/bin/pwm_input.rs
+++ b/examples/stm32f4/src/bin/pwm_input.rs
@@ -6,7 +6,8 @@ use defmt::*;
6use embassy_executor::Spawner; 6use embassy_executor::Spawner;
7use embassy_stm32::gpio::{Level, Output, Pull, Speed}; 7use embassy_stm32::gpio::{Level, Output, Pull, Speed};
8use embassy_stm32::time::khz; 8use embassy_stm32::time::khz;
9use embassy_stm32::timer::{self, pwm_input::PwmInput}; 9use embassy_stm32::timer;
10use embassy_stm32::timer::pwm_input::PwmInput;
10use embassy_stm32::{bind_interrupts, peripherals}; 11use embassy_stm32::{bind_interrupts, peripherals};
11use embassy_time::Timer; 12use embassy_time::Timer;
12use {defmt_rtt as _, panic_probe as _}; 13use {defmt_rtt as _, panic_probe as _};