diff options
| author | xoviat <[email protected]> | 2023-06-30 18:33:22 -0500 |
|---|---|---|
| committer | xoviat <[email protected]> | 2023-06-30 18:33:22 -0500 |
| commit | 6e13f5b387d8f0f948b5874bc300925b015947d9 (patch) | |
| tree | 1c62b80f11c357013702560d8c37421366eb4662 | |
| parent | c07854fed8f6ba38d418ef63853769a9af109bff (diff) | |
rustfmt
| -rw-r--r-- | embassy-stm32/src/pwm/mod.rs | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/f3.rs | 1 | ||||
| -rw-r--r-- | embassy-stm32/src/timer/mod.rs | 3 | ||||
| -rw-r--r-- | examples/stm32f334/src/bin/pwm.rs | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/embassy-stm32/src/pwm/mod.rs b/embassy-stm32/src/pwm/mod.rs index 2586dc153..d09e38d0e 100644 --- a/embassy-stm32/src/pwm/mod.rs +++ b/embassy-stm32/src/pwm/mod.rs | |||
| @@ -3,9 +3,6 @@ pub mod advanced_pwm; | |||
| 3 | pub mod complementary_pwm; | 3 | pub mod complementary_pwm; |
| 4 | pub mod simple_pwm; | 4 | pub mod simple_pwm; |
| 5 | 5 | ||
| 6 | #[cfg(hrtim_v1)] | ||
| 7 | use core::ops; | ||
| 8 | |||
| 9 | use stm32_metapac::timer::vals::Ckd; | 6 | use stm32_metapac::timer::vals::Ckd; |
| 10 | 7 | ||
| 11 | #[cfg(hrtim_v1)] | 8 | #[cfg(hrtim_v1)] |
| @@ -402,7 +399,6 @@ foreach_interrupt! { | |||
| 402 | } | 399 | } |
| 403 | 400 | ||
| 404 | fn set_channel_dead_time(channel: usize, dead_time: u16) { | 401 | fn set_channel_dead_time(channel: usize, dead_time: u16) { |
| 405 | use crate::rcc::sealed::RccPeripheral; | ||
| 406 | use crate::timer::sealed::HighResolutionControlInstance; | 402 | use crate::timer::sealed::HighResolutionControlInstance; |
| 407 | 403 | ||
| 408 | let regs = Self::regs(); | 404 | let regs = Self::regs(); |
diff --git a/embassy-stm32/src/rcc/f3.rs b/embassy-stm32/src/rcc/f3.rs index 2deee80d6..321270a70 100644 --- a/embassy-stm32/src/rcc/f3.rs +++ b/embassy-stm32/src/rcc/f3.rs | |||
| @@ -264,6 +264,7 @@ fn calc_pll(config: &Config, Hertz(sysclk): Hertz) -> (Hertz, PllConfig) { | |||
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | #[inline] | 266 | #[inline] |
| 267 | #[allow(unused_variables)] | ||
| 267 | fn get_usb_pre(config: &Config, sysclk: u32, pclk1: u32, pll_config: &Option<PllConfig>) -> Usbpre { | 268 | fn get_usb_pre(config: &Config, sysclk: u32, pclk1: u32, pll_config: &Option<PllConfig>) -> Usbpre { |
| 268 | cfg_if::cfg_if! { | 269 | cfg_if::cfg_if! { |
| 269 | // Some chips do not have USB | 270 | // Some chips do not have USB |
diff --git a/embassy-stm32/src/timer/mod.rs b/embassy-stm32/src/timer/mod.rs index 89cb16668..a92f854ec 100644 --- a/embassy-stm32/src/timer/mod.rs +++ b/embassy-stm32/src/timer/mod.rs | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | #[cfg(hrtim_v1)] | ||
| 2 | use core::ops; | ||
| 3 | |||
| 4 | use stm32_metapac::timer::vals; | 1 | use stm32_metapac::timer::vals; |
| 5 | 2 | ||
| 6 | use crate::interrupt; | 3 | use crate::interrupt; |
diff --git a/examples/stm32f334/src/bin/pwm.rs b/examples/stm32f334/src/bin/pwm.rs index 20a621372..1b5d509e7 100644 --- a/examples/stm32f334/src/bin/pwm.rs +++ b/examples/stm32f334/src/bin/pwm.rs | |||
| @@ -5,9 +5,7 @@ | |||
| 5 | use defmt::*; | 5 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::pwm::advanced_pwm::*; | 7 | use embassy_stm32::pwm::advanced_pwm::*; |
| 8 | use embassy_stm32::pwm::Channel; | ||
| 9 | use embassy_stm32::time::khz; | 8 | use embassy_stm32::time::khz; |
| 10 | use embassy_time::{Duration, Timer}; | ||
| 11 | use {defmt_rtt as _, panic_probe as _}; | 9 | use {defmt_rtt as _, panic_probe as _}; |
| 12 | 10 | ||
| 13 | #[embassy_executor::main] | 11 | #[embassy_executor::main] |
| @@ -17,7 +15,7 @@ async fn main(_spawner: Spawner) { | |||
| 17 | 15 | ||
| 18 | let ch1 = PwmPin::new_cha(p.PA8); | 16 | let ch1 = PwmPin::new_cha(p.PA8); |
| 19 | let ch1n = ComplementaryPwmPin::new_cha(p.PA9); | 17 | let ch1n = ComplementaryPwmPin::new_cha(p.PA9); |
| 20 | let mut pwm = AdvancedPwm::new( | 18 | let pwm = AdvancedPwm::new( |
| 21 | p.HRTIM1, | 19 | p.HRTIM1, |
| 22 | Some(ch1), | 20 | Some(ch1), |
| 23 | Some(ch1n), | 21 | Some(ch1n), |
