aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32f4/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2021-08-19 23:32:22 +0200
committerDario Nieuwenhuis <[email protected]>2021-08-19 23:50:19 +0200
commit2c992f701049a9c0e72048b134c26fdb26f2692a (patch)
tree84aa74121769c9d9f3917cb493befd0fa14841cc /examples/stm32f4/src
parent446d6c275c2c3e0dcc57dd69c3c1b1e7f6c92488 (diff)
stm32: move dbgmcu stuff to toplevel config setting, defaulting to true.
Diffstat (limited to 'examples/stm32f4/src')
-rw-r--r--examples/stm32f4/src/bin/blinky.rs5
-rw-r--r--examples/stm32f4/src/bin/button.rs5
-rw-r--r--examples/stm32f4/src/bin/button_exti.rs5
-rw-r--r--examples/stm32f4/src/bin/can.rs5
-rw-r--r--examples/stm32f4/src/bin/hello.rs1
-rw-r--r--examples/stm32f4/src/bin/spi.rs5
-rw-r--r--examples/stm32f4/src/bin/spi_dma.rs5
-rw-r--r--examples/stm32f4/src/bin/usart.rs5
-rw-r--r--examples/stm32f4/src/bin/usart_dma.rs5
9 files changed, 0 insertions, 41 deletions
diff --git a/examples/stm32f4/src/bin/blinky.rs b/examples/stm32f4/src/bin/blinky.rs
index b3a0ffb8e..a30887f7d 100644
--- a/examples/stm32f4/src/bin/blinky.rs
+++ b/examples/stm32f4/src/bin/blinky.rs
@@ -8,7 +8,6 @@
8mod example_common; 8mod example_common;
9use embassy::executor::Spawner; 9use embassy::executor::Spawner;
10use embassy::time::{Duration, Timer}; 10use embassy::time::{Duration, Timer};
11use embassy_stm32::dbgmcu::Dbgmcu;
12use embassy_stm32::gpio::{Level, Output, Speed}; 11use embassy_stm32::gpio::{Level, Output, Speed};
13use embassy_stm32::Peripherals; 12use embassy_stm32::Peripherals;
14use embedded_hal::digital::v2::OutputPin; 13use embedded_hal::digital::v2::OutputPin;
@@ -18,10 +17,6 @@ use example_common::*;
18async fn main(_spawner: Spawner, p: Peripherals) { 17async fn main(_spawner: Spawner, p: Peripherals) {
19 info!("Hello World!"); 18 info!("Hello World!");
20 19
21 unsafe {
22 Dbgmcu::enable_all();
23 }
24
25 let mut led = Output::new(p.PB7, Level::High, Speed::Low); 20 let mut led = Output::new(p.PB7, Level::High, Speed::Low);
26 21
27 loop { 22 loop {
diff --git a/examples/stm32f4/src/bin/button.rs b/examples/stm32f4/src/bin/button.rs
index 90998cf46..04fcfcc21 100644
--- a/examples/stm32f4/src/bin/button.rs
+++ b/examples/stm32f4/src/bin/button.rs
@@ -7,7 +7,6 @@
7#[path = "../example_common.rs"] 7#[path = "../example_common.rs"]
8mod example_common; 8mod example_common;
9use cortex_m_rt::entry; 9use cortex_m_rt::entry;
10use embassy_stm32::dbgmcu::Dbgmcu;
11use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 10use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
12use embedded_hal::digital::v2::{InputPin, OutputPin}; 11use embedded_hal::digital::v2::{InputPin, OutputPin};
13use example_common::*; 12use example_common::*;
@@ -16,10 +15,6 @@ use example_common::*;
16fn main() -> ! { 15fn main() -> ! {
17 info!("Hello World!"); 16 info!("Hello World!");
18 17
19 unsafe {
20 Dbgmcu::enable_all();
21 }
22
23 let p = embassy_stm32::init(Default::default()); 18 let p = embassy_stm32::init(Default::default());
24 19
25 let button = Input::new(p.PC13, Pull::Down); 20 let button = Input::new(p.PC13, Pull::Down);
diff --git a/examples/stm32f4/src/bin/button_exti.rs b/examples/stm32f4/src/bin/button_exti.rs
index ee43fa7d9..49c23ca3b 100644
--- a/examples/stm32f4/src/bin/button_exti.rs
+++ b/examples/stm32f4/src/bin/button_exti.rs
@@ -7,7 +7,6 @@
7#[path = "../example_common.rs"] 7#[path = "../example_common.rs"]
8mod example_common; 8mod example_common;
9use embassy::executor::Spawner; 9use embassy::executor::Spawner;
10use embassy_stm32::dbgmcu::Dbgmcu;
11use embassy_stm32::exti::ExtiInput; 10use embassy_stm32::exti::ExtiInput;
12use embassy_stm32::gpio::{Input, Pull}; 11use embassy_stm32::gpio::{Input, Pull};
13use embassy_stm32::Peripherals; 12use embassy_stm32::Peripherals;
@@ -18,10 +17,6 @@ use example_common::*;
18async fn main(_spawner: Spawner, p: Peripherals) { 17async fn main(_spawner: Spawner, p: Peripherals) {
19 info!("Hello World!"); 18 info!("Hello World!");
20 19
21 unsafe {
22 Dbgmcu::enable_all();
23 }
24
25 let button = Input::new(p.PC13, Pull::Down); 20 let button = Input::new(p.PC13, Pull::Down);
26 let mut button = ExtiInput::new(button, p.EXTI13); 21 let mut button = ExtiInput::new(button, p.EXTI13);
27 22
diff --git a/examples/stm32f4/src/bin/can.rs b/examples/stm32f4/src/bin/can.rs
index 2bb24f045..29dff5510 100644
--- a/examples/stm32f4/src/bin/can.rs
+++ b/examples/stm32f4/src/bin/can.rs
@@ -10,7 +10,6 @@ mod example_common;
10use cortex_m_rt::entry; 10use cortex_m_rt::entry;
11use embassy_stm32::can::filter::Mask32; 11use embassy_stm32::can::filter::Mask32;
12use embassy_stm32::can::{Can, Frame, StandardId}; 12use embassy_stm32::can::{Can, Frame, StandardId};
13use embassy_stm32::dbgmcu::Dbgmcu;
14use embassy_stm32::gpio::{Input, Pull}; 13use embassy_stm32::gpio::{Input, Pull};
15use example_common::*; 14use example_common::*;
16 15
@@ -18,10 +17,6 @@ use example_common::*;
18fn main() -> ! { 17fn main() -> ! {
19 info!("Hello World!"); 18 info!("Hello World!");
20 19
21 unsafe {
22 Dbgmcu::enable_all();
23 }
24
25 let mut p = embassy_stm32::init(Default::default()); 20 let mut p = embassy_stm32::init(Default::default());
26 21
27 // The next two lines are a workaround for testing without transceiver. 22 // The next two lines are a workaround for testing without transceiver.
diff --git a/examples/stm32f4/src/bin/hello.rs b/examples/stm32f4/src/bin/hello.rs
index 1b8730aea..8059f4b5a 100644
--- a/examples/stm32f4/src/bin/hello.rs
+++ b/examples/stm32f4/src/bin/hello.rs
@@ -17,7 +17,6 @@ mod example_common;
17fn config() -> Config { 17fn config() -> Config {
18 let mut config = Config::default(); 18 let mut config = Config::default();
19 config.rcc.sys_ck = Some(Hertz(84_000_000)); 19 config.rcc.sys_ck = Some(Hertz(84_000_000));
20 config.rcc.enable_debug_wfe = true;
21 config 20 config
22} 21}
23 22
diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs
index bb130a2e2..19b6c62aa 100644
--- a/examples/stm32f4/src/bin/spi.rs
+++ b/examples/stm32f4/src/bin/spi.rs
@@ -8,7 +8,6 @@
8mod example_common; 8mod example_common;
9 9
10use cortex_m_rt::entry; 10use cortex_m_rt::entry;
11use embassy_stm32::dbgmcu::Dbgmcu;
12use embassy_stm32::dma::NoDma; 11use embassy_stm32::dma::NoDma;
13use embassy_stm32::gpio::{Level, Output, Speed}; 12use embassy_stm32::gpio::{Level, Output, Speed};
14use embassy_stm32::spi::{Config, Spi}; 13use embassy_stm32::spi::{Config, Spi};
@@ -21,10 +20,6 @@ use example_common::*;
21fn main() -> ! { 20fn main() -> ! {
22 info!("Hello World, dude!"); 21 info!("Hello World, dude!");
23 22
24 unsafe {
25 Dbgmcu::enable_all();
26 }
27
28 let p = embassy_stm32::init(Default::default()); 23 let p = embassy_stm32::init(Default::default());
29 24
30 let mut spi = Spi::new( 25 let mut spi = Spi::new(
diff --git a/examples/stm32f4/src/bin/spi_dma.rs b/examples/stm32f4/src/bin/spi_dma.rs
index a965bef70..ef88fbb9e 100644
--- a/examples/stm32f4/src/bin/spi_dma.rs
+++ b/examples/stm32f4/src/bin/spi_dma.rs
@@ -9,7 +9,6 @@ mod example_common;
9use core::fmt::Write; 9use core::fmt::Write;
10use core::str::from_utf8; 10use core::str::from_utf8;
11use embassy::executor::Spawner; 11use embassy::executor::Spawner;
12use embassy_stm32::dbgmcu::Dbgmcu;
13use embassy_stm32::spi::{Config, Spi}; 12use embassy_stm32::spi::{Config, Spi};
14use embassy_stm32::time::Hertz; 13use embassy_stm32::time::Hertz;
15use embassy_stm32::Peripherals; 14use embassy_stm32::Peripherals;
@@ -21,10 +20,6 @@ use heapless::String;
21async fn main(_spawner: Spawner, p: Peripherals) { 20async fn main(_spawner: Spawner, p: Peripherals) {
22 info!("Hello World!"); 21 info!("Hello World!");
23 22
24 unsafe {
25 Dbgmcu::enable_all();
26 }
27
28 let mut spi = Spi::new( 23 let mut spi = Spi::new(
29 p.SPI1, 24 p.SPI1,
30 p.PB3, 25 p.PB3,
diff --git a/examples/stm32f4/src/bin/usart.rs b/examples/stm32f4/src/bin/usart.rs
index 781c6a958..8bb2ada9e 100644
--- a/examples/stm32f4/src/bin/usart.rs
+++ b/examples/stm32f4/src/bin/usart.rs
@@ -7,7 +7,6 @@
7#[path = "../example_common.rs"] 7#[path = "../example_common.rs"]
8mod example_common; 8mod example_common;
9use cortex_m_rt::entry; 9use cortex_m_rt::entry;
10use embassy_stm32::dbgmcu::Dbgmcu;
11use embassy_stm32::dma::NoDma; 10use embassy_stm32::dma::NoDma;
12use embassy_stm32::usart::{Config, Uart}; 11use embassy_stm32::usart::{Config, Uart};
13use embedded_hal::blocking::serial::Write; 12use embedded_hal::blocking::serial::Write;
@@ -17,10 +16,6 @@ use example_common::*;
17fn main() -> ! { 16fn main() -> ! {
18 info!("Hello World!"); 17 info!("Hello World!");
19 18
20 unsafe {
21 Dbgmcu::enable_all();
22 }
23
24 let p = embassy_stm32::init(Default::default()); 19 let p = embassy_stm32::init(Default::default());
25 20
26 let config = Config::default(); 21 let config = Config::default();
diff --git a/examples/stm32f4/src/bin/usart_dma.rs b/examples/stm32f4/src/bin/usart_dma.rs
index bf50b8ad9..3cfa6219c 100644
--- a/examples/stm32f4/src/bin/usart_dma.rs
+++ b/examples/stm32f4/src/bin/usart_dma.rs
@@ -8,7 +8,6 @@
8mod example_common; 8mod example_common;
9use core::fmt::Write; 9use core::fmt::Write;
10use embassy::executor::Spawner; 10use embassy::executor::Spawner;
11use embassy_stm32::dbgmcu::Dbgmcu;
12use embassy_stm32::dma::NoDma; 11use embassy_stm32::dma::NoDma;
13use embassy_stm32::usart::{Config, Uart}; 12use embassy_stm32::usart::{Config, Uart};
14use embassy_stm32::Peripherals; 13use embassy_stm32::Peripherals;
@@ -20,10 +19,6 @@ use heapless::String;
20async fn main(_spawner: Spawner, p: Peripherals) { 19async fn main(_spawner: Spawner, p: Peripherals) {
21 info!("Hello World!"); 20 info!("Hello World!");
22 21
23 unsafe {
24 Dbgmcu::enable_all();
25 }
26
27 let config = Config::default(); 22 let config = Config::default();
28 let mut usart = Uart::new(p.USART3, p.PD9, p.PD8, p.DMA1_CH3, NoDma, config); 23 let mut usart = Uart::new(p.USART3, p.PD9, p.PD8, p.DMA1_CH3, NoDma, config);
29 24