Skip to content

Update to latest release (0.6.0) for embassy-executor in esp-embassy-hal (fixes #1941) #1942

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.

Sign up for GitHub

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

Merged
jessebraham merged 8 commits into from
Aug 14, 2024
Merged

Update to latest release (0.6.0) for embassy-executor in esp-embassy-hal (fixes #1941) #1942

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad25c46
Updated to latest release (`0.6.0`) for `embassy-executor`
Sycrosity Aug 13, 2024
71a0b68
update changelog
Sycrosity Aug 13, 2024
944ed78
update hil-test version of embassy-executor to 0.6.0
Sycrosity Aug 13, 2024
419a144
update embassy-executor in `examples`
Sycrosity Aug 13, 2024
f05b71e
reflect esp_hal change in `OneShotTimer` to not have a lifetime.
Sycrosity Aug 13, 2024
a5bc549
update changelog
Sycrosity Aug 13, 2024
1461ee7
revert OneShotTimer changes
Sycrosity Aug 13, 2024
17f0a13
Merge branch 'main' into main
Sycrosity Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions esp-hal-embassy/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Updated to latest release (`0.6.0`) for `embassy-executor` (#1942)

### Fixed

- Fixed a bug where the timeout was huge whenever the timestamp at the time of scheduling was already in the past (#1875)
- Fixed interrupt executors looping endlessly when `integrated-timers` is used. (#1936)
- Fixed reference to `OneShotTimer` which had a now unneeded lifetime annotation (#1942)

### Removed

Expand Down
2 changes: 1 addition & 1 deletion esp-hal-embassy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ features = ["esp32c6"]
critical-section = "1.1.2"
defmt = { version = "0.3.8", optional = true }
document-features = "0.2.10"
embassy-executor = { version = "0.5.0", optional = true }
embassy-executor = { version = "0.6.0", optional = true }
embassy-time-driver = { version = "0.1.0", features = [ "tick-hz-1_000_000" ] }
esp-hal = { version = "0.19.0", path = "../esp-hal" }
log = { version = "0.4.22", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion esp-hal-embassy/src/time_driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use esp_hal::{

pub const MAX_SUPPORTED_ALARM_COUNT: usize = 7;

pub type Timer = OneShotTimer<'static, ErasedTimer>;
pub type Timer = OneShotTimer<ErasedTimer>;

static TIMERS: Mutex<RefCell<Option<&'static mut [Timer]>>> = Mutex::new(RefCell::new(None));

Expand Down
2 changes: 1 addition & 1 deletion examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cfg-if = "1.0.0"
critical-section = "1.1.2"
crypto-bigint = { version = "0.5.5", default-features = false }
elliptic-curve = { version = "0.13.8", default-features = false, features = ["sec1"] }
embassy-executor = { version = "0.5.0", features = ["task-arena-size-40960"] }
embassy-executor = { version = "0.6.0", features = ["task-arena-size-40960"] }
embassy-futures = "0.1.1"
embassy-net = { version = "0.4.0", features = [ "tcp", "udp", "dhcpv4", "medium-ethernet"] }
embassy-sync = "0.6.0"
Expand Down
2 changes: 1 addition & 1 deletion hil-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static_cell = { version = "2.1.0", features = ["nightly"] }
[dev-dependencies]
crypto-bigint = { version = "0.5.5", default-features = false }
elliptic-curve = { version = "0.13.8", default-features = false, features = ["sec1"] }
embassy-executor = { version = "0.5.0", default-features = false }
embassy-executor = { version = "0.6.0", default-features = false }
# Add the `embedded-test/defmt` feature for more verbose testing
embedded-test = { version = "0.4.0", default-features = false }
hex-literal = "0.4.1"
Expand Down