aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxoviat <[email protected]>2021-04-06 14:23:13 -0500
committerxoviat <[email protected]>2021-04-06 14:23:13 -0500
commit7cb46ac720a85cdf67e68730ba11130b1d02fbc6 (patch)
tree9eb913a988c494940faeb7e1bca141c3508f156c
parentdea09876e030f97ed53d1b81a5327d98c7bcb805 (diff)
stm32: fix usb
-rw-r--r--embassy-stm32-examples/src/bin/usb_serial.rs4
-rw-r--r--embassy-stm32/Cargo.toml2
-rw-r--r--embassy-stm32/src/rtc.rs8
3 files changed, 7 insertions, 7 deletions
diff --git a/embassy-stm32-examples/src/bin/usb_serial.rs b/embassy-stm32-examples/src/bin/usb_serial.rs
index 7e95f1221..6a1d27d54 100644
--- a/embassy-stm32-examples/src/bin/usb_serial.rs
+++ b/embassy-stm32-examples/src/bin/usb_serial.rs
@@ -17,11 +17,11 @@ use embassy::time::{Duration, Timer};
17use embassy::util::Forever; 17use embassy::util::Forever;
18use embassy_extras::usb::usb_serial::UsbSerial; 18use embassy_extras::usb::usb_serial::UsbSerial;
19use embassy_extras::usb::Usb; 19use embassy_extras::usb::Usb;
20use embassy_stm32::hal::otg_fs::{UsbBus, USB};
21use embassy_stm32::hal::prelude::*;
20use embassy_stm32::{interrupt, pac, rtc}; 22use embassy_stm32::{interrupt, pac, rtc};
21use futures::future::{select, Either}; 23use futures::future::{select, Either};
22use futures::pin_mut; 24use futures::pin_mut;
23use stm32f4xx_hal::otg_fs::{UsbBus, USB};
24use stm32f4xx_hal::prelude::*;
25use usb_device::bus::UsbBusAllocator; 25use usb_device::bus::UsbBusAllocator;
26use usb_device::prelude::*; 26use usb_device::prelude::*;
27 27
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 6ab434d1f..523359417 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -46,6 +46,6 @@ embedded-hal = { version = "0.2.4" }
46embedded-dma = { version = "0.1.2" } 46embedded-dma = { version = "0.1.2" }
47bxcan = "0.5.0" 47bxcan = "0.5.0"
48nb = "*" 48nb = "*"
49stm32f4xx-hal = { version = "0.9.0", features = ["rt", "can"], optional = true } 49stm32f4xx-hal = { version = "0.9.0", features = ["rt", "can", "usb_fs"], optional = true }
50stm32l0xx-hal = { version = "0.7.0", features = ["rt"], optional = true } 50stm32l0xx-hal = { version = "0.7.0", features = ["rt"], optional = true }
51futures = { version = "0.3.5", default-features = false, features = ["async-await"] } \ No newline at end of file 51futures = { version = "0.3.5", default-features = false, features = ["async-await"] } \ No newline at end of file
diff --git a/embassy-stm32/src/rtc.rs b/embassy-stm32/src/rtc.rs
index 824a47072..b1abba325 100644
--- a/embassy-stm32/src/rtc.rs
+++ b/embassy-stm32/src/rtc.rs
@@ -1,8 +1,8 @@
1use crate::hal::bb;
2use crate::hal::rcc::Clocks;
1use core::cell::Cell; 3use core::cell::Cell;
2use core::convert::TryInto; 4use core::convert::TryInto;
3use core::sync::atomic::{compiler_fence, AtomicU32, Ordering}; 5use core::sync::atomic::{compiler_fence, AtomicU32, Ordering};
4use stm32f4xx_hal::bb;
5use stm32f4xx_hal::rcc::Clocks;
6 6
7use embassy::interrupt::InterruptExt; 7use embassy::interrupt::InterruptExt;
8use embassy::time::{Clock, TICKS_PER_SECOND}; 8use embassy::time::{Clock, TICKS_PER_SECOND};
@@ -259,7 +259,7 @@ macro_rules! impl_timer {
259 ($module:ident: ($TYPE:ident, $INT:ident, $apbenr:ident, $enrbit:expr, $apbrstr:ident, $rstrbit:expr, $ppre:ident, $pclk: ident), 3) => { 259 ($module:ident: ($TYPE:ident, $INT:ident, $apbenr:ident, $enrbit:expr, $apbrstr:ident, $rstrbit:expr, $ppre:ident, $pclk: ident), 3) => {
260 mod $module { 260 mod $module {
261 use super::*; 261 use super::*;
262 use stm32f4xx_hal::pac::{$TYPE, RCC}; 262 use crate::hal::pac::{$TYPE, RCC};
263 263
264 impl sealed::Sealed for $TYPE {} 264 impl sealed::Sealed for $TYPE {}
265 265
@@ -376,7 +376,7 @@ macro_rules! impl_timer {
376 ($module:ident: ($TYPE:ident, $INT:ident, $apbenr:ident, $enrbit:expr, $apbrstr:ident, $rstrbit:expr, $ppre:ident, $pclk: ident), 1) => { 376 ($module:ident: ($TYPE:ident, $INT:ident, $apbenr:ident, $enrbit:expr, $apbrstr:ident, $rstrbit:expr, $ppre:ident, $pclk: ident), 1) => {
377 mod $module { 377 mod $module {
378 use super::*; 378 use super::*;
379 use stm32f4xx_hal::pac::{$TYPE, RCC}; 379 use crate::hal::pac::{$TYPE, RCC};
380 380
381 impl sealed::Sealed for $TYPE {} 381 impl sealed::Sealed for $TYPE {}
382 382