From 57eecd42926e917a55798c4a0fa463b45053687d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Kr=C3=B6ger?= <timokroeger93@gmail.com>
Date: Fri, 23 Jul 2021 17:49:53 +0200
Subject: [PATCH] Use `Dbgmcu::enable_all()` in stm32f4 examples

---
 examples/stm32f4/src/bin/blinky.rs      |  8 ++------
 examples/stm32f4/src/bin/button.rs      |  8 ++------
 examples/stm32f4/src/bin/button_exti.rs |  7 ++-----
 examples/stm32f4/src/bin/spi.rs         |  1 -
 examples/stm32f4/src/bin/usart.rs       |  8 ++------
 examples/stm32f4/src/bin/usart_dma.rs   | 17 ++---------------
 6 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/examples/stm32f4/src/bin/blinky.rs b/examples/stm32f4/src/bin/blinky.rs
index da512dce..9e50c95c 100644
--- a/examples/stm32f4/src/bin/blinky.rs
+++ b/examples/stm32f4/src/bin/blinky.rs
@@ -8,8 +8,8 @@
 
 #[path = "../example_common.rs"]
 mod example_common;
+use embassy_stm32::dbgmcu::Dbgmcu;
 use embassy_stm32::gpio::{Level, Output, Speed};
-use embassy_stm32::pac;
 use embedded_hal::digital::v2::OutputPin;
 use example_common::*;
 
@@ -20,11 +20,7 @@ fn main() -> ! {
     info!("Hello World!");
 
     unsafe {
-        pac::DBGMCU.cr().modify(|w| {
-            w.set_dbg_sleep(true);
-            w.set_dbg_standby(true);
-            w.set_dbg_stop(true);
-        });
+        Dbgmcu::enable_all();
     }
 
     let p = embassy_stm32::init(Default::default());
diff --git a/examples/stm32f4/src/bin/button.rs b/examples/stm32f4/src/bin/button.rs
index 395ec484..c61e85f0 100644
--- a/examples/stm32f4/src/bin/button.rs
+++ b/examples/stm32f4/src/bin/button.rs
@@ -9,8 +9,8 @@
 #[path = "../example_common.rs"]
 mod example_common;
 use cortex_m_rt::entry;
+use embassy_stm32::dbgmcu::Dbgmcu;
 use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
-use embassy_stm32::pac;
 use embedded_hal::digital::v2::{InputPin, OutputPin};
 use example_common::*;
 
@@ -19,11 +19,7 @@ fn main() -> ! {
     info!("Hello World!");
 
     unsafe {
-        pac::DBGMCU.cr().modify(|w| {
-            w.set_dbg_sleep(true);
-            w.set_dbg_standby(true);
-            w.set_dbg_stop(true);
-        });
+        Dbgmcu::enable_all();
     }
 
     let p = embassy_stm32::init(Default::default());
diff --git a/examples/stm32f4/src/bin/button_exti.rs b/examples/stm32f4/src/bin/button_exti.rs
index bccd3870..6c51095e 100644
--- a/examples/stm32f4/src/bin/button_exti.rs
+++ b/examples/stm32f4/src/bin/button_exti.rs
@@ -10,6 +10,7 @@
 mod example_common;
 use embassy::executor::Executor;
 use embassy::util::Forever;
+use embassy_stm32::dbgmcu::Dbgmcu;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
@@ -42,11 +43,7 @@ fn main() -> ! {
     info!("Hello World!");
 
     unsafe {
-        pac::DBGMCU.cr().modify(|w| {
-            w.set_dbg_sleep(true);
-            w.set_dbg_standby(true);
-            w.set_dbg_stop(true);
-        });
+        Dbgmcu::enable_all();
 
         // EXTI clock
         pac::RCC.apb2enr().modify(|w| {
diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs
index 40b0748d..88fc84bc 100644
--- a/examples/stm32f4/src/bin/spi.rs
+++ b/examples/stm32f4/src/bin/spi.rs
@@ -15,7 +15,6 @@ use example_common::*;
 
 use cortex_m_rt::entry;
 use embassy_stm32::dbgmcu::Dbgmcu;
-use embassy_stm32::pac;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
 use embedded_hal::blocking::spi::Transfer;
diff --git a/examples/stm32f4/src/bin/usart.rs b/examples/stm32f4/src/bin/usart.rs
index 51a2e0fd..7cac33e9 100644
--- a/examples/stm32f4/src/bin/usart.rs
+++ b/examples/stm32f4/src/bin/usart.rs
@@ -11,12 +11,12 @@ mod example_common;
 use cortex_m::prelude::_embedded_hal_blocking_serial_Write;
 use embassy::executor::Executor;
 use embassy::util::Forever;
+use embassy_stm32::dbgmcu::Dbgmcu;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
 use example_common::*;
 
 use cortex_m_rt::entry;
-use embassy_stm32::pac;
 
 #[embassy::task]
 async fn main_task() {
@@ -42,11 +42,7 @@ fn main() -> ! {
     info!("Hello World!");
 
     unsafe {
-        pac::DBGMCU.cr().modify(|w| {
-            w.set_dbg_sleep(true);
-            w.set_dbg_standby(true);
-            w.set_dbg_stop(true);
-        });
+        Dbgmcu::enable_all();
     }
 
     let executor = EXECUTOR.put(Executor::new());
diff --git a/examples/stm32f4/src/bin/usart_dma.rs b/examples/stm32f4/src/bin/usart_dma.rs
index 9de46375..552f8367 100644
--- a/examples/stm32f4/src/bin/usart_dma.rs
+++ b/examples/stm32f4/src/bin/usart_dma.rs
@@ -12,8 +12,8 @@ use core::fmt::Write;
 use cortex_m_rt::entry;
 use embassy::executor::Executor;
 use embassy::util::Forever;
+use embassy_stm32::dbgmcu::Dbgmcu;
 use embassy_stm32::dma::NoDma;
-use embassy_stm32::pac;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_traits::uart::Write as _;
 use example_common::*;
@@ -42,20 +42,7 @@ fn main() -> ! {
     info!("Hello World!");
 
     unsafe {
-        pac::DBGMCU.cr().modify(|w| {
-            w.set_dbg_sleep(true);
-            w.set_dbg_standby(true);
-            w.set_dbg_stop(true);
-    });
-
-        pac::RCC.ahb1enr().modify(|w| {
-            w.set_gpioaen(true);
-            w.set_gpioben(true);
-            w.set_gpiocen(true);
-            w.set_gpioden(true);
-            w.set_gpioeen(true);
-            w.set_gpiofen(true);
-    });
+        Dbgmcu::enable_all();
     }
 
     let executor = EXECUTOR.put(Executor::new());