Skip to content

Commit 7b166c2

Browse files
bugadanibugadani
committed
Rename ETQD, bump date
1 parent 2030704 commit 7b166c2

File tree

29 files changed

+59
-71
lines changed

29 files changed

+59
-71
lines changed

‎.github/ci/doc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ docserver-builder -i ./embassy-stm32-wpan -o webroot/crates/embassy-stm32-wpan/g
3232

3333
docserver-builder -i ./embassy-time -o webroot/crates/embassy-time/git.zup
3434
docserver-builder -i ./embassy-time-driver -o webroot/crates/embassy-time-driver/git.zup
35-
docserver-builder -i ./embassy-time-queue-driver -o webroot/crates/embassy-time-queue-driver/git.zup
35+
docserver-builder -i ./embassy-time-queue-utils -o webroot/crates/embassy-time-queue-utils/git.zup
3636

3737
docserver-builder -i ./embassy-usb -o webroot/crates/embassy-usb/git.zup
3838
docserver-builder -i ./embassy-usb-dfu -o webroot/crates/embassy-usb-dfu/git.zup

‎.github/ci/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cargo test --manifest-path ./embassy-futures/Cargo.toml
1717
cargo test --manifest-path ./embassy-sync/Cargo.toml
1818
cargo test --manifest-path ./embassy-embedded-hal/Cargo.toml
1919
cargo test --manifest-path ./embassy-hal-internal/Cargo.toml
20-
cargo test --manifest-path ./embassy-time/Cargo.toml --features mock-driver,embassy-time-queue-driver/generic-queue-8
20+
cargo test --manifest-path ./embassy-time/Cargo.toml --features mock-driver,embassy-time-queue-utils/generic-queue-8
2121
cargo test --manifest-path ./embassy-time-driver/Cargo.toml
2222

2323
cargo test --manifest-path ./embassy-boot/Cargo.toml

‎ci-xtensa.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ cargo batch \
2222
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf --features arch-spin,executor-thread \
2323
--- build --release --manifest-path embassy-sync/Cargo.toml --target xtensa-esp32s2-none-elf --features defmt \
2424
--- build --release --manifest-path embassy-time/Cargo.toml --target xtensa-esp32s2-none-elf --features defmt,defmt-timestamp-uptime,mock-driver \
25-
--- build --release --manifest-path embassy-time-queue-driver/Cargo.toml --target xtensa-esp32s2-none-elf \
26-
--- build --release --manifest-path embassy-time-queue-driver/Cargo.toml --target xtensa-esp32s2-none-elf --features generic-queue-8 \
25+
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target xtensa-esp32s2-none-elf \
26+
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target xtensa-esp32s2-none-elf --features generic-queue-8 \
2727
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet,packet-trace \
2828
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,multicast,medium-ethernet \
2929
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet \

‎ci.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ cargo batch \
3939
--- build --release --manifest-path embassy-executor/Cargo.toml --target riscv32imac-unknown-none-elf --features arch-riscv32,executor-thread \
4040
--- build --release --manifest-path embassy-sync/Cargo.toml --target thumbv6m-none-eabi --features defmt \
4141
--- build --release --manifest-path embassy-time/Cargo.toml --target thumbv6m-none-eabi --features defmt,defmt-timestamp-uptime,mock-driver \
42-
--- build --release --manifest-path embassy-time-queue-driver/Cargo.toml --target thumbv6m-none-eabi \
43-
--- build --release --manifest-path embassy-time-queue-driver/Cargo.toml --target thumbv6m-none-eabi --features generic-queue-8 \
42+
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi \
43+
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi --features generic-queue-8 \
4444
--- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet,packet-trace \
4545
--- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,multicast,medium-ethernet \
4646
--- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet \

‎docs/pages/faq.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ Example:
140140
[source,toml]
141141
----
142142
[patch.crates-io]
143-
embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" }
144-
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" }
145-
# embassy-time = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" }
143+
embassy-time-queue-utils = { git = "https://github.com/embassy-rs/embassy.git", rev = "7f8af8a" }
144+
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "7f8af8a" }
145+
# embassy-time = { git = "https://github.com/embassy-rs/embassy.git", rev = "7f8af8a" }
146146
----
147147

148148
Note that the git revision should match any other embassy patches or git dependencies that you are using!

‎embassy-executor/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## 0.7.0 - 2024-12-18
8+
## 0.7.0 - 2024-12-20
99

1010
- embassy-executor no longer provides an `embassy-time-queue-driver` implementation
1111
- Added `TaskRef::executor` to obtain a reference to a task's executor

‎embassy-nrf/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ _nrf52 = ["_ppi"]
119119
_nrf51 = ["_ppi"]
120120
_nrf91 = []
121121

122-
_time-driver = ["dep:embassy-time-driver", "embassy-time-driver?/tick-hz-32_768", "dep:embassy-time-queue-driver"]
122+
_time-driver = ["dep:embassy-time-driver", "embassy-time-driver?/tick-hz-32_768", "dep:embassy-time-queue-utils"]
123123

124124
# trustzone state.
125125
_s = []
@@ -135,7 +135,7 @@ _nrf52832_anomaly_109 = []
135135

136136
[dependencies]
137137
embassy-time-driver = { version = "0.2", path = "../embassy-time-driver", optional = true }
138-
embassy-time-queue-driver = { version = "0.2", path = "../embassy-time-queue-driver", optional = true }
138+
embassy-time-queue-utils = { version = "0.1", path = "../embassy-time-queue-utils", optional = true }
139139
embassy-time = { version = "0.4.0", path = "../embassy-time", optional = true }
140140
embassy-sync = { version = "0.6.1", path = "../embassy-sync" }
141141
embassy-hal-internal = {version = "0.2.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-3"] }

‎embassy-nrf/src/time_driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use critical_section::CriticalSection;
55
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
66
use embassy_sync::blocking_mutex::CriticalSectionMutex as Mutex;
77
use embassy_time_driver::Driver;
8-
use embassy_time_queue_driver::Queue;
8+
use embassy_time_queue_utils::Queue;
99

1010
use crate::interrupt::InterruptExt;
1111
use crate::{interrupt, pac};

‎embassy-rp/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ critical-section-impl = ["critical-section/restore-state-u8"]
4040
unstable-pac = []
4141

4242
## Enable the timer for use with `embassy-time` with a 1MHz tick rate.
43-
time-driver = ["dep:embassy-time-driver", "embassy-time-driver?/tick-hz-1_000_000", "dep:embassy-time-queue-driver"]
43+
time-driver = ["dep:embassy-time-driver", "embassy-time-driver?/tick-hz-1_000_000", "dep:embassy-time-queue-utils"]
4444

4545
## Enable ROM function cache. This will store the address of a ROM function when first used, improving performance of subsequent calls.
4646
rom-func-cache = []
@@ -110,7 +110,7 @@ binary-info = ["rt", "dep:rp-binary-info", "rp-binary-info?/binary-info"]
110110
[dependencies]
111111
embassy-sync = { version = "0.6.1", path = "../embassy-sync" }
112112
embassy-time-driver = { version = "0.2", path = "../embassy-time-driver", optional = true }
113-
embassy-time-queue-driver = { version = "0.2", path = "../embassy-time-queue-driver", optional = true }
113+
embassy-time-queue-utils = { version = "0.1", path = "../embassy-time-queue-utils", optional = true }
114114
embassy-time = { version = "0.4.0", path = "../embassy-time" }
115115
embassy-futures = { version = "0.1.0", path = "../embassy-futures" }
116116
embassy-hal-internal = {version = "0.2.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-2"] }

‎embassy-rp/src/time_driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use critical_section::CriticalSection;
55
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
66
use embassy_sync::blocking_mutex::Mutex;
77
use embassy_time_driver::Driver;
8-
use embassy_time_queue_driver::Queue;
8+
use embassy_time_queue_utils::Queue;
99
#[cfg(feature = "rp2040")]
1010
use pac::TIMER;
1111
#[cfg(feature = "_rp235x")]

‎embassy-stm32/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ rustdoc-args = ["--cfg", "docsrs"]
4545
embassy-sync = { version = "0.6.1", path = "../embassy-sync" }
4646
embassy-time = { version = "0.4.0", path = "../embassy-time", optional = true }
4747
embassy-time-driver = { version = "0.2", path = "../embassy-time-driver", optional = true }
48-
embassy-time-queue-driver = { version = "0.2", path = "../embassy-time-queue-driver", optional = true }
48+
embassy-time-queue-utils = { version = "0.1", path = "../embassy-time-queue-utils", optional = true }
4949
embassy-futures = { version = "0.1.0", path = "../embassy-futures" }
5050
embassy-hal-internal = {version = "0.2.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-4"] }
5151
embassy-embedded-hal = {version = "0.2.0", path = "../embassy-embedded-hal", default-features = false }
@@ -150,7 +150,7 @@ time = ["dep:embassy-time", "embassy-embedded-hal/time"]
150150

151151
# Features starting with `_` are for internal use only. They're not intended
152152
# to be enabled by other crates, and are not covered by semver guarantees.
153-
_time-driver = ["dep:embassy-time-driver", "time", "dep:embassy-time-queue-driver"]
153+
_time-driver = ["dep:embassy-time-driver", "time", "dep:embassy-time-queue-utils"]
154154

155155
## Use any time driver
156156
time-driver-any = ["_time-driver"]

‎embassy-stm32/src/time_driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use critical_section::CriticalSection;
77
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
88
use embassy_sync::blocking_mutex::Mutex;
99
use embassy_time_driver::{Driver, TICK_HZ};
10-
use embassy_time_queue_driver::Queue;
10+
use embassy_time_queue_utils::Queue;
1111
use stm32_metapac::timer::{regs, TimGp16};
1212

1313
use crate::interrupt::typelevel::Interrupt;

‎embassy-time-driver/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## 0.2.0 - 2024-12-18
8+
## 0.2.0 - 2024-12-20
99

1010
- The `allocate_alarm`, `set_alarm_callback`, `set_alarm` functions have been removed.
1111
- `schedule_wake` has been added to the `Driver` trait.

‎embassy-time-driver/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
//! use core::cell::RefCell;
5454
//! use core::task::Waker;
5555
//!
56-
//! use embassy_time_queue_driver::Queue;
56+
//! use embassy_time_queue_utils::Queue;
5757
//! use embassy_time_driver::Driver;
5858
//!
5959
//! struct MyDriver {

‎embassy-time-queue-driver/README.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎embassy-time-queue-driver/src/lib.rs

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎embassy-time-queue-driver/CHANGELOG.md renamed to ‎embassy-time-queue-utils/CHANGELOG.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
# Changelog for embassy-time-queue-driver
1+
# Changelog for embassy-time-queue-utils
22

33
All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## 0.2.0 - 2024-12-18
9-
10-
- Added `generic-queue-N` features.
11-
- Added `embassy_time_queue_driver::Queue` struct which uses integrated or a generic storage (configured using `generic-queue-N`).
12-
138
## 0.1.0 - 2024-01-11
149

1510
Initial release

‎embassy-time-queue-driver/Cargo.toml renamed to ‎embassy-time-queue-utils/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[package]
2-
name = "embassy-time-queue-driver"
3-
version = "0.2.0"
2+
name = "embassy-time-queue-utils"
3+
version = "0.1.0"
44
edition = "2021"
55
description = "Timer queue driver trait for embassy-time"
66
repository = "https://github.com/embassy-rs/embassy"
7-
documentation = "https://docs.embassy.dev/embassy-time-queue-driver"
7+
documentation = "https://docs.embassy.dev/embassy-time-queue-utils"
88
readme = "README.md"
99
license = "MIT OR Apache-2.0"
1010
categories = [
@@ -53,6 +53,6 @@ generic-queue-128 = ["_generic-queue"]
5353
_generic-queue = []
5454

5555
[package.metadata.embassy_docs]
56-
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-time-queue-driver-v$VERSION/embassy-time-queue-driver/src/"
57-
src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-time-queue-driver/src/"
56+
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-time-queue-utils-v$VERSION/embassy-time-queue-utils/src/"
57+
src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-time-queue-utils/src/"
5858
target = "x86_64-unknown-linux-gnu"

‎embassy-time-queue-utils/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# embassy-time-queue-utils
2+
3+
This crate contains timer queues to help implementing an [`embassy-time-driver`](https://crates.io/crates/embassy-time-driver).
4+
5+
As a HAL user, you should only depend on this crate if your application does not use
6+
`embassy-executor` and your HAL does not configure a generic queue by itself.
7+
8+
As a HAL implementer, you need to depend on this crate if you want to implement a time driver,
9+
but how you should do so is documented in `embassy-time-driver`.

‎embassy-time-queue-driver/build.rs renamed to ‎embassy-time-queue-utils/build.rs

File renamed without changes.

‎embassy-time-queue-utils/src/lib.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#![no_std]
2+
#![doc = include_str!("../README.md")]
3+
#![warn(missing_docs)]
4+
5+
#[cfg(feature = "_generic-queue")]
6+
pub mod queue_generic;
7+
#[cfg(not(feature = "_generic-queue"))]
8+
pub mod queue_integrated;
9+
10+
#[cfg(feature = "_generic-queue")]
11+
pub use queue_generic::Queue;
12+
#[cfg(not(feature = "_generic-queue"))]
13+
pub use queue_integrated::Queue;

‎embassy-time-queue-driver/src/queue_generic.rs renamed to ‎embassy-time-queue-utils/src/queue_generic.rs

File renamed without changes.

‎embassy-time-queue-driver/src/queue_integrated.rs renamed to ‎embassy-time-queue-utils/src/queue_integrated.rs

File renamed without changes.

‎embassy-time/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## 0.4.0 - 2024-12-18
8+
## 0.4.0 - 2024-12-20
99

10-
- The `generic-queue` and related features have been removed (moved to embassy-time-queue-driver)
10+
- The `generic-queue` and related features have been removed (moved to embassy-time-queue-utils or HALs)
1111
- embassy-time no longer provides an `embassy-time-queue-driver` implementation
1212

1313
## 0.3.2 - 2024-08-05

‎embassy-time/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ target = "x86_64-unknown-linux-gnu"
2424
features = ["defmt", "std"]
2525

2626
[features]
27-
std = ["tick-hz-1_000_000", "critical-section/std", "dep:embassy-time-queue-driver"]
28-
wasm = ["dep:wasm-bindgen", "dep:js-sys", "dep:wasm-timer", "tick-hz-1_000_000", "dep:embassy-time-queue-driver"]
27+
std = ["tick-hz-1_000_000", "critical-section/std", "dep:embassy-time-queue-utils"]
28+
wasm = ["dep:wasm-bindgen", "dep:js-sys", "dep:wasm-timer", "tick-hz-1_000_000", "dep:embassy-time-queue-utils"]
2929

3030
## Display the time since startup next to defmt log messages.
3131
## At most 1 `defmt-timestamp-uptime-*` feature can be used.
@@ -40,7 +40,7 @@ defmt-timestamp-uptime-tms = ["defmt"]
4040
defmt-timestamp-uptime-tus = ["defmt"]
4141

4242
## Create a `MockDriver` that can be manually advanced for testing purposes.
43-
mock-driver = ["tick-hz-1_000_000", "dep:embassy-time-queue-driver"]
43+
mock-driver = ["tick-hz-1_000_000", "dep:embassy-time-queue-utils"]
4444

4545
#! ### Tick Rate
4646
#!
@@ -384,7 +384,7 @@ tick-hz-5_242_880_000 = ["embassy-time-driver/tick-hz-5_242_880_000"]
384384

385385
[dependencies]
386386
embassy-time-driver = { version = "0.2", path = "../embassy-time-driver" }
387-
embassy-time-queue-driver = { version = "0.2", path = "../embassy-time-queue-driver", optional = true}
387+
embassy-time-queue-utils = { version = "0.1", path = "../embassy-time-queue-utils", optional = true}
388388

389389
defmt = { version = "0.3", optional = true }
390390
log = { version = "0.4.14", optional = true }

‎embassy-time/src/driver_mock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use core::task::Waker;
33

44
use critical_section::Mutex as CsMutex;
55
use embassy_time_driver::Driver;
6-
use embassy_time_queue_driver::Queue;
6+
use embassy_time_queue_utils::Queue;
77

88
use crate::{Duration, Instant};
99

‎embassy-time/src/driver_std.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::thread;
33
use std::time::{Duration as StdDuration, Instant as StdInstant};
44

55
use embassy_time_driver::Driver;
6-
use embassy_time_queue_driver::Queue;
6+
use embassy_time_queue_utils::Queue;
77

88
struct TimeDriver {
99
signaler: Signaler,

‎embassy-time/src/driver_wasm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::sync::Mutex;
22

33
use embassy_time_driver::Driver;
4-
use embassy_time_queue_driver::Queue;
4+
use embassy_time_queue_utils::Queue;
55
use wasm_bindgen::prelude::*;
66
use wasm_timer::Instant as StdInstant;
77

‎examples/nrf52840-rtic/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ rtic = { version = "2", features = ["thumbv7-backend"] }
1010
embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
1111
embassy-sync = { version = "0.6.1", path = "../../embassy-sync", features = ["defmt"] }
1212
embassy-time = { version = "0.4.0", path = "../../embassy-time", features = [ "defmt", "defmt-timestamp-uptime"] }
13-
embassy-time-queue-driver = { version = "0.2", path = "../../embassy-time-queue-driver", features = ["generic-queue-8"] }
13+
embassy-time-queue-utils = { version = "0.1", path = "../../embassy-time-queue-utils", features = ["generic-queue-8"] }
1414
embassy-nrf = { version = "0.2.0", path = "../../embassy-nrf", features = [ "defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
1515

1616
defmt = "0.3"

0 commit comments

Comments
 (0)