max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace futures::future::join -> embassy_futures::join::join.

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2022-09-22 16:48:35 +02:00
parent a0487380da
commit 10d1ad2343
19 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/stm32f1/Cargo.toml
View File

@ -10,6 +10,7 @@ embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["de
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f103c8", "unstable-pac", "memory-x", "time-driver-any"] }
embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] }
embassy-usb-serial = { version = "0.1.0", path = "../../embassy-usb-serial", features = ["defmt"] }
embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
defmt = "0.3"
defmt-rtt = "0.3"

2
examples/stm32f1/src/bin/usb_serial.rs
View File

@ -4,6 +4,7 @@
use defmt::{panic, *};
use embassy_executor::Spawner;
use embassy_futures::join::join;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::time::Hertz;
use embassy_stm32::usb::{Driver, Instance};
@ -12,7 +13,6 @@ use embassy_time::{Duration, Timer};
use embassy_usb::driver::EndpointError;
use embassy_usb::Builder;
use embassy_usb_serial::{CdcAcmClass, State};
use futures::future::join;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]