diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/stm32g0/src/bin/hf_timer.rs | 4 | ||||
| -rw-r--r-- | examples/stm32l1/src/bin/usb_serial.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/rng.rs | 4 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/rtc.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/spe_adin1110_http_server.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/usb_serial.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l5/src/bin/rng.rs | 4 | ||||
| -rw-r--r-- | examples/stm32l5/src/bin/usb_ethernet.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l5/src/bin/usb_hid_mouse.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l5/src/bin/usb_serial.rs | 2 | ||||
| -rw-r--r-- | examples/stm32u5/src/bin/usb_serial.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/random.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/rtc.rs | 2 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/uart_async.rs | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/examples/stm32g0/src/bin/hf_timer.rs b/examples/stm32g0/src/bin/hf_timer.rs index 78a779e29..3f63d0dfd 100644 --- a/examples/stm32g0/src/bin/hf_timer.rs +++ b/examples/stm32g0/src/bin/hf_timer.rs | |||
| @@ -5,7 +5,7 @@ use defmt::info; | |||
| 5 | use embassy_executor::Spawner; | 5 | use embassy_executor::Spawner; |
| 6 | use embassy_stm32::gpio::OutputType; | 6 | use embassy_stm32::gpio::OutputType; |
| 7 | use embassy_stm32::pac::rcc::vals::Tim1sel; | 7 | use embassy_stm32::pac::rcc::vals::Tim1sel; |
| 8 | use embassy_stm32::rcc::{ClockSrc, Config as RccConfig, PllConfig, PllSource, Pllm, Plln, Pllq, Pllr}; | 8 | use embassy_stm32::rcc::{Config as RccConfig, PllConfig, PllSource, Pllm, Plln, Pllq, Pllr, Sysclk}; |
| 9 | use embassy_stm32::time::khz; | 9 | use embassy_stm32::time::khz; |
| 10 | use embassy_stm32::timer::complementary_pwm::{ComplementaryPwm, ComplementaryPwmPin}; | 10 | use embassy_stm32::timer::complementary_pwm::{ComplementaryPwm, ComplementaryPwmPin}; |
| 11 | use embassy_stm32::timer::simple_pwm::PwmPin; | 11 | use embassy_stm32::timer::simple_pwm::PwmPin; |
| @@ -16,7 +16,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 16 | #[embassy_executor::main] | 16 | #[embassy_executor::main] |
| 17 | async fn main(_spawner: Spawner) { | 17 | async fn main(_spawner: Spawner) { |
| 18 | let mut rcc_config = RccConfig::default(); | 18 | let mut rcc_config = RccConfig::default(); |
| 19 | rcc_config.mux = ClockSrc::PLL(PllConfig { | 19 | rcc_config.sys = Sysclk::PLL(PllConfig { |
| 20 | source: PllSource::HSI, | 20 | source: PllSource::HSI, |
| 21 | m: Pllm::DIV1, | 21 | m: Pllm::DIV1, |
| 22 | n: Plln::MUL16, | 22 | n: Plln::MUL16, |
diff --git a/examples/stm32l1/src/bin/usb_serial.rs b/examples/stm32l1/src/bin/usb_serial.rs index 7b1e84cbc..f738ea358 100644 --- a/examples/stm32l1/src/bin/usb_serial.rs +++ b/examples/stm32l1/src/bin/usb_serial.rs | |||
| @@ -27,7 +27,7 @@ async fn main(_spawner: Spawner) { | |||
| 27 | mul: PllMul::MUL6, // PLLVCO = 16*6 = 96Mhz | 27 | mul: PllMul::MUL6, // PLLVCO = 16*6 = 96Mhz |
| 28 | div: PllDiv::DIV3, // 32Mhz clock (16 * 6 / 3) | 28 | div: PllDiv::DIV3, // 32Mhz clock (16 * 6 / 3) |
| 29 | }); | 29 | }); |
| 30 | config.rcc.mux = ClockSrc::PLL1_R; | 30 | config.rcc.sys = Sysclk::PLL1_R; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | let p = embassy_stm32::init(config); | 33 | let p = embassy_stm32::init(config); |
diff --git a/examples/stm32l4/src/bin/rng.rs b/examples/stm32l4/src/bin/rng.rs index 638b3e9e4..14d0e3c1e 100644 --- a/examples/stm32l4/src/bin/rng.rs +++ b/examples/stm32l4/src/bin/rng.rs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | use defmt::*; | 4 | use defmt::*; |
| 5 | use embassy_executor::Spawner; | 5 | use embassy_executor::Spawner; |
| 6 | use embassy_stm32::rcc::{ClockSrc, Pll, PllMul, PllPreDiv, PllQDiv, PllRDiv, PllSource}; | 6 | use embassy_stm32::rcc::{Pll, PllMul, PllPreDiv, PllQDiv, PllRDiv, PllSource, Sysclk}; |
| 7 | use embassy_stm32::rng::Rng; | 7 | use embassy_stm32::rng::Rng; |
| 8 | use embassy_stm32::{bind_interrupts, peripherals, rng, Config}; | 8 | use embassy_stm32::{bind_interrupts, peripherals, rng, Config}; |
| 9 | use {defmt_rtt as _, panic_probe as _}; | 9 | use {defmt_rtt as _, panic_probe as _}; |
| @@ -15,7 +15,7 @@ bind_interrupts!(struct Irqs { | |||
| 15 | #[embassy_executor::main] | 15 | #[embassy_executor::main] |
| 16 | async fn main(_spawner: Spawner) { | 16 | async fn main(_spawner: Spawner) { |
| 17 | let mut config = Config::default(); | 17 | let mut config = Config::default(); |
| 18 | config.rcc.mux = ClockSrc::PLL1_R; | 18 | config.rcc.sys = Sysclk::PLL1_R; |
| 19 | config.rcc.hsi = true; | 19 | config.rcc.hsi = true; |
| 20 | config.rcc.pll = Some(Pll { | 20 | config.rcc.pll = Some(Pll { |
| 21 | source: PllSource::HSI, | 21 | source: PllSource::HSI, |
diff --git a/examples/stm32l4/src/bin/rtc.rs b/examples/stm32l4/src/bin/rtc.rs index 526620bfb..a8a375ab4 100644 --- a/examples/stm32l4/src/bin/rtc.rs +++ b/examples/stm32l4/src/bin/rtc.rs | |||
| @@ -15,7 +15,7 @@ async fn main(_spawner: Spawner) { | |||
| 15 | let mut config = Config::default(); | 15 | let mut config = Config::default(); |
| 16 | { | 16 | { |
| 17 | use embassy_stm32::rcc::*; | 17 | use embassy_stm32::rcc::*; |
| 18 | config.rcc.mux = ClockSrc::PLL1_R; | 18 | config.rcc.sys = Sysclk::PLL1_R; |
| 19 | config.rcc.hse = Some(Hse { | 19 | config.rcc.hse = Some(Hse { |
| 20 | freq: Hertz::mhz(8), | 20 | freq: Hertz::mhz(8), |
| 21 | mode: HseMode::Oscillator, | 21 | mode: HseMode::Oscillator, |
diff --git a/examples/stm32l4/src/bin/spe_adin1110_http_server.rs b/examples/stm32l4/src/bin/spe_adin1110_http_server.rs index 026a3a477..32bfab6eb 100644 --- a/examples/stm32l4/src/bin/spe_adin1110_http_server.rs +++ b/examples/stm32l4/src/bin/spe_adin1110_http_server.rs | |||
| @@ -75,7 +75,7 @@ async fn main(spawner: Spawner) { | |||
| 75 | use embassy_stm32::rcc::*; | 75 | use embassy_stm32::rcc::*; |
| 76 | // 80Mhz clock (Source: 8 / SrcDiv: 1 * PllMul 20 / ClkDiv 2) | 76 | // 80Mhz clock (Source: 8 / SrcDiv: 1 * PllMul 20 / ClkDiv 2) |
| 77 | // 80MHz highest frequency for flash 0 wait. | 77 | // 80MHz highest frequency for flash 0 wait. |
| 78 | config.rcc.mux = ClockSrc::PLL1_R; | 78 | config.rcc.sys = Sysclk::PLL1_R; |
| 79 | config.rcc.hse = Some(Hse { | 79 | config.rcc.hse = Some(Hse { |
| 80 | freq: Hertz::mhz(8), | 80 | freq: Hertz::mhz(8), |
| 81 | mode: HseMode::Oscillator, | 81 | mode: HseMode::Oscillator, |
diff --git a/examples/stm32l4/src/bin/usb_serial.rs b/examples/stm32l4/src/bin/usb_serial.rs index 8cc9a7aed..9247e56a1 100644 --- a/examples/stm32l4/src/bin/usb_serial.rs +++ b/examples/stm32l4/src/bin/usb_serial.rs | |||
| @@ -23,7 +23,7 @@ async fn main(_spawner: Spawner) { | |||
| 23 | 23 | ||
| 24 | let mut config = Config::default(); | 24 | let mut config = Config::default(); |
| 25 | config.rcc.hsi48 = Some(Hsi48Config { sync_from_usb: true }); // needed for USB | 25 | config.rcc.hsi48 = Some(Hsi48Config { sync_from_usb: true }); // needed for USB |
| 26 | config.rcc.mux = ClockSrc::PLL1_R; | 26 | config.rcc.sys = Sysclk::PLL1_R; |
| 27 | config.rcc.hsi = true; | 27 | config.rcc.hsi = true; |
| 28 | config.rcc.pll = Some(Pll { | 28 | config.rcc.pll = Some(Pll { |
| 29 | source: PllSource::HSI, | 29 | source: PllSource::HSI, |
diff --git a/examples/stm32l5/src/bin/rng.rs b/examples/stm32l5/src/bin/rng.rs index 50da6c946..0a644e73d 100644 --- a/examples/stm32l5/src/bin/rng.rs +++ b/examples/stm32l5/src/bin/rng.rs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | use defmt::*; | 4 | use defmt::*; |
| 5 | use embassy_executor::Spawner; | 5 | use embassy_executor::Spawner; |
| 6 | use embassy_stm32::rcc::{ClockSrc, Pll, PllMul, PllPreDiv, PllRDiv, PllSource}; | 6 | use embassy_stm32::rcc::{Pll, PllMul, PllPreDiv, PllRDiv, PllSource, Sysclk}; |
| 7 | use embassy_stm32::rng::Rng; | 7 | use embassy_stm32::rng::Rng; |
| 8 | use embassy_stm32::{bind_interrupts, peripherals, rng, Config}; | 8 | use embassy_stm32::{bind_interrupts, peripherals, rng, Config}; |
| 9 | use {defmt_rtt as _, panic_probe as _}; | 9 | use {defmt_rtt as _, panic_probe as _}; |
| @@ -16,7 +16,7 @@ bind_interrupts!(struct Irqs { | |||
| 16 | async fn main(_spawner: Spawner) { | 16 | async fn main(_spawner: Spawner) { |
| 17 | let mut config = Config::default(); | 17 | let mut config = Config::default(); |
| 18 | config.rcc.hsi = true; | 18 | config.rcc.hsi = true; |
| 19 | config.rcc.mux = ClockSrc::PLL1_R; | 19 | config.rcc.sys = Sysclk::PLL1_R; |
| 20 | config.rcc.pll = Some(Pll { | 20 | config.rcc.pll = Some(Pll { |
| 21 | // 64Mhz clock (16 / 1 * 8 / 2) | 21 | // 64Mhz clock (16 / 1 * 8 / 2) |
| 22 | source: PllSource::HSI, | 22 | source: PllSource::HSI, |
diff --git a/examples/stm32l5/src/bin/usb_ethernet.rs b/examples/stm32l5/src/bin/usb_ethernet.rs index 88060b6b0..f6d8b16d0 100644 --- a/examples/stm32l5/src/bin/usb_ethernet.rs +++ b/examples/stm32l5/src/bin/usb_ethernet.rs | |||
| @@ -45,7 +45,7 @@ async fn net_task(stack: &'static Stack<Device<'static, MTU>>) -> ! { | |||
| 45 | async fn main(spawner: Spawner) { | 45 | async fn main(spawner: Spawner) { |
| 46 | let mut config = Config::default(); | 46 | let mut config = Config::default(); |
| 47 | config.rcc.hsi = true; | 47 | config.rcc.hsi = true; |
| 48 | config.rcc.mux = ClockSrc::PLL1_R; | 48 | config.rcc.sys = Sysclk::PLL1_R; |
| 49 | config.rcc.pll = Some(Pll { | 49 | config.rcc.pll = Some(Pll { |
| 50 | // 80Mhz clock (16 / 1 * 10 / 2) | 50 | // 80Mhz clock (16 / 1 * 10 / 2) |
| 51 | source: PllSource::HSI, | 51 | source: PllSource::HSI, |
diff --git a/examples/stm32l5/src/bin/usb_hid_mouse.rs b/examples/stm32l5/src/bin/usb_hid_mouse.rs index 7c8a8ebfb..c51ed96e0 100644 --- a/examples/stm32l5/src/bin/usb_hid_mouse.rs +++ b/examples/stm32l5/src/bin/usb_hid_mouse.rs | |||
| @@ -22,7 +22,7 @@ bind_interrupts!(struct Irqs { | |||
| 22 | async fn main(_spawner: Spawner) { | 22 | async fn main(_spawner: Spawner) { |
| 23 | let mut config = Config::default(); | 23 | let mut config = Config::default(); |
| 24 | config.rcc.hsi = true; | 24 | config.rcc.hsi = true; |
| 25 | config.rcc.mux = ClockSrc::PLL1_R; | 25 | config.rcc.sys = Sysclk::PLL1_R; |
| 26 | config.rcc.pll = Some(Pll { | 26 | config.rcc.pll = Some(Pll { |
| 27 | // 80Mhz clock (16 / 1 * 10 / 2) | 27 | // 80Mhz clock (16 / 1 * 10 / 2) |
| 28 | source: PllSource::HSI, | 28 | source: PllSource::HSI, |
diff --git a/examples/stm32l5/src/bin/usb_serial.rs b/examples/stm32l5/src/bin/usb_serial.rs index 75053ce4b..87987f2ce 100644 --- a/examples/stm32l5/src/bin/usb_serial.rs +++ b/examples/stm32l5/src/bin/usb_serial.rs | |||
| @@ -20,7 +20,7 @@ bind_interrupts!(struct Irqs { | |||
| 20 | async fn main(_spawner: Spawner) { | 20 | async fn main(_spawner: Spawner) { |
| 21 | let mut config = Config::default(); | 21 | let mut config = Config::default(); |
| 22 | config.rcc.hsi = true; | 22 | config.rcc.hsi = true; |
| 23 | config.rcc.mux = ClockSrc::PLL1_R; | 23 | config.rcc.sys = Sysclk::PLL1_R; |
| 24 | config.rcc.pll = Some(Pll { | 24 | config.rcc.pll = Some(Pll { |
| 25 | // 80Mhz clock (16 / 1 * 10 / 2) | 25 | // 80Mhz clock (16 / 1 * 10 / 2) |
| 26 | source: PllSource::HSI, | 26 | source: PllSource::HSI, |
diff --git a/examples/stm32u5/src/bin/usb_serial.rs b/examples/stm32u5/src/bin/usb_serial.rs index 99cdeacc9..61851e5a2 100644 --- a/examples/stm32u5/src/bin/usb_serial.rs +++ b/examples/stm32u5/src/bin/usb_serial.rs | |||
| @@ -32,7 +32,7 @@ async fn main(_spawner: Spawner) { | |||
| 32 | divq: None, | 32 | divq: None, |
| 33 | divr: Some(PllDiv::DIV1), // 160 MHz | 33 | divr: Some(PllDiv::DIV1), // 160 MHz |
| 34 | }); | 34 | }); |
| 35 | config.rcc.mux = ClockSrc::PLL1_R; | 35 | config.rcc.sys = Sysclk::PLL1_R; |
| 36 | config.rcc.voltage_range = VoltageScale::RANGE1; | 36 | config.rcc.voltage_range = VoltageScale::RANGE1; |
| 37 | config.rcc.hsi48 = Some(Hsi48Config { sync_from_usb: true }); // needed for USB | 37 | config.rcc.hsi48 = Some(Hsi48Config { sync_from_usb: true }); // needed for USB |
| 38 | } | 38 | } |
diff --git a/examples/stm32wl/src/bin/random.rs b/examples/stm32wl/src/bin/random.rs index 3610392be..8e9fe02b2 100644 --- a/examples/stm32wl/src/bin/random.rs +++ b/examples/stm32wl/src/bin/random.rs | |||
| @@ -22,7 +22,7 @@ async fn main(_spawner: Spawner) { | |||
| 22 | mode: HseMode::Bypass, | 22 | mode: HseMode::Bypass, |
| 23 | prescaler: HsePrescaler::DIV1, | 23 | prescaler: HsePrescaler::DIV1, |
| 24 | }); | 24 | }); |
| 25 | config.rcc.mux = ClockSrc::PLL1_R; | 25 | config.rcc.sys = Sysclk::PLL1_R; |
| 26 | config.rcc.pll = Some(Pll { | 26 | config.rcc.pll = Some(Pll { |
| 27 | source: PllSource::HSE, | 27 | source: PllSource::HSE, |
| 28 | prediv: PllPreDiv::DIV2, | 28 | prediv: PllPreDiv::DIV2, |
diff --git a/examples/stm32wl/src/bin/rtc.rs b/examples/stm32wl/src/bin/rtc.rs index 4738d5770..0c26426ef 100644 --- a/examples/stm32wl/src/bin/rtc.rs +++ b/examples/stm32wl/src/bin/rtc.rs | |||
| @@ -21,7 +21,7 @@ async fn main(_spawner: Spawner) { | |||
| 21 | mode: HseMode::Bypass, | 21 | mode: HseMode::Bypass, |
| 22 | prescaler: HsePrescaler::DIV1, | 22 | prescaler: HsePrescaler::DIV1, |
| 23 | }); | 23 | }); |
| 24 | config.rcc.mux = ClockSrc::PLL1_R; | 24 | config.rcc.sys = Sysclk::PLL1_R; |
| 25 | config.rcc.pll = Some(Pll { | 25 | config.rcc.pll = Some(Pll { |
| 26 | source: PllSource::HSE, | 26 | source: PllSource::HSE, |
| 27 | prediv: PllPreDiv::DIV2, | 27 | prediv: PllPreDiv::DIV2, |
diff --git a/examples/stm32wl/src/bin/uart_async.rs b/examples/stm32wl/src/bin/uart_async.rs index 8e545834c..3637243a0 100644 --- a/examples/stm32wl/src/bin/uart_async.rs +++ b/examples/stm32wl/src/bin/uart_async.rs | |||
| @@ -20,7 +20,7 @@ but can be surely changed for your needs. | |||
| 20 | #[embassy_executor::main] | 20 | #[embassy_executor::main] |
| 21 | async fn main(_spawner: Spawner) { | 21 | async fn main(_spawner: Spawner) { |
| 22 | let mut config = embassy_stm32::Config::default(); | 22 | let mut config = embassy_stm32::Config::default(); |
| 23 | config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE; | 23 | config.rcc.sys = embassy_stm32::rcc::Sysclk::HSE; |
| 24 | let p = embassy_stm32::init(config); | 24 | let p = embassy_stm32::init(config); |
| 25 | 25 | ||
| 26 | defmt::info!("Starting system"); | 26 | defmt::info!("Starting system"); |
