diff options
| author | Bob McWhirter <[email protected]> | 2021-11-08 14:27:33 -0500 |
|---|---|---|
| committer | Bob McWhirter <[email protected]> | 2021-11-08 14:27:33 -0500 |
| commit | 12a64b867b22003ea42e9706f6a77f36bd00a814 (patch) | |
| tree | 5fd2767c6067f5a4e59a6c6b5b75287432ccd6d7 | |
| parent | 5f124ec49f82ae2a4163edb6f1a8bad7898ba823 (diff) | |
More support for U5 PWR (ish), RCC, and FLASH (ish).
| -rw-r--r-- | embassy-stm32/src/pwr/u5.rs | 1 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/u5/mod.rs | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/embassy-stm32/src/pwr/u5.rs b/embassy-stm32/src/pwr/u5.rs index b4b01ea39..a90659d9c 100644 --- a/embassy-stm32/src/pwr/u5.rs +++ b/embassy-stm32/src/pwr/u5.rs | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | use crate::pac::{PWR, RCC, SYSCFG}; | ||
| 2 | use crate::peripherals; | 1 | use crate::peripherals; |
| 3 | 2 | ||
| 4 | /// Voltage Scale | 3 | /// Voltage Scale |
diff --git a/embassy-stm32/src/rcc/u5/mod.rs b/embassy-stm32/src/rcc/u5/mod.rs index 0087f6993..6e68b2205 100644 --- a/embassy-stm32/src/rcc/u5/mod.rs +++ b/embassy-stm32/src/rcc/u5/mod.rs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | use crate::pac; | 1 | use crate::pac; |
| 2 | use crate::peripherals::{self, RCC}; | 2 | use crate::peripherals::{self, RCC}; |
| 3 | use crate::pwr::{Power, VoltageScale}; | 3 | use crate::pwr::{Power, VoltageScale}; |
| 4 | use crate::rcc::{get_freqs, set_freqs, Clocks}; | 4 | use crate::rcc::{set_freqs, Clocks}; |
| 5 | use crate::time::{Hertz, U32Ext}; | 5 | use crate::time::{Hertz, U32Ext}; |
| 6 | use stm32_metapac::rcc::vals::{Hpre, Msirange, Msirgsel, Pllm, Pllsrc, Ppre, Sw}; | 6 | use stm32_metapac::rcc::vals::{Hpre, Msirange, Msirgsel, Pllm, Pllsrc, Ppre, Sw}; |
| 7 | 7 | ||
| @@ -108,12 +108,6 @@ pub enum PllM { | |||
| 108 | Div16 = 0b1111, | 108 | Div16 = 0b1111, |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | impl PllM { | ||
| 112 | fn to_div(&self) -> u32 { | ||
| 113 | (*self as u32) + 1 | ||
| 114 | } | ||
| 115 | } | ||
| 116 | |||
| 117 | impl Into<Pllm> for PllM { | 111 | impl Into<Pllm> for PllM { |
| 118 | fn into(self) -> Pllm { | 112 | fn into(self) -> Pllm { |
| 119 | Pllm(self as u8) | 113 | Pllm(self as u8) |
| @@ -490,7 +484,7 @@ impl RccExt for RCC { | |||
| 490 | } | 484 | } |
| 491 | }; | 485 | }; |
| 492 | 486 | ||
| 493 | let (apb3_freq, apb3_tim_freq) = match cfgr.apb3_pre { | 487 | let (apb3_freq, _apb3_tim_freq) = match cfgr.apb3_pre { |
| 494 | APBPrescaler::NotDivided => (ahb_freq, ahb_freq), | 488 | APBPrescaler::NotDivided => (ahb_freq, ahb_freq), |
| 495 | pre => { | 489 | pre => { |
| 496 | let pre: u8 = pre.into(); | 490 | let pre: u8 = pre.into(); |
