diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-10-09 00:58:22 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-09 00:58:22 +0000 |
| commit | c3ef98a73d0a087b28a560dcbc1c03d45e50d853 (patch) | |
| tree | aaef02d5344086bde66725a853851546961520fa /examples/stm32h5/src | |
| parent | c4cff0b79bc54634db9d0fa24a24add49b7ec7fe (diff) | |
| parent | 6186fe08070c5f497d72586640db287193b41894 (diff) | |
Merge pull request #2026 from embassy-rs/stm32-pac-pll-enums
stm32/rcc: use PLL enums from PAC.
Diffstat (limited to 'examples/stm32h5/src')
| -rw-r--r-- | examples/stm32h5/src/bin/eth.rs | 12 | ||||
| -rw-r--r-- | examples/stm32h5/src/bin/usb_serial.rs | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/examples/stm32h5/src/bin/eth.rs b/examples/stm32h5/src/bin/eth.rs index 4e92d0647..2f4454761 100644 --- a/examples/stm32h5/src/bin/eth.rs +++ b/examples/stm32h5/src/bin/eth.rs | |||
| @@ -9,7 +9,9 @@ use embassy_net::{Ipv4Address, Stack, StackResources}; | |||
| 9 | use embassy_stm32::eth::generic_smi::GenericSMI; | 9 | use embassy_stm32::eth::generic_smi::GenericSMI; |
| 10 | use embassy_stm32::eth::{Ethernet, PacketQueue}; | 10 | use embassy_stm32::eth::{Ethernet, PacketQueue}; |
| 11 | use embassy_stm32::peripherals::ETH; | 11 | use embassy_stm32::peripherals::ETH; |
| 12 | use embassy_stm32::rcc::{AHBPrescaler, APBPrescaler, Hse, HseMode, Pll, PllSource, Sysclk, VoltageScale}; | 12 | use embassy_stm32::rcc::{ |
| 13 | AHBPrescaler, APBPrescaler, Hse, HseMode, Pll, PllDiv, PllMul, PllPreDiv, PllSource, Sysclk, VoltageScale, | ||
| 14 | }; | ||
| 13 | use embassy_stm32::rng::Rng; | 15 | use embassy_stm32::rng::Rng; |
| 14 | use embassy_stm32::time::Hertz; | 16 | use embassy_stm32::time::Hertz; |
| 15 | use embassy_stm32::{bind_interrupts, eth, peripherals, rng, Config}; | 17 | use embassy_stm32::{bind_interrupts, eth, peripherals, rng, Config}; |
| @@ -42,10 +44,10 @@ async fn main(spawner: Spawner) -> ! { | |||
| 42 | }); | 44 | }); |
| 43 | config.rcc.pll1 = Some(Pll { | 45 | config.rcc.pll1 = Some(Pll { |
| 44 | source: PllSource::Hse, | 46 | source: PllSource::Hse, |
| 45 | prediv: 2, | 47 | prediv: PllPreDiv::DIV2, |
| 46 | mul: 125, | 48 | mul: PllMul::MUL125, |
| 47 | divp: Some(2), | 49 | divp: Some(PllDiv::DIV2), |
| 48 | divq: Some(2), | 50 | divq: Some(PllDiv::DIV2), |
| 49 | divr: None, | 51 | divr: None, |
| 50 | }); | 52 | }); |
| 51 | config.rcc.ahb_pre = AHBPrescaler::DIV1; | 53 | config.rcc.ahb_pre = AHBPrescaler::DIV1; |
diff --git a/examples/stm32h5/src/bin/usb_serial.rs b/examples/stm32h5/src/bin/usb_serial.rs index cbe540a06..3b3c38e17 100644 --- a/examples/stm32h5/src/bin/usb_serial.rs +++ b/examples/stm32h5/src/bin/usb_serial.rs | |||
| @@ -4,7 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | use defmt::{panic, *}; | 5 | use defmt::{panic, *}; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::rcc::{AHBPrescaler, APBPrescaler, Hse, HseMode, Pll, PllSource, Sysclk, VoltageScale}; | 7 | use embassy_stm32::rcc::{ |
| 8 | AHBPrescaler, APBPrescaler, Hse, HseMode, Pll, PllDiv, PllMul, PllPreDiv, PllSource, Sysclk, VoltageScale, | ||
| 9 | }; | ||
| 8 | use embassy_stm32::time::Hertz; | 10 | use embassy_stm32::time::Hertz; |
| 9 | use embassy_stm32::usb::{Driver, Instance}; | 11 | use embassy_stm32::usb::{Driver, Instance}; |
| 10 | use embassy_stm32::{bind_interrupts, pac, peripherals, usb, Config}; | 12 | use embassy_stm32::{bind_interrupts, pac, peripherals, usb, Config}; |
| @@ -29,9 +31,9 @@ async fn main(_spawner: Spawner) { | |||
| 29 | }); | 31 | }); |
| 30 | config.rcc.pll1 = Some(Pll { | 32 | config.rcc.pll1 = Some(Pll { |
| 31 | source: PllSource::Hse, | 33 | source: PllSource::Hse, |
| 32 | prediv: 2, | 34 | prediv: PllPreDiv::DIV2, |
| 33 | mul: 125, | 35 | mul: PllMul::MUL125, |
| 34 | divp: Some(2), // 250mhz | 36 | divp: Some(PllDiv::DIV2), // 250mhz |
| 35 | divq: None, | 37 | divq: None, |
| 36 | divr: None, | 38 | divr: None, |
| 37 | }); | 39 | }); |
