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

Add new embassy features for esp32s2 and other systimers. Enable embassy tick rate features by default (#1247)

Browse Source
This commit is contained in:
Scott Mabin 2024-03-06 17:04:05 +00:00 committed by GitHub
parent 8841d82ead
commit e65951c882
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -68,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- The DMA peripheral is now called `Dma` for devices with both PDMA and GDMA controllers (#1125) - The DMA peripheral is now called `Dma` for devices with both PDMA and GDMA controllers (#1125)
- The `ADC` driver's constructor is now `new` instead of `adc`, to be more consistent with other APIs (#1133) - The `ADC` driver's constructor is now `new` instead of `adc`, to be more consistent with other APIs (#1133)
- `embassy-executor`'s `integrated-timers` is no longer enabled by default. - `embassy-executor`'s `integrated-timers` is no longer enabled by default.
- Renamed `embassy-time-systick` to `embassy-time-systick-16mhz` for use with all chips with a systimer, except `esp32s2`. Added `embassy-time-systick-80mhz` specifically for the `esp32s2`. (#1247)
## [0.15.0] - 2024-01-19 ## [0.15.0] - 2024-01-19

12
esp-hal/Cargo.toml
View File

@ -64,6 +64,7 @@ xtensa-lx-rt = { version = "0.16.0", optional = true }
[build-dependencies] [build-dependencies]
basic-toml = "0.1.8" basic-toml = "0.1.8"
serde = { version = "1.0.195", features = ["derive"] } serde = { version = "1.0.195", features = ["derive"] }
cfg-if = "1"
[features] [features]
default = ["rt", "vectored"] default = ["rt", "vectored"]
@ -180,11 +181,16 @@ embassy-executor-thread = ["embassy", "embassy-executor"]
## by the time driver. ## by the time driver.
embassy-integrated-timers = ["embassy-executor?/integrated-timers"] embassy-integrated-timers = ["embassy-executor?/integrated-timers"]
## Enable the embassy time driver using the `SYSTIMER` peripheral. The ## Enable the embassy time driver using the `SYSTIMER` peripheral. The
## `SYSTIMER` peripheral has three alarams available for use. ## `SYSTIMER` peripheral has three alarams available for use. Do **not**
embassy-time-systick = [] ## use when targeting an `esp32s2`.
embassy-time-systick-16mhz = ["embassy-time-driver/tick-hz-16_000_000"]
## Enable the embassy time driver using the `SYSTIMER` peripheral. The
## `SYSTIMER` peripheral has three alarams available for use. Must only
## be used when targeting an `esp32s2`.
embassy-time-systick-80mhz = ["embassy-time-driver/tick-hz-80_000_000"]
## Enable the embassy time driver using the `TIMG0` peripheral. The `TIMG0` ## Enable the embassy time driver using the `TIMG0` peripheral. The `TIMG0`
## peripheral has two alarms available for use. ## peripheral has two alarms available for use.
embassy-time-timg0 = [] embassy-time-timg0 = ["embassy-time-driver/tick-hz-1_000_000"]
#! ### PSRAM Feature Flags #! ### PSRAM Feature Flags
## Use externally connected PSRAM (2MB). ## Use externally connected PSRAM (2MB).

14
esp-hal/build.rs
View File

@ -111,11 +111,15 @@ fn main() -> Result<(), Box<dyn Error>> {
// is available: // is available:
#[cfg(feature = "embassy")] #[cfg(feature = "embassy")]
{ {
#[cfg(feature = "esp32")] cfg_if::cfg_if! {
assert_unique_used_features!("embassy-time-timg0"); if #[cfg(feature = "esp32")] {
assert_unique_used_features!("embassy-time-timg0");
#[cfg(not(feature = "esp32"))] } else if #[cfg(feature = "esp32s2")] {
assert_unique_used_features!("embassy-time-systick", "embassy-time-timg0"); assert_unique_used_features!("embassy-time-systick-80mhz", "embassy-time-timg0");
} else {
assert_unique_used_features!("embassy-time-systick-16mhz", "embassy-time-timg0");
}
}
} }
#[cfg(feature = "flip-link")] #[cfg(feature = "flip-link")]

8
esp-hal/src/embassy/mod.rs
View File

@ -86,7 +86,13 @@ use embassy_time_driver::{AlarmHandle, Driver};
use crate::{interrupt::Priority, peripherals::Interrupt}; use crate::{interrupt::Priority, peripherals::Interrupt};
#[cfg_attr( #[cfg_attr(
all(systimer, feature = "embassy-time-systick"), all(
systimer,
any(
feature = "embassy-time-systick-16mhz",
feature = "embassy-time-systick-80mhz"
)
),
path = "time_driver_systimer.rs" path = "time_driver_systimer.rs"
)] )]
#[cfg_attr( #[cfg_attr(

2
examples/Cargo.toml
View File

@ -59,7 +59,7 @@ embassy = ["esp-hal/embassy"]
embassy-executor-thread = ["esp-hal/embassy-executor-thread"] embassy-executor-thread = ["esp-hal/embassy-executor-thread"]
embassy-executor-interrupt = ["esp-hal/embassy-executor-interrupt"] embassy-executor-interrupt = ["esp-hal/embassy-executor-interrupt"]
embassy-time-timg0 = ["esp-hal/embassy-time-timg0", "embassy-time-driver/tick-hz-1_000_000"] embassy-time-timg0 = ["esp-hal/embassy-time-timg0"]
embassy-generic-timers = ["embassy-time/generic-queue-8"] embassy-generic-timers = ["embassy-time/generic-queue-8"]
direct-vectoring = ["esp-hal/direct-vectoring"] direct-vectoring = ["esp-hal/direct-vectoring"]