aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32l4/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/stm32l4/src
parent446d6c275c2c3e0dcc57dd69c3c1b1e7f6c92488 (diff)
stm32: move dbgmcu stuff to toplevel config setting, defaulting to true.
Diffstat (limited to 'examples/stm32l4/src')
-rw-r--r--examples/stm32l4/src/bin/adc.rs3
-rw-r--r--examples/stm32l4/src/bin/blinky.rs5
-rw-r--r--examples/stm32l4/src/bin/button.rs5
-rw-r--r--examples/stm32l4/src/bin/button_exti.rs5
-rw-r--r--examples/stm32l4/src/bin/dac.rs3
-rw-r--r--examples/stm32l4/src/bin/spi.rs5
-rw-r--r--examples/stm32l4/src/bin/spi_dma.rs5
-rw-r--r--examples/stm32l4/src/bin/usart.rs5
-rw-r--r--examples/stm32l4/src/bin/usart_dma.rs5
9 files changed, 0 insertions, 41 deletions
diff --git a/examples/stm32l4/src/bin/adc.rs b/examples/stm32l4/src/bin/adc.rs
index c778d9c3f..14b4e5ecf 100644
--- a/examples/stm32l4/src/bin/adc.rs
+++ b/examples/stm32l4/src/bin/adc.rs
@@ -9,7 +9,6 @@ mod example_common;
9 9
10use embassy::time::Delay; 10use embassy::time::Delay;
11use embassy_stm32::adc::{Adc, Resolution}; 11use embassy_stm32::adc::{Adc, Resolution};
12use embassy_stm32::dbgmcu::Dbgmcu;
13use embassy_stm32::pac; 12use embassy_stm32::pac;
14use example_common::*; 13use example_common::*;
15 14
@@ -18,8 +17,6 @@ fn main() -> ! {
18 info!("Hello World!"); 17 info!("Hello World!");
19 18
20 unsafe { 19 unsafe {
21 Dbgmcu::enable_all();
22
23 pac::RCC.ccipr().modify(|w| { 20 pac::RCC.ccipr().modify(|w| {
24 w.set_adcsel(0b11); 21 w.set_adcsel(0b11);
25 }); 22 });
diff --git a/examples/stm32l4/src/bin/blinky.rs b/examples/stm32l4/src/bin/blinky.rs
index c9ba587e4..9c983bc6c 100644
--- a/examples/stm32l4/src/bin/blinky.rs
+++ b/examples/stm32l4/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.PB14, Level::High, Speed::Low); 20 let mut led = Output::new(p.PB14, Level::High, Speed::Low);
26 21
27 loop { 22 loop {
diff --git a/examples/stm32l4/src/bin/button.rs b/examples/stm32l4/src/bin/button.rs
index 883a0d6c8..be6e2d2f3 100644
--- a/examples/stm32l4/src/bin/button.rs
+++ b/examples/stm32l4/src/bin/button.rs
@@ -6,7 +6,6 @@
6 6
7#[path = "../example_common.rs"] 7#[path = "../example_common.rs"]
8mod example_common; 8mod example_common;
9use embassy_stm32::dbgmcu::Dbgmcu;
10use embassy_stm32::gpio::{Input, Pull}; 9use embassy_stm32::gpio::{Input, Pull};
11use embedded_hal::digital::v2::InputPin; 10use embedded_hal::digital::v2::InputPin;
12use example_common::*; 11use example_common::*;
@@ -15,10 +14,6 @@ use example_common::*;
15fn main() -> ! { 14fn main() -> ! {
16 info!("Hello World!"); 15 info!("Hello World!");
17 16
18 unsafe {
19 Dbgmcu::enable_all();
20 }
21
22 let p = embassy_stm32::init(Default::default()); 17 let p = embassy_stm32::init(Default::default());
23 18
24 let button = Input::new(p.PC13, Pull::Up); 19 let button = Input::new(p.PC13, Pull::Up);
diff --git a/examples/stm32l4/src/bin/button_exti.rs b/examples/stm32l4/src/bin/button_exti.rs
index 8a78b2589..c55d6408c 100644
--- a/examples/stm32l4/src/bin/button_exti.rs
+++ b/examples/stm32l4/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::Up); 20 let button = Input::new(p.PC13, Pull::Up);
26 let mut button = ExtiInput::new(button, p.EXTI13); 21 let mut button = ExtiInput::new(button, p.EXTI13);
27 22
diff --git a/examples/stm32l4/src/bin/dac.rs b/examples/stm32l4/src/bin/dac.rs
index c479f86c7..e03fbc955 100644
--- a/examples/stm32l4/src/bin/dac.rs
+++ b/examples/stm32l4/src/bin/dac.rs
@@ -8,7 +8,6 @@
8mod example_common; 8mod example_common;
9 9
10use embassy_stm32::dac::{Channel, Dac, Value}; 10use embassy_stm32::dac::{Channel, Dac, Value};
11use embassy_stm32::dbgmcu::Dbgmcu;
12use embassy_stm32::gpio::NoPin; 11use embassy_stm32::gpio::NoPin;
13use embassy_stm32::pac; 12use embassy_stm32::pac;
14use example_common::*; 13use example_common::*;
@@ -18,8 +17,6 @@ fn main() -> ! {
18 info!("Hello World!"); 17 info!("Hello World!");
19 18
20 unsafe { 19 unsafe {
21 Dbgmcu::enable_all();
22
23 pac::RCC.apb1enr1().modify(|w| { 20 pac::RCC.apb1enr1().modify(|w| {
24 w.set_dac1en(true); 21 w.set_dac1en(true);
25 }); 22 });
diff --git a/examples/stm32l4/src/bin/spi.rs b/examples/stm32l4/src/bin/spi.rs
index ef6e2fcad..376537e91 100644
--- a/examples/stm32l4/src/bin/spi.rs
+++ b/examples/stm32l4/src/bin/spi.rs
@@ -7,7 +7,6 @@
7#[path = "../example_common.rs"] 7#[path = "../example_common.rs"]
8mod example_common; 8mod example_common;
9 9
10use embassy_stm32::dbgmcu::Dbgmcu;
11use embassy_stm32::dma::NoDma; 10use embassy_stm32::dma::NoDma;
12use embassy_stm32::gpio::{Level, Output, Speed}; 11use embassy_stm32::gpio::{Level, Output, Speed};
13use embassy_stm32::spi::{Config, Spi}; 12use embassy_stm32::spi::{Config, Spi};
@@ -20,10 +19,6 @@ use example_common::*;
20fn main() -> ! { 19fn main() -> ! {
21 info!("Hello World!"); 20 info!("Hello World!");
22 21
23 unsafe {
24 Dbgmcu::enable_all();
25 }
26
27 let p = embassy_stm32::init(Default::default()); 22 let p = embassy_stm32::init(Default::default());
28 23
29 let mut spi = Spi::new( 24 let mut spi = Spi::new(
diff --git a/examples/stm32l4/src/bin/spi_dma.rs b/examples/stm32l4/src/bin/spi_dma.rs
index d626a1290..75c19a3bf 100644
--- a/examples/stm32l4/src/bin/spi_dma.rs
+++ b/examples/stm32l4/src/bin/spi_dma.rs
@@ -8,7 +8,6 @@
8mod example_common; 8mod example_common;
9 9
10use embassy::executor::Spawner; 10use embassy::executor::Spawner;
11use embassy_stm32::dbgmcu::Dbgmcu;
12use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 11use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
13use embassy_stm32::spi::{Config, Spi}; 12use embassy_stm32::spi::{Config, Spi};
14use embassy_stm32::time::Hertz; 13use embassy_stm32::time::Hertz;
@@ -21,10 +20,6 @@ use example_common::*;
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.SPI3, 24 p.SPI3,
30 p.PC10, 25 p.PC10,
diff --git a/examples/stm32l4/src/bin/usart.rs b/examples/stm32l4/src/bin/usart.rs
index 95ac84b23..09b62f680 100644
--- a/examples/stm32l4/src/bin/usart.rs
+++ b/examples/stm32l4/src/bin/usart.rs
@@ -7,7 +7,6 @@
7#[path = "../example_common.rs"] 7#[path = "../example_common.rs"]
8mod example_common; 8mod example_common;
9 9
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/stm32l4/src/bin/usart_dma.rs b/examples/stm32l4/src/bin/usart_dma.rs
index f74a0e06b..d307dc13c 100644
--- a/examples/stm32l4/src/bin/usart_dma.rs
+++ b/examples/stm32l4/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.UART4, p.PA1, p.PA0, p.DMA1_CH3, NoDma, config); 23 let mut usart = Uart::new(p.UART4, p.PA1, p.PA0, p.DMA1_CH3, NoDma, config);
29 24