diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-10-11 00:12:33 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-10-11 00:12:33 +0200 |
| commit | 0cfa8d1bb5807b25612ab21b9894fd59002e6dab (patch) | |
| tree | 5c605b75dcae810c088c8e704551abe3fd85e0db /examples | |
| parent | eff73d6dfa4c5920a55a5ee2bf5c0b2ef68fbae1 (diff) | |
stm32/rcc: use more PLL etc enums from PAC.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/stm32f334/src/bin/adc.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f334/src/bin/opamp.rs | 4 | ||||
| -rw-r--r-- | examples/stm32g4/src/bin/adc.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/stm32f334/src/bin/adc.rs b/examples/stm32f334/src/bin/adc.rs index ed246a7db..a9286c44c 100644 --- a/examples/stm32f334/src/bin/adc.rs +++ b/examples/stm32f334/src/bin/adc.rs | |||
| @@ -6,7 +6,7 @@ use defmt::info; | |||
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::adc::{Adc, SampleTime}; | 7 | use embassy_stm32::adc::{Adc, SampleTime}; |
| 8 | use embassy_stm32::peripherals::ADC1; | 8 | use embassy_stm32::peripherals::ADC1; |
| 9 | use embassy_stm32::rcc::AdcClockSource; | 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, Duration, Timer}; |
| @@ -23,7 +23,7 @@ async fn main(_spawner: Spawner) -> ! { | |||
| 23 | config.rcc.hclk = Some(mhz(64)); | 23 | config.rcc.hclk = Some(mhz(64)); |
| 24 | config.rcc.pclk1 = Some(mhz(32)); | 24 | config.rcc.pclk1 = Some(mhz(32)); |
| 25 | config.rcc.pclk2 = Some(mhz(64)); | 25 | config.rcc.pclk2 = Some(mhz(64)); |
| 26 | config.rcc.adc = Some(AdcClockSource::PllDiv1); | 26 | config.rcc.adc = Some(AdcClockSource::Pll(Adcpres::DIV1)); |
| 27 | 27 | ||
| 28 | let mut p = embassy_stm32::init(config); | 28 | let mut p = embassy_stm32::init(config); |
| 29 | 29 | ||
diff --git a/examples/stm32f334/src/bin/opamp.rs b/examples/stm32f334/src/bin/opamp.rs index 3fffcfb1f..fb5a85bcb 100644 --- a/examples/stm32f334/src/bin/opamp.rs +++ b/examples/stm32f334/src/bin/opamp.rs | |||
| @@ -7,7 +7,7 @@ use embassy_executor::Spawner; | |||
| 7 | use embassy_stm32::adc::{Adc, SampleTime}; | 7 | use embassy_stm32::adc::{Adc, SampleTime}; |
| 8 | use embassy_stm32::opamp::{OpAmp, OpAmpGain}; | 8 | use embassy_stm32::opamp::{OpAmp, OpAmpGain}; |
| 9 | use embassy_stm32::peripherals::ADC2; | 9 | use embassy_stm32::peripherals::ADC2; |
| 10 | use embassy_stm32::rcc::AdcClockSource; | 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, Duration, Timer}; |
| @@ -24,7 +24,7 @@ async fn main(_spawner: Spawner) -> ! { | |||
| 24 | config.rcc.hclk = Some(mhz(64)); | 24 | config.rcc.hclk = Some(mhz(64)); |
| 25 | config.rcc.pclk1 = Some(mhz(32)); | 25 | config.rcc.pclk1 = Some(mhz(32)); |
| 26 | config.rcc.pclk2 = Some(mhz(64)); | 26 | config.rcc.pclk2 = Some(mhz(64)); |
| 27 | config.rcc.adc = Some(AdcClockSource::PllDiv1); | 27 | config.rcc.adc = Some(AdcClockSource::Pll(Adcpres::DIV1)); |
| 28 | 28 | ||
| 29 | let mut p = embassy_stm32::init(config); | 29 | let mut p = embassy_stm32::init(config); |
| 30 | 30 | ||
diff --git a/examples/stm32g4/src/bin/adc.rs b/examples/stm32g4/src/bin/adc.rs index da9b18a0e..30a112b7e 100644 --- a/examples/stm32g4/src/bin/adc.rs +++ b/examples/stm32g4/src/bin/adc.rs | |||
| @@ -24,7 +24,7 @@ async fn main(_spawner: Spawner) { | |||
| 24 | div_r: Some(PllR::DIV2), | 24 | div_r: Some(PllR::DIV2), |
| 25 | }); | 25 | }); |
| 26 | 26 | ||
| 27 | config.rcc.adc12_clock_source = AdcClockSource::SysClk; | 27 | config.rcc.adc12_clock_source = AdcClockSource::SYSCLK; |
| 28 | config.rcc.mux = ClockSrc::PLL; | 28 | config.rcc.mux = ClockSrc::PLL; |
| 29 | 29 | ||
| 30 | let mut p = embassy_stm32::init(config); | 30 | let mut p = embassy_stm32::init(config); |
