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
embassy-stm32/Cargo.toml
View File

@ -34,6 +34,7 @@ flavors = [
embassy-sync = { version = "0.1.0", path = "../embassy-sync" }
embassy-executor = { version = "0.1.0", path = "../embassy-executor" }
embassy-time = { version = "0.1.0", path = "../embassy-time", optional = true }
embassy-futures = { version = "0.1.0", path = "../embassy-futures" }
embassy-cortex-m = { version = "0.1.0", path = "../embassy-cortex-m", features = ["prio-bits-4"]}
embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" }

4
embassy-stm32/src/dcmi.rs
View File

@ -429,7 +429,7 @@ where
}
});
let (_, result) = futures::future::join(dma_read, result).await;
let (_, result) = embassy_futures::join::join(dma_read, result).await;
unsafe { Self::toggle(false) };
@ -537,7 +537,7 @@ where
unsafe { Self::toggle(true) };
let (_, result) = futures::future::join(dma_result, result).await;
let (_, result) = embassy_futures::join::join(dma_result, result).await;
unsafe { Self::toggle(false) };

2
embassy-stm32/src/spi/mod.rs
View File

@ -3,9 +3,9 @@
use core::ptr;
use embassy_embedded_hal::SetConfig;
use embassy_futures::join::join;
use embassy_hal_common::{into_ref, PeripheralRef};
pub use embedded_hal_02::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
use futures::future::join;
use self::sealed::WordSize;
use crate::dma::{slice_ptr_parts, NoDma, Transfer};