stm32: move dbgmcu stuff to toplevel config setting, defaulting to true.

examples/stm32l0/Cargo.toml

@@ -27,7 +27,7 @@ defmt = "0.2.0"
 defmt-rtt = "0.2.0"
 
 cortex-m = "0.7.1"
-cortex-m-rt = "0.6.14"
+cortex-m-rt = "0.7.0"
 embedded-hal = { version = "0.2.4" }
 panic-probe = { version = "0.2.0", features= ["print-defmt"] }
 futures = { version = "0.3.8", default-features = false, features = ["async-await"] }

examples/stm32l0/src/bin/blinky.rs

@@ -10,17 +10,14 @@ mod example_common;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy_stm32::gpio::{Level, Output, Speed};
-use embassy_stm32::rcc::Rcc;
 use embassy_stm32::Peripherals;
 use embedded_hal::digital::v2::OutputPin;
 use example_common::*;
 
 #[embassy::main]
-async fn main(_spawner: Spawner, mut p: Peripherals) {
+async fn main(_spawner: Spawner, p: Peripherals) {
     info!("Hello World!");
 
-    Rcc::new(p.RCC).enable_debug_wfe(&mut p.DBGMCU, true);
-
     let mut led = Output::new(p.PB5, Level::High, Speed::Low);
 
     loop {

examples/stm32l0/src/bin/button.rs

@@ -6,22 +6,16 @@
 
 #[path = "../example_common.rs"]
 mod example_common;
-use embassy_stm32::{
-    gpio::{Input, Level, Output, Pull, Speed},
-    rcc::*,
-};
+use embassy::executor::Spawner;
+use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
+use embassy_stm32::Peripherals;
 use embedded_hal::digital::v2::{InputPin, OutputPin};
 use example_common::*;
 
-use cortex_m_rt::entry;
-
-#[entry]
-fn main() -> ! {
+#[embassy::main]
+async fn main(_spawner: Spawner, p: Peripherals) {
     info!("Hello World!");
 
-    let mut p = embassy_stm32::init(Default::default());
-    Rcc::new(p.RCC).enable_debug_wfe(&mut p.DBGMCU, true);
-
     let button = Input::new(p.PB2, Pull::Up);
     let mut led1 = Output::new(p.PA5, Level::High, Speed::Low);
     let mut led2 = Output::new(p.PB5, Level::High, Speed::Low);

examples/stm32l0/src/bin/button_exti.rs

@@ -17,7 +17,6 @@ use example_common::*;
 #[embassy::main]
 async fn main(_spawner: Spawner, mut p: Peripherals) {
     let mut rcc = rcc::Rcc::new(p.RCC);
-    rcc.enable_debug_wfe(&mut p.DBGMCU, true);
     // Enables SYSCFG
     let _ = rcc.enable_hsi48(&mut p.SYSCFG, p.CRS);
 

examples/stm32l0/src/bin/spi.rs

@@ -7,25 +7,21 @@
 #[path = "../example_common.rs"]
 mod example_common;
 
+use embassy::executor::Spawner;
 use embassy_stm32::gpio::{Level, Output, Speed};
 use embedded_hal::digital::v2::OutputPin;
 use example_common::*;
 
-use cortex_m_rt::entry;
 use embassy_stm32::dma::NoDma;
-use embassy_stm32::rcc;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
+use embassy_stm32::Peripherals;
 use embedded_hal::blocking::spi::Transfer;
 
-#[entry]
-fn main() -> ! {
+#[embassy::main]
+async fn main(_spawner: Spawner, p: Peripherals) {
     info!("Hello World, folks!");
 
-    let mut p = embassy_stm32::init(Default::default());
-    let mut rcc = rcc::Rcc::new(p.RCC);
-    rcc.enable_debug_wfe(&mut p.DBGMCU, true);
-
     let mut spi = Spi::new(
         p.SPI1,
         p.PB3,
@@ -40,7 +36,7 @@ fn main() -> ! {
     let mut cs = Output::new(p.PA15, Level::High, Speed::VeryHigh);
 
     loop {
-        let mut buf = [0x0A; 4];
+        let mut buf = [0x0Au8; 4];
         unwrap!(cs.set_low());
         unwrap!(spi.transfer(&mut buf));
         unwrap!(cs.set_high());

examples/stm32l0/src/bin/usart_dma.rs

@@ -11,14 +11,11 @@ use example_common::*;
 
 use embassy::executor::Spawner;
 use embassy_stm32::usart::{Config, Uart};
-use embassy_stm32::{rcc, Peripherals};
+use embassy_stm32::Peripherals;
 use embassy_traits::uart::{Read, Write};
 
 #[embassy::main]
-async fn main(_spawner: Spawner, mut p: Peripherals) {
-    let mut rcc = rcc::Rcc::new(p.RCC);
-    rcc.enable_debug_wfe(&mut p.DBGMCU, true);
-
+async fn main(_spawner: Spawner, p: Peripherals) {
     let mut usart = Uart::new(
         p.USART1,
         p.PB7,

examples/stm32l0/src/bin/usart_irq.rs

@@ -15,13 +15,10 @@ use embassy::io::{AsyncBufReadExt, AsyncWriteExt};
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::interrupt;
 use embassy_stm32::usart::{BufferedUart, Config, State, Uart};
-use embassy_stm32::{rcc, Peripherals};
+use embassy_stm32::Peripherals;
 
 #[embassy::main]
-async fn main(_spawner: Spawner, mut p: Peripherals) {
-    let mut rcc = rcc::Rcc::new(p.RCC);
-    rcc.enable_debug_wfe(&mut p.DBGMCU, true);
-
+async fn main(_spawner: Spawner, p: Peripherals) {
     static mut TX_BUFFER: [u8; 8] = [0; 8];
     static mut RX_BUFFER: [u8; 256] = [0; 256];