diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-08-17 20:27:42 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-17 20:27:42 +0000 |
commit | 1c5b54a4823d596db730eb476c3ab78110557214 (patch) | |
tree | 1d22c32eae26435677df89083d71f50fc298a09f /examples/stm32f3/src/bin/usb_serial.rs | |
parent | d881f3ad9186cf3279aa1ba27093bad94035c186 (diff) | |
parent | 2e85eaf7d5f4dcf6d84f426542b8ec87aa51c429 (diff) | |
download | embassy-1c5b54a4823d596db730eb476c3ab78110557214.zip |
Merge #908
908: Remove HAL initialization from #[embassy_executor::main] macro. r=Dirbaio a=Dirbaio
Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Diffstat (limited to 'examples/stm32f3/src/bin/usb_serial.rs')
-rw-r--r-- | examples/stm32f3/src/bin/usb_serial.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/examples/stm32f3/src/bin/usb_serial.rs b/examples/stm32f3/src/bin/usb_serial.rs index 87b1138f..757643ea 100644 --- a/examples/stm32f3/src/bin/usb_serial.rs +++ b/examples/stm32f3/src/bin/usb_serial.rs @@ -8,27 +8,23 @@ use embassy_executor::time::{Duration, Timer}; use embassy_stm32::gpio::{Level, Output, Speed}; use embassy_stm32::time::mhz; use embassy_stm32::usb::{Driver, Instance}; -use embassy_stm32::{interrupt, Config, Peripherals}; +use embassy_stm32::{interrupt, Config}; use embassy_usb::driver::EndpointError; use embassy_usb::Builder; use embassy_usb_serial::{CdcAcmClass, State}; use futures::future::join; use {defmt_rtt as _, panic_probe as _}; -fn config() -> Config { +#[embassy_executor::main] +async fn main(_spawner: Spawner) { let mut config = Config::default(); - config.rcc.hse = Some(mhz(8)); config.rcc.sysclk = Some(mhz(48)); config.rcc.pclk1 = Some(mhz(24)); config.rcc.pclk2 = Some(mhz(24)); config.rcc.pll48 = true; + let p = embassy_stm32::init(config); - config -} - -#[embassy_executor::main(config = "config()")] -async fn main(_spawner: Spawner, p: Peripherals) { info!("Hello World!"); // Needed for nucleo-stm32f303ze |