-
Notifications
You must be signed in to change notification settings - Fork 232
Add asynchronous versions of most embedded-hal traits using GATs #285
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
e736fb5
First attempt at futures module
lachlansneff ff085fa
Fix some of the docs
lachlansneff 7eb5fd1
Add 'unstable-gats' feature to enable futures module
lachlansneff 3a30a33
Add async i2c module
lachlansneff d9d08fa
Remove futures::spi::FullDuplex
lachlansneff 1928f77
Make futures::spi::{Read, Write, ReadWrite, ReadWriteInPlace} traits
lachlansneff 5cdd987
Rename the futures feature to unstable-features
lachlansneff eecf646
Remove commented-out futures::spi::Transactional trait
lachlansneff 6298952
Remove MaybeUninit from futures::spi::ReadWriteInPlace
lachlansneff bac1603
Remove futures::i2c::Transactional and remove required min_type_alias…
lachlansneff 92aa33b
Remove some unncessary bounds from futures::spi traits
lachlansneff 582ebad
Return initialized buffers from method that read into an uninitialize…
lachlansneff a61008b
Update spi trait names
lachlansneff 306b187
Remove MaybeUninit from futures::spi
lachlansneff 92e0da4
Update changelog
lachlansneff 7ebd9c5
Merge branch 'master' into master
lachlansneff b79bf16
Expand the CHANGELOG.md addition
lachlansneff 4d02ea1
Add futures::Delay trait
lachlansneff 41af589
Add futures::digital::AsyncInputPin trait
lachlansneff 48ab3a8
Switch futures::Delay to take core::time::Duration and add futures::d…
lachlansneff 85accbd
Update changelog
lachlansneff eb2ff8a
Fix some docs in the futures module
lachlansneff d9174d2
Respond to feedback
lachlansneff 941c8bb
Change uart interface to read into a slice
lachlansneff 5617082
Mention what happens when the write and read slices in futures::spi::…
lachlansneff c002a23
Add more futures::digital traits
lachlansneff e686e6e
Change some associated future trait type names
lachlansneff 2e16b79
Formatting
lachlansneff 55cbca1
Remove MaybeUninit from futures::i2c
lachlansneff fee1b99
fix typo
lachlansneff 1df5604
Add error associated types to futures::digital traits
lachlansneff 38ba051
Expand names of generic associated future types
lachlansneff File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
//! Asynchronous Delays | ||
//! | ||
//! # What's the difference this trait and the `timer::CountDown` trait? | ||
//! | ||
//! The `Delay` trait provides an asynchronous delay abstraction and it's meant to be used either | ||
//! to build higher-level abstractions like I/O timeouts or by itself. | ||
|
||
use core::{future::Future, time::Duration}; | ||
|
||
/// Asynchronously wait a duration of time. | ||
/// | ||
/// # Example | ||
/// ```rust | ||
/// # use embedded_hal::futures::delay::Delay; | ||
/// use core::time::Duration; | ||
/// | ||
/// async fn wait_100_micros<D: Delay>(timer: &D) { | ||
/// timer.delay(Duration::from_micros(100)) | ||
/// .await | ||
/// .expect("failed to await on timer"); | ||
/// } | ||
/// ``` | ||
pub trait Delay { | ||
/// Enumeration of `Delay` errors. | ||
type Error; | ||
|
||
/// The future returned from `delay`. | ||
type DelayFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Returns a future that will resolve when `duration` has passed. | ||
/// It is not guaranteed that _exactly_ `duration` will pass, but it will | ||
/// be `duration` or longer. | ||
fn delay<'a>(&'a mut self, duration: Duration) -> Self::DelayFuture<'a>; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
//! Asynchronous digital I/O | ||
//! | ||
//! # Examples | ||
//! ```rust | ||
//! # use embedded_hal::futures::digital::AsyncInputPin; | ||
//! //! Asynchronously wait until the `ready_pin` becomes high. | ||
//! async fn wait_until_ready<P>(ready_pin: &P) | ||
//! where | ||
//! P: WaitFor, | ||
//! { | ||
//! ready_pin | ||
//! .wait_for_high() | ||
//! .await | ||
//! .expect("failed to await input pin") | ||
//! } | ||
//! ``` | ||
//! | ||
//! ```rust,ignore | ||
//! # use embedded_hal::futures::digital::WaitForHigh; | ||
//! # use embedded_hal::futures::delay::Delay; | ||
//! use core::time::Duration; | ||
//! | ||
//! //! Wait until the `ready_pin` is high or timeout after 1 millisecond. | ||
//! //! Returns true if the pin became high or false if it timed-out. | ||
//! async fn wait_until_ready_or_timeout<P, D>(ready_pin: &P, delay: &mut D) -> bool | ||
//! where | ||
//! P: WaitForHigh, | ||
//! D: Delay, | ||
//! { | ||
//! futures::select_biased! { | ||
//! x => ready_pin.wait_for_high() => { | ||
//! x.expect("failed to await input pin"); | ||
//! true | ||
//! }, | ||
//! _ => delay.delay(Duration::from_millis(1)) => false, // ignore the error | ||
//! } | ||
//! } | ||
//! ``` | ||
|
||
use core::future::Future; | ||
|
||
/// Asynchronously wait for a pin to be high. | ||
pub trait WaitForHigh { | ||
/// Enumeration of errors. | ||
type Error; | ||
|
||
/// The future returned by the `wait_for_high` function. | ||
type WaitForHighFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Returns a future that resolves when this pin _is_ high. If the pin | ||
/// is already high, the future resolves immediately. | ||
/// | ||
/// # Note for implementers | ||
/// The pin may have switched back to low before the task was run after | ||
/// being woken. The future should still resolve in that case. | ||
fn wait_for_high<'a>(&'a mut self) -> Self::WaitForHighFuture<'a>; | ||
} | ||
|
||
/// Asynchronously wait for a pin to be low. | ||
pub trait WaitForLow { | ||
/// Enumeration of errors. | ||
type Error; | ||
|
||
/// The future returned by `wait_for_low`. | ||
type WaitForLowFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Returns a future that resolves when this pin _is_ low. If the pin | ||
/// is already low, the future resolves immediately. | ||
/// | ||
/// # Note for implementers | ||
/// The pin may have switched back to high before the task was run after | ||
/// being woken. The future should still resolve in that case. | ||
fn wait_for_low<'a>(&'a mut self) -> Self::WaitForLowFuture<'a>; | ||
} | ||
|
||
/// Wait for a rising edge (transition from low to high). | ||
pub trait WaitForRisingEdge { | ||
/// Enumeration of errors. | ||
type Error; | ||
|
||
/// The future returned from `wait_for_rising_edge`. | ||
type WaitForRisingEdgeFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Returns a future that resolves when this pin transitions from low to high. | ||
fn wait_for_rising_edge<'a>(&'a mut self) -> Self::WaitForRisingEdgeFuture<'a>; | ||
} | ||
|
||
/// Wait for a falling edge (transition from high to low). | ||
pub trait WaitForFallingEdge { | ||
/// Enumeration of errors. | ||
type Error; | ||
|
||
/// The future returned from `wait_for_falling_edge`. | ||
type WaitForFallingEdgeFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Returns a future that resolves when this pin transitions from high to low. | ||
fn wait_for_falling_edge<'a>(&'a mut self) -> Self::WaitForFallingEdgeFuture<'a>; | ||
} | ||
|
||
/// Wait for any edge (transition from low to high OR high to low). | ||
pub trait WaitForAnyEdge { | ||
/// Enumeration of errors. | ||
type Error; | ||
|
||
/// The future returned from `wait_for_any_edge`. | ||
type WaitForAnyEdgeFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Returns a future that resolves when this pin undergoes any transition, e.g. | ||
/// low to high OR high to low. | ||
fn wait_for_any_edge<'a>(&'a mut self) -> Self::WaitForAnyEdgeFuture<'a>; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
//! Async I2C API | ||
//! | ||
//! This API supports 7-bit and 10-bit addresses. Traits feature an `AddressMode` | ||
//! marker type parameter. Two implementation of the `AddressMode` exist: | ||
//! `SevenBitAddress` and `TenBitAddress`. | ||
//! | ||
//! Through this marker types it is possible to implement each address mode for | ||
//! the traits independently in `embedded-hal` implementations and device drivers | ||
//! can depend only on the mode that they support. | ||
//! | ||
//! Additionally, the I2C 10-bit address mode has been developed to be fully | ||
//! backwards compatible with the 7-bit address mode. This allows for a | ||
//! software-emulated 10-bit addressing implementation if the address mode | ||
//! is not supported by the hardware. | ||
//! | ||
//! Since 7-bit addressing is the mode of the majority of I2C devices, | ||
//! `SevenBitAddress` has been set as default mode and thus can be omitted if desired. | ||
|
||
pub use crate::blocking::i2c::{AddressMode, SevenBitAddress, TenBitAddress}; | ||
use core::future::Future; | ||
|
||
/// Async read | ||
pub trait Read<A: AddressMode = SevenBitAddress> { | ||
/// Error type | ||
type Error; | ||
/// The future associated with the `read` method. | ||
type ReadFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Reads enough bytes from slave with `address` to fill `buffer` | ||
/// | ||
/// # I2C Events (contract) | ||
/// | ||
/// ``` text | ||
/// Master: ST SAD+R MAK MAK ... NMAK SP | ||
/// Slave: SAK B0 B1 ... BN | ||
/// ``` | ||
/// | ||
/// Where | ||
/// | ||
/// - `ST` = start condition | ||
/// - `SAD+R` = slave address followed by bit 1 to indicate reading | ||
/// - `SAK` = slave acknowledge | ||
/// - `Bi` = ith byte of data | ||
/// - `MAK` = master acknowledge | ||
/// - `NMAK` = master no acknowledge | ||
/// - `SP` = stop condition | ||
fn read<'a>(&'a mut self, address: A, read: &'a mut [u8]) -> Self::ReadFuture<'a>; | ||
} | ||
|
||
/// Async write | ||
pub trait Write<A: AddressMode = SevenBitAddress> { | ||
/// Error type | ||
type Error; | ||
/// The future associated with the `write` method. | ||
type WriteFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Writes bytes to slave with address `address` | ||
/// | ||
/// # I2C Events (contract) | ||
/// | ||
/// ``` text | ||
/// Master: ST SAD+W B0 B1 ... BN SP | ||
/// Slave: SAK SAK SAK ... SAK | ||
/// ``` | ||
/// | ||
/// Where | ||
/// | ||
/// - `ST` = start condition | ||
/// - `SAD+W` = slave address followed by bit 0 to indicate writing | ||
/// - `SAK` = slave acknowledge | ||
/// - `Bi` = ith byte of data | ||
/// - `SP` = stop condition | ||
fn write<'a>(&'a mut self, address: A, write: &'a [u8]) -> Self::WriteFuture<'a>; | ||
} | ||
|
||
/// Async write + read | ||
pub trait WriteRead<A: AddressMode = SevenBitAddress> { | ||
/// Error type | ||
type Error; | ||
/// The future associated with the `write_read` method. | ||
type WriteReadFuture<'a>: Future<Output = Result<&'a [u8], Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Writes bytes to slave with address `address` and then reads enough bytes to fill `read` *in a | ||
/// single transaction*. The returned buffer is the initialized `read` buffer. | ||
/// | ||
/// # I2C Events (contract) | ||
/// | ||
/// ``` text | ||
/// Master: ST SAD+W O0 O1 ... OM SR SAD+R MAK MAK ... NMAK SP | ||
/// Slave: SAK SAK SAK ... SAK SAK I0 I1 ... IN | ||
/// ``` | ||
/// | ||
/// Where | ||
/// | ||
/// - `ST` = start condition | ||
/// - `SAD+W` = slave address followed by bit 0 to indicate writing | ||
/// - `SAK` = slave acknowledge | ||
/// - `Oi` = ith outgoing byte of data | ||
/// - `SR` = repeated start condition | ||
/// - `SAD+R` = slave address followed by bit 1 to indicate reading | ||
/// - `Ii` = ith incoming byte of data | ||
/// - `MAK` = master acknowledge | ||
/// - `NMAK` = master no acknowledge | ||
/// - `SP` = stop condition | ||
fn write_read<'a>( | ||
&'a mut self, | ||
address: A, | ||
write: &'a [u8], | ||
read: &'a mut [u8], | ||
) -> Self::WriteReadFuture<'a>; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
//! Asynchronous APIs | ||
//! | ||
//! This traits use `core::future::Future` and generic associated types. | ||
|
||
pub mod delay; | ||
pub mod digital; | ||
pub mod i2c; | ||
pub mod serial; | ||
pub mod spi; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
//! Serial interface | ||
|
||
use core::future::Future; | ||
|
||
/// Read half of a serial interface | ||
/// | ||
/// Some serial interfaces support different data sizes (8 bits, 9 bits, etc.); | ||
/// This can be encoded in this trait via the `Word` type parameter. | ||
pub trait Read<Word> { | ||
/// Read error | ||
type Error; | ||
|
||
/// The future associated with the `read` method. | ||
type ReadFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Reads words from the serial interface into the supplied slice. | ||
fn read<'a>(&'a mut self, read: &'a mut [Word]) -> Self::ReadFuture<'a>; | ||
} | ||
|
||
/// Write half of a serial interface | ||
pub trait Write<Word> { | ||
/// Write error | ||
type Error; | ||
|
||
/// The future associated with the `write` method. | ||
type WriteFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// The future associated with the `flush` method. | ||
type FlushFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
where | ||
Self: 'a; | ||
|
||
/// Writes a single word to the serial interface | ||
fn write<'a>(&'a mut self, word: Word) -> Self::WriteFuture<'a>; | ||
|
||
/// Ensures that none of the previously written words are still buffered | ||
fn flush<'a>(&'a mut self) -> Self::FlushFuture<'a>; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The whole
futures
approach should be documented here. Including examples, executors, waking, etc.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with those — that being said I don't think it's quite sorted out how HALs are going to support this. I think they definitely can (and will), but it's going to require some thought as to how HALs should install interrupt handlers and whatnot for async operations to work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure. There is no "one true answer" as for how all operations should concert in all situations. However, the different alternatives and considerations about how to implement and consume these traits as well as what the expectations are about how the operations will run should be explained here.