diff options
| author | Steven Friedman <[email protected]> | 2025-04-08 09:17:54 -0400 |
|---|---|---|
| committer | Steven Friedman <[email protected]> | 2025-04-08 09:17:54 -0400 |
| commit | 3cb178e78e737fd83e78d04233e7e13f668f6c61 (patch) | |
| tree | abba9010d506cae4c7aef765ae7c6dc893ad12c7 | |
| parent | a23e971d313e8098b8d3a13f3ddf7629aa79a98c (diff) | |
Frequency display is now consistent
| -rw-r--r-- | embassy-stm32/src/adc/c0.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/adc/g4.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/adc/u5_adc4.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/adc/v4.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/h.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/embassy-stm32/src/adc/c0.rs b/embassy-stm32/src/adc/c0.rs index a9c1d8faf..a9f0da07e 100644 --- a/embassy-stm32/src/adc/c0.rs +++ b/embassy-stm32/src/adc/c0.rs | |||
| @@ -163,7 +163,7 @@ impl<'d, T: Instance> Adc<'d, T> { | |||
| 163 | T::common_regs().ccr().modify(|w| w.set_presc(prescaler.presc())); | 163 | T::common_regs().ccr().modify(|w| w.set_presc(prescaler.presc())); |
| 164 | 164 | ||
| 165 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); | 165 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); |
| 166 | debug!("ADC frequency set to {} Hz", frequency.0); | 166 | debug!("ADC frequency set to {} Hz", frequency); |
| 167 | 167 | ||
| 168 | if frequency > MAX_ADC_CLK_FREQ { | 168 | if frequency > MAX_ADC_CLK_FREQ { |
| 169 | panic!("Maximal allowed frequency for the ADC is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); | 169 | panic!("Maximal allowed frequency for the ADC is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); |
diff --git a/embassy-stm32/src/adc/g4.rs b/embassy-stm32/src/adc/g4.rs index 6b9182ad6..8d13c85be 100644 --- a/embassy-stm32/src/adc/g4.rs +++ b/embassy-stm32/src/adc/g4.rs | |||
| @@ -143,7 +143,7 @@ impl<'d, T: Instance> Adc<'d, T> { | |||
| 143 | T::common_regs().ccr().modify(|w| w.set_presc(prescaler.presc())); | 143 | T::common_regs().ccr().modify(|w| w.set_presc(prescaler.presc())); |
| 144 | 144 | ||
| 145 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); | 145 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); |
| 146 | info!("ADC frequency set to {} Hz", frequency.0); | 146 | info!("ADC frequency set to {} Hz", frequency); |
| 147 | 147 | ||
| 148 | if frequency > MAX_ADC_CLK_FREQ { | 148 | if frequency > MAX_ADC_CLK_FREQ { |
| 149 | panic!("Maximal allowed frequency for the ADC is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); | 149 | panic!("Maximal allowed frequency for the ADC is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); |
diff --git a/embassy-stm32/src/adc/u5_adc4.rs b/embassy-stm32/src/adc/u5_adc4.rs index a5cfbfdcf..eee500ef5 100644 --- a/embassy-stm32/src/adc/u5_adc4.rs +++ b/embassy-stm32/src/adc/u5_adc4.rs | |||
| @@ -193,7 +193,7 @@ impl<'d, T: Instance> Adc4<'d, T> { | |||
| 193 | T::regs().ccr().modify(|w| w.set_presc(prescaler.presc())); | 193 | T::regs().ccr().modify(|w| w.set_presc(prescaler.presc())); |
| 194 | 194 | ||
| 195 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); | 195 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); |
| 196 | info!("ADC4 frequency set to {} Hz", frequency.0); | 196 | info!("ADC4 frequency set to {} Hz", frequency); |
| 197 | 197 | ||
| 198 | if frequency > MAX_ADC_CLK_FREQ { | 198 | if frequency > MAX_ADC_CLK_FREQ { |
| 199 | panic!("Maximal allowed frequency for ADC4 is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); | 199 | panic!("Maximal allowed frequency for ADC4 is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); |
diff --git a/embassy-stm32/src/adc/v4.rs b/embassy-stm32/src/adc/v4.rs index 5910eef30..9bc8c9712 100644 --- a/embassy-stm32/src/adc/v4.rs +++ b/embassy-stm32/src/adc/v4.rs | |||
| @@ -166,7 +166,7 @@ impl<'d, T: Instance> Adc<'d, T> { | |||
| 166 | T::common_regs().ccr().modify(|w| w.set_presc(prescaler.presc())); | 166 | T::common_regs().ccr().modify(|w| w.set_presc(prescaler.presc())); |
| 167 | 167 | ||
| 168 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); | 168 | let frequency = Hertz(T::frequency().0 / prescaler.divisor()); |
| 169 | info!("ADC frequency set to {} Hz", frequency.0); | 169 | info!("ADC frequency set to {} Hz", frequency); |
| 170 | 170 | ||
| 171 | if frequency > MAX_ADC_CLK_FREQ { | 171 | if frequency > MAX_ADC_CLK_FREQ { |
| 172 | panic!("Maximal allowed frequency for the ADC is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); | 172 | panic!("Maximal allowed frequency for the ADC is {} MHz and it varies with different packages, refer to ST docs for more information.", MAX_ADC_CLK_FREQ.0 / 1_000_000 ); |
diff --git a/embassy-stm32/src/rcc/h.rs b/embassy-stm32/src/rcc/h.rs index d80fbeb1e..39af84ad3 100644 --- a/embassy-stm32/src/rcc/h.rs +++ b/embassy-stm32/src/rcc/h.rs | |||
| @@ -792,7 +792,7 @@ fn init_pll(num: usize, config: Option<Pll>, input: &PllInput) -> PllOutput { | |||
| 792 | } else if wide_allowed && VCO_WIDE_RANGE.contains(&vco_clk) { | 792 | } else if wide_allowed && VCO_WIDE_RANGE.contains(&vco_clk) { |
| 793 | Pllvcosel::WIDE_VCO | 793 | Pllvcosel::WIDE_VCO |
| 794 | } else { | 794 | } else { |
| 795 | panic!("pll vco_clk out of range: {} hz", vco_clk.0) | 795 | panic!("pll vco_clk out of range: {} hz", vco_clk) |
| 796 | }; | 796 | }; |
| 797 | 797 | ||
| 798 | let p = config.divp.map(|div| { | 798 | let p = config.divp.map(|div| { |
