aboutsummaryrefslogtreecommitdiff
path: root/embassy-stm32f4-examples
diff options
context:
space:
mode:
authorThales Fragoso <[email protected]>2021-03-18 22:23:09 -0300
committerThales Fragoso <[email protected]>2021-03-18 22:37:08 -0300
commit88a25b042aee96a73bdfbc44409bd8f6cd15035a (patch)
tree7ab313f59c039764374257a1a8fcc29d5f214ae3 /embassy-stm32f4-examples
parent456e04c79fb5070fadffa6e80832e78aec7c2e59 (diff)
F4: Fix compilation for other MCUs
Diffstat (limited to 'embassy-stm32f4-examples')
-rw-r--r--embassy-stm32f4-examples/Cargo.toml22
-rw-r--r--embassy-stm32f4-examples/src/bin/can.rs4
-rw-r--r--embassy-stm32f4-examples/src/bin/serial.rs2
3 files changed, 22 insertions, 6 deletions
diff --git a/embassy-stm32f4-examples/Cargo.toml b/embassy-stm32f4-examples/Cargo.toml
index 60ba44554..5bbaecc58 100644
--- a/embassy-stm32f4-examples/Cargo.toml
+++ b/embassy-stm32f4-examples/Cargo.toml
@@ -15,11 +15,29 @@ defmt-info = []
15defmt-warn = [] 15defmt-warn = []
16defmt-error = [] 16defmt-error = []
17 17
18stm32f401 = ["stm32f4xx-hal/stm32f401", "embassy-stm32f4/stm32f401"]
19stm32f405 = ["stm32f4xx-hal/stm32f405", "embassy-stm32f4/stm32f405"]
20stm32f407 = ["stm32f4xx-hal/stm32f407", "embassy-stm32f4/stm32f407"]
21stm32f410 = ["stm32f4xx-hal/stm32f410", "embassy-stm32f4/stm32f410"]
22stm32f411 = ["stm32f4xx-hal/stm32f411", "embassy-stm32f4/stm32f411"]
23stm32f412 = ["stm32f4xx-hal/stm32f412", "embassy-stm32f4/stm32f412"]
24stm32f413 = ["stm32f4xx-hal/stm32f413", "embassy-stm32f4/stm32f413"]
25stm32f415 = ["stm32f4xx-hal/stm32f405", "embassy-stm32f4/stm32f405"]
26stm32f417 = ["stm32f4xx-hal/stm32f407", "embassy-stm32f4/stm32f407"]
27stm32f423 = ["stm32f4xx-hal/stm32f413", "embassy-stm32f4/stm32f413"]
28stm32f427 = ["stm32f4xx-hal/stm32f427", "embassy-stm32f4/stm32f427"]
29stm32f429 = ["stm32f4xx-hal/stm32f429", "embassy-stm32f4/stm32f429"]
30stm32f437 = ["stm32f4xx-hal/stm32f427", "embassy-stm32f4/stm32f427"]
31stm32f439 = ["stm32f4xx-hal/stm32f429", "embassy-stm32f4/stm32f429"]
32stm32f446 = ["stm32f4xx-hal/stm32f446", "embassy-stm32f4/stm32f446"]
33stm32f469 = ["stm32f4xx-hal/stm32f469", "embassy-stm32f4/stm32f469"]
34stm32f479 = ["stm32f4xx-hal/stm32f469", "embassy-stm32f4/stm32f469"]
35
18 36
19[dependencies] 37[dependencies]
20embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] } 38embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] }
21embassy-traits = { version = "0.1.0", path = "../embassy-traits", features = ["defmt"] } 39embassy-traits = { version = "0.1.0", path = "../embassy-traits", features = ["defmt"] }
22embassy-stm32f4 = { version = "*", path = "../embassy-stm32f4", features = ["stm32f405"] } 40embassy-stm32f4 = { version = "*", path = "../embassy-stm32f4" }
23 41
24defmt = "0.2.0" 42defmt = "0.2.0"
25defmt-rtt = "0.2.0" 43defmt-rtt = "0.2.0"
@@ -28,7 +46,7 @@ cortex-m = "0.7.1"
28cortex-m-rt = "0.6.13" 46cortex-m-rt = "0.6.13"
29embedded-hal = { version = "0.2.4" } 47embedded-hal = { version = "0.2.4" }
30panic-probe = "0.1.0" 48panic-probe = "0.1.0"
31stm32f4xx-hal = { version = "0.8.3", features = ["rt", "stm32f405"], git = "https://github.com/stm32-rs/stm32f4xx-hal.git"} 49stm32f4xx-hal = { version = "0.8.3", features = ["rt"], git = "https://github.com/stm32-rs/stm32f4xx-hal.git"}
32futures = { version = "0.3.8", default-features = false, features = ["async-await"] } 50futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
33rtt-target = { version = "0.3", features = ["cortex-m"] } 51rtt-target = { version = "0.3", features = ["cortex-m"] }
34bxcan = "0.5.0" \ No newline at end of file 52bxcan = "0.5.0" \ No newline at end of file
diff --git a/embassy-stm32f4-examples/src/bin/can.rs b/embassy-stm32f4-examples/src/bin/can.rs
index 701a277ec..5ffde2471 100644
--- a/embassy-stm32f4-examples/src/bin/can.rs
+++ b/embassy-stm32f4-examples/src/bin/can.rs
@@ -12,10 +12,8 @@ use example_common::{panic, *};
12use bxcan::filter::Mask32; 12use bxcan::filter::Mask32;
13use cortex_m_rt::entry; 13use cortex_m_rt::entry;
14use embassy::executor::{task, Executor}; 14use embassy::executor::{task, Executor};
15use embassy::traits::gpio::*;
16use embassy::util::Forever; 15use embassy::util::Forever;
17use embassy_stm32f4::{can, interrupt}; 16use embassy_stm32f4::{can, interrupt};
18use futures::pin_mut;
19use stm32f4xx_hal::prelude::*; 17use stm32f4xx_hal::prelude::*;
20use stm32f4xx_hal::{can::Can, stm32}; 18use stm32f4xx_hal::{can::Can, stm32};
21 19
@@ -35,7 +33,7 @@ async fn run(dp: stm32::Peripherals, _cp: cortex_m::Peripherals) {
35 33
36 let mut can = can::Can::new(can, interrupt::take!(CAN1_TX), interrupt::take!(CAN1_RX0)); 34 let mut can = can::Can::new(can, interrupt::take!(CAN1_TX), interrupt::take!(CAN1_RX0));
37 35
38 let frame = can.receive().await; 36 let _frame = can.receive().await;
39} 37}
40 38
41static EXECUTOR: Forever<Executor> = Forever::new(); 39static EXECUTOR: Forever<Executor> = Forever::new();
diff --git a/embassy-stm32f4-examples/src/bin/serial.rs b/embassy-stm32f4-examples/src/bin/serial.rs
index b138bfdd8..49a588c25 100644
--- a/embassy-stm32f4-examples/src/bin/serial.rs
+++ b/embassy-stm32f4-examples/src/bin/serial.rs
@@ -43,7 +43,7 @@ async fn run(dp: stm32::Peripherals, _cp: cortex_m::Peripherals) {
43 43
44 let streams = StreamsTuple::new(dp.DMA2); 44 let streams = StreamsTuple::new(dp.DMA2);
45 45
46 let mut serial = unsafe { 46 let _serial = unsafe {
47 serial::Serial::new( 47 serial::Serial::new(
48 dp.USART1, 48 dp.USART1,
49 (streams.7, streams.2), 49 (streams.7, streams.2),