Remove HAL initialization from #[embassy::main] macro.
This commit is contained in:
@ -6,11 +6,11 @@ use defmt::*;
|
||||
use embassy_executor::executor::Spawner;
|
||||
use embassy_stm32::exti::ExtiInput;
|
||||
use embassy_stm32::gpio::{Input, Pull};
|
||||
use embassy_stm32::Peripherals;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
async fn main(_spawner: Spawner, p: Peripherals) {
|
||||
async fn main(_spawner: Spawner) {
|
||||
let p = embassy_stm32::init(Default::default());
|
||||
info!("Hello World!");
|
||||
|
||||
let button = Input::new(p.PC13, Pull::Down);
|
||||
|
@ -6,7 +6,7 @@ use defmt::*;
|
||||
use embassy_executor::executor::Spawner;
|
||||
use embassy_stm32::rcc::{ClockSrc, PLLClkDiv, PLLMul, PLLSource, PLLSrcDiv};
|
||||
use embassy_stm32::rng::Rng;
|
||||
use embassy_stm32::{Config, Peripherals};
|
||||
use embassy_stm32::Config;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
fn config() -> Config {
|
||||
@ -21,8 +21,9 @@ fn config() -> Config {
|
||||
config
|
||||
}
|
||||
|
||||
#[embassy_executor::main(config = "config()")]
|
||||
async fn main(_spawner: Spawner, p: Peripherals) {
|
||||
#[embassy_executor::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
let p = embassy_stm32::init(config());
|
||||
info!("Hello World!");
|
||||
|
||||
let mut rng = Rng::new(p.RNG);
|
||||
|
@ -14,7 +14,7 @@ use embassy_stm32::rcc::*;
|
||||
use embassy_stm32::rng::Rng;
|
||||
use embassy_stm32::time::Hertz;
|
||||
use embassy_stm32::usb::Driver;
|
||||
use embassy_stm32::{interrupt, Config, Peripherals};
|
||||
use embassy_stm32::{interrupt, Config};
|
||||
use embassy_usb::{Builder, UsbDevice};
|
||||
use embassy_usb_ncm::{CdcNcmClass, Receiver, Sender, State};
|
||||
use embassy_util::blocking_mutex::raw::ThreadModeRawMutex;
|
||||
@ -93,8 +93,9 @@ fn config() -> Config {
|
||||
config
|
||||
}
|
||||
|
||||
#[embassy_executor::main(config = "config()")]
|
||||
async fn main(spawner: Spawner, p: Peripherals) {
|
||||
#[embassy_executor::main]
|
||||
async fn main(spawner: Spawner) {
|
||||
let p = embassy_stm32::init(config());
|
||||
// Create the driver, from the HAL.
|
||||
let irq = interrupt::take!(USB_FS);
|
||||
let driver = Driver::new(p.USB, irq, p.PA12, p.PA11);
|
||||
|
@ -27,8 +27,9 @@ fn config() -> Config {
|
||||
config
|
||||
}
|
||||
|
||||
#[embassy_executor::main(config = "config()")]
|
||||
async fn main(_spawner: Spawner, p: Peripherals) {
|
||||
#[embassy_executor::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
let p = embassy_stm32::init(config());
|
||||
// Create the driver, from the HAL.
|
||||
let irq = interrupt::take!(USB_FS);
|
||||
let driver = Driver::new(p.USB, irq, p.PA12, p.PA11);
|
||||
|
@ -7,7 +7,7 @@ use embassy_executor::executor::Spawner;
|
||||
use embassy_stm32::rcc::*;
|
||||
use embassy_stm32::time::Hertz;
|
||||
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};
|
||||
@ -24,8 +24,9 @@ fn config() -> Config {
|
||||
config
|
||||
}
|
||||
|
||||
#[embassy_executor::main(config = "config()")]
|
||||
async fn main(_spawner: Spawner, p: Peripherals) {
|
||||
#[embassy_executor::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
let p = embassy_stm32::init(config());
|
||||
info!("Hello World!");
|
||||
|
||||
// Create the driver, from the HAL.
|
||||
|
Reference in New Issue
Block a user