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

esp-hal-wifi: make executors optional (again) (#1683)

Browse Source 
* esp-hal-wifi: make executors optional (again)

* esp-wifi: don't use default-features of `esp-hal-embassy`
This commit is contained in:
Kaspar Schleiser 2024-06-17 12:23:31 +02:00 committed by GitHub
parent bd711517f3
commit 152c0180df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esp-hal-embassy/Cargo.toml
View File

@ -15,7 +15,7 @@ features = ["esp32c6", "time-timg0"]
critical-section = "1.1.2" critical-section = "1.1.2"
defmt = { version = "0.3.8", optional = true } defmt = { version = "0.3.8", optional = true }
document-features = "0.2.8" document-features = "0.2.8"
embassy-executor = "0.5.0" embassy-executor = { version = "0.5.0", optional = true }
embassy-time-driver = "0.1.0" embassy-time-driver = "0.1.0"
esp-hal = { version = "0.18.0", path = "../esp-hal" } esp-hal = { version = "0.18.0", path = "../esp-hal" }
portable-atomic = "1.6.0" portable-atomic = "1.6.0"
@ -26,6 +26,8 @@ esp-build = { version = "0.1.0", path = "../esp-build" }
esp-metadata = { version = "0.1.1", path = "../esp-metadata" } esp-metadata = { version = "0.1.1", path = "../esp-metadata" }
[features] [features]
default = ["executors"]
esp32 = ["esp-hal/esp32"] esp32 = ["esp-hal/esp32"]
esp32c2 = ["esp-hal/esp32c2"] esp32c2 = ["esp-hal/esp32c2"]
esp32c3 = ["esp-hal/esp32c3"] esp32c3 = ["esp-hal/esp32c3"]
@ -35,9 +37,11 @@ esp32s2 = ["esp-hal/esp32s2"]
esp32s3 = ["esp-hal/esp32s3"] esp32s3 = ["esp-hal/esp32s3"]
## Implement `defmt::Format` on certain types. ## Implement `defmt::Format` on certain types.
defmt = ["dep:defmt", "embassy-executor/defmt", "esp-hal/defmt"] defmt = ["dep:defmt", "embassy-executor?/defmt", "esp-hal/defmt"]
## Provide `Executor` and `InterruptExecutor`
executors = ["dep:embassy-executor"]
## Use the executor-integrated `embassy-time` timer queue. ## Use the executor-integrated `embassy-time` timer queue.
integrated-timers = ["embassy-executor/integrated-timers"] integrated-timers = ["embassy-executor?/integrated-timers"]
#! ### Time Driver Feature Flags #! ### Time Driver Feature Flags
## SYSTIMER (16MHz) ## SYSTIMER (16MHz)

2
esp-hal-embassy/src/lib.rs
View File

@ -41,9 +41,11 @@ use core::cell::Cell;
use embassy_time_driver::{AlarmHandle, Driver}; use embassy_time_driver::{AlarmHandle, Driver};
use esp_hal::clock::Clocks; use esp_hal::clock::Clocks;
#[cfg(feature = "executors")]
pub use self::executor::{Executor, InterruptExecutor}; pub use self::executor::{Executor, InterruptExecutor};
use self::time_driver::{EmbassyTimer, TimerType}; use self::time_driver::{EmbassyTimer, TimerType};
#[cfg(feature = "executors")]
mod executor; mod executor;
mod time_driver; mod time_driver;

1
esp-hal/CHANGELOG.md
View File

@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Refactor `Dac1`/`Dac2` drivers into a single `Dac` driver (#1661) - Refactor `Dac1`/`Dac2` drivers into a single `Dac` driver (#1661)
- esp-hal-embassy: make executor code optional (but default) again
### Removed ### Removed
- uart: Removed `configure_pins` methods (#1592) - uart: Removed `configure_pins` methods (#1592)

2
esp-wifi/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["embedded", "hardware-support", "no-std"]
[dependencies] [dependencies]
defmt = { version = "0.3.8", optional = true } defmt = { version = "0.3.8", optional = true }
esp-hal = { version = "0.18.0", path = "../esp-hal", default-features = false } esp-hal = { version = "0.18.0", path = "../esp-hal", default-features = false }
esp-hal-embassy = { version = "0.1.0", path = "../esp-hal-embassy", optional = true } esp-hal-embassy = { version = "0.1.0", path = "../esp-hal-embassy", default-features = false, optional = true }
smoltcp = { version = "0.11.0", default-features = false, features = [ smoltcp = { version = "0.11.0", default-features = false, features = [
"medium-ethernet", "medium-ethernet",
"socket-raw", "socket-raw",