aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32l5/src/bin/usb_hid_mouse.rs
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-08-17 22:25:58 +0200
committerDario Nieuwenhuis <[email protected]>2022-08-17 22:25:58 +0200
commit2e85eaf7d5f4dcf6d84f426542b8ec87aa51c429 (patch)
tree1d22c32eae26435677df89083d71f50fc298a09f /examples/stm32l5/src/bin/usb_hid_mouse.rs
parentfc6e1e06b305d302d1b7ad17e8ef3a9be986c358 (diff)
examples Remove the `fn config()` idiom.
It was only useful for doing #[embassy_executor::main(config = "config()")]`. Now that it's gone, it makes more sense to build the config in main directly.
Diffstat (limited to 'examples/stm32l5/src/bin/usb_hid_mouse.rs')
-rw-r--r--examples/stm32l5/src/bin/usb_hid_mouse.rs12
1 files changed, 3 insertions, 9 deletions
diff --git a/examples/stm32l5/src/bin/usb_hid_mouse.rs b/examples/stm32l5/src/bin/usb_hid_mouse.rs
index b8eef6d0d..ef0a20a42 100644
--- a/examples/stm32l5/src/bin/usb_hid_mouse.rs
+++ b/examples/stm32l5/src/bin/usb_hid_mouse.rs
@@ -17,19 +17,13 @@ use futures::future::join;
17use usbd_hid::descriptor::{MouseReport, SerializedDescriptor}; 17use usbd_hid::descriptor::{MouseReport, SerializedDescriptor};
18use {defmt_rtt as _, panic_probe as _}; 18use {defmt_rtt as _, panic_probe as _};
19 19
20fn config() -> Config { 20#[embassy_executor::main]
21async fn main(_spawner: Spawner) {
21 let mut config = Config::default(); 22 let mut config = Config::default();
22 config.rcc.mux = ClockSrc::HSE(Hertz(16_000_000));
23
24 config.rcc.mux = ClockSrc::PLL(PLLSource::HSI16, PLLClkDiv::Div2, PLLSrcDiv::Div1, PLLMul::Mul10, None); 23 config.rcc.mux = ClockSrc::PLL(PLLSource::HSI16, PLLClkDiv::Div2, PLLSrcDiv::Div1, PLLMul::Mul10, None);
25 config.rcc.hsi48 = true; 24 config.rcc.hsi48 = true;
25 let p = embassy_stm32::init(config);
26 26
27 config
28}
29
30#[embassy_executor::main]
31async fn main(_spawner: Spawner) {
32 let p = embassy_stm32::init(config());
33 // Create the driver, from the HAL. 27 // Create the driver, from the HAL.
34 let irq = interrupt::take!(USB_FS); 28 let irq = interrupt::take!(USB_FS);
35 let driver = Driver::new(p.USB, irq, p.PA12, p.PA11); 29 let driver = Driver::new(p.USB, irq, p.PA12, p.PA11);