From cdc66e110f084a27b2bae61d0611c884fcc5f845 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Tue, 4 Jan 2022 11:18:59 +0100 Subject: stm32/rcc: remove builders on Config. This makes API consistent with other Config structs in Embassy, where the convention is to not use builders. --- examples/stm32l0/src/bin/lorawan.rs | 2 +- examples/stm32l4/src/bin/rng.rs | 4 ++-- examples/stm32wl55/src/bin/lorawan.rs | 2 +- examples/stm32wl55/src/bin/subghz.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/stm32l0/src/bin/lorawan.rs b/examples/stm32l0/src/bin/lorawan.rs index cbae88356..7ce859a8d 100644 --- a/examples/stm32l0/src/bin/lorawan.rs +++ b/examples/stm32l0/src/bin/lorawan.rs @@ -25,7 +25,7 @@ use lorawan_encoding::default_crypto::DefaultFactory as Crypto; fn config() -> embassy_stm32::Config { let mut config = embassy_stm32::Config::default(); - config.rcc = config.rcc.clock_src(embassy_stm32::rcc::ClockSrc::HSI16); + config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16; config } diff --git a/examples/stm32l4/src/bin/rng.rs b/examples/stm32l4/src/bin/rng.rs index ee5f579f8..c60b1d8bc 100644 --- a/examples/stm32l4/src/bin/rng.rs +++ b/examples/stm32l4/src/bin/rng.rs @@ -14,13 +14,13 @@ use example_common::*; fn config() -> Config { let mut config = Config::default(); - config.rcc = config.rcc.clock_src(ClockSrc::PLL( + config.rcc.mux = ClockSrc::PLL( PLLSource::HSI16, PLLClkDiv::Div2, PLLSrcDiv::Div1, PLLMul::Mul8, Some(PLLClkDiv::Div2), - )); + ); config } diff --git a/examples/stm32wl55/src/bin/lorawan.rs b/examples/stm32wl55/src/bin/lorawan.rs index 155905ae7..7048a5814 100644 --- a/examples/stm32wl55/src/bin/lorawan.rs +++ b/examples/stm32wl55/src/bin/lorawan.rs @@ -23,7 +23,7 @@ use lorawan_encoding::default_crypto::DefaultFactory as Crypto; fn config() -> embassy_stm32::Config { let mut config = embassy_stm32::Config::default(); - config.rcc = config.rcc.clock_src(embassy_stm32::rcc::ClockSrc::HSI16); + config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16; config } diff --git a/examples/stm32wl55/src/bin/subghz.rs b/examples/stm32wl55/src/bin/subghz.rs index 89549c766..a73c361c2 100644 --- a/examples/stm32wl55/src/bin/subghz.rs +++ b/examples/stm32wl55/src/bin/subghz.rs @@ -66,7 +66,7 @@ const TX_PARAMS: TxParams = TxParams::new() fn config() -> embassy_stm32::Config { let mut config = embassy_stm32::Config::default(); - config.rcc = config.rcc.clock_src(embassy_stm32::rcc::ClockSrc::HSE32); + config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSE32; config } -- cgit From 89b009b11d7c45533f53a41c6586ba514cf7be58 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Tue, 4 Jan 2022 11:22:08 +0100 Subject: stm32h7/rcc: remove unneeded DMA enable settings. These are automatically enabled by dma::init(). --- examples/stm32h7/src/bin/camera.rs | 2 -- examples/stm32h7/src/example_common.rs | 1 - 2 files changed, 3 deletions(-) (limited to 'examples') diff --git a/examples/stm32h7/src/bin/camera.rs b/examples/stm32h7/src/bin/camera.rs index 2fa742b83..d94592071 100644 --- a/examples/stm32h7/src/bin/camera.rs +++ b/examples/stm32h7/src/bin/camera.rs @@ -34,8 +34,6 @@ pub fn config() -> Config { config.rcc.sys_ck = Some(400.mhz().into()); config.rcc.hclk = Some(400.mhz().into()); config.rcc.pll1.q_ck = Some(100.mhz().into()); - config.rcc.enable_dma1 = true; - config.rcc.enable_dma2 = true; config.rcc.pclk1 = Some(100.mhz().into()); config.rcc.pclk2 = Some(100.mhz().into()); config.rcc.pclk3 = Some(100.mhz().into()); diff --git a/examples/stm32h7/src/example_common.rs b/examples/stm32h7/src/example_common.rs index 2e26730fa..524bee6d9 100644 --- a/examples/stm32h7/src/example_common.rs +++ b/examples/stm32h7/src/example_common.rs @@ -23,6 +23,5 @@ pub fn config() -> Config { let mut config = Config::default(); config.rcc.sys_ck = Some(400.mhz().into()); config.rcc.pll1.q_ck = Some(100.mhz().into()); - config.rcc.enable_dma1 = true; config } -- cgit