itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-10-02 14:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not implement async delay for SYSTIMER if the embassy-time-systick feature is enabled (#839)

Browse Source 
* Do not implement async delay for `SYSTIMER` if the `embassy-time-systick` feature is enabled

* Update CHANGELOG.md
This commit is contained in:
Jesse Braham 2023-10-05 09:35:12 -07:00 committed by GitHub
parent 727b8e621e
commit 6ab08efd6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Async support for I2S (#801)
- Async support for PARL_IO (#807)
- Implement `embeded_hal_async::delay::DelayUs` trait for `SYSTIMER` alarms (#812)
- This trait is NOT implemented when the `embassy-time-systick` feature is enabled!
- ETM driver, GPIO ETM (#819)
- (G)DMA AES support (#821)
- SYSTIMER ETM functionality (#828)

6
esp-hal-common/src/systimer.rs
View File

@ -268,7 +268,11 @@ impl<T> Alarm<T, 2> {
}
}
#[cfg(feature = "async")]
// FIXME: The `embedded_hal_async::delay::DelayUs` trait implementation
// interferes with the embassy time driver, which also uses the
// `SYSTIMER` peripheral. Until we come up with a solution, do not
// implement this trait if the `embassy-time-systick` feature is enabled.
#[cfg(all(feature = "async", not(feature = "embassy-time-systick")))]
mod asynch {
use core::{
pin::Pin,