diff options
Diffstat (limited to 'embassy-time')
| -rw-r--r-- | embassy-time/Cargo.toml | 8 | ||||
| -rw-r--r-- | embassy-time/src/timer.rs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml index e3074119f..4f4ea0b14 100644 --- a/embassy-time/Cargo.toml +++ b/embassy-time/Cargo.toml | |||
| @@ -24,8 +24,8 @@ target = "x86_64-unknown-linux-gnu" | |||
| 24 | features = ["defmt", "std"] | 24 | features = ["defmt", "std"] |
| 25 | 25 | ||
| 26 | [features] | 26 | [features] |
| 27 | std = ["tick-hz-1_000_000", "critical-section/std"] | 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"] | 28 | wasm = ["dep:wasm-bindgen", "dep:js-sys", "dep:wasm-timer", "tick-hz-1_000_000", "dep:embassy-time-queue-driver"] |
| 29 | 29 | ||
| 30 | ## Display the time since startup next to defmt log messages. | 30 | ## Display the time since startup next to defmt log messages. |
| 31 | ## At most 1 `defmt-timestamp-uptime-*` feature can be used. | 31 | ## At most 1 `defmt-timestamp-uptime-*` feature can be used. |
| @@ -40,7 +40,7 @@ defmt-timestamp-uptime-tms = ["defmt"] | |||
| 40 | defmt-timestamp-uptime-tus = ["defmt"] | 40 | defmt-timestamp-uptime-tus = ["defmt"] |
| 41 | 41 | ||
| 42 | ## Create a `MockDriver` that can be manually advanced for testing purposes. | 42 | ## Create a `MockDriver` that can be manually advanced for testing purposes. |
| 43 | mock-driver = ["tick-hz-1_000_000"] | 43 | mock-driver = ["tick-hz-1_000_000", "dep:embassy-time-queue-driver"] |
| 44 | 44 | ||
| 45 | #! ### Tick Rate | 45 | #! ### Tick Rate |
| 46 | #! | 46 | #! |
| @@ -384,7 +384,7 @@ tick-hz-5_242_880_000 = ["embassy-time-driver/tick-hz-5_242_880_000"] | |||
| 384 | 384 | ||
| 385 | [dependencies] | 385 | [dependencies] |
| 386 | embassy-time-driver = { version = "0.1.0", path = "../embassy-time-driver" } | 386 | embassy-time-driver = { version = "0.1.0", path = "../embassy-time-driver" } |
| 387 | embassy-time-queue-driver = { version = "0.1.0", path = "../embassy-time-queue-driver" } | 387 | embassy-time-queue-driver = { version = "0.1.0", path = "../embassy-time-queue-driver", optional = true} |
| 388 | 388 | ||
| 389 | defmt = { version = "0.3", optional = true } | 389 | defmt = { version = "0.3", optional = true } |
| 390 | log = { version = "0.4.14", optional = true } | 390 | log = { version = "0.4.14", optional = true } |
diff --git a/embassy-time/src/timer.rs b/embassy-time/src/timer.rs index 4d7194b20..295ddbd9b 100644 --- a/embassy-time/src/timer.rs +++ b/embassy-time/src/timer.rs | |||
| @@ -157,7 +157,7 @@ impl Future for Timer { | |||
| 157 | if self.yielded_once && self.expires_at <= Instant::now() { | 157 | if self.yielded_once && self.expires_at <= Instant::now() { |
| 158 | Poll::Ready(()) | 158 | Poll::Ready(()) |
| 159 | } else { | 159 | } else { |
| 160 | embassy_time_queue_driver::schedule_wake(self.expires_at.as_ticks(), cx.waker()); | 160 | embassy_time_driver::schedule_wake(self.expires_at.as_ticks(), cx.waker()); |
| 161 | self.yielded_once = true; | 161 | self.yielded_once = true; |
| 162 | Poll::Pending | 162 | Poll::Pending |
| 163 | } | 163 | } |
| @@ -238,7 +238,7 @@ impl Ticker { | |||
| 238 | self.expires_at += dur; | 238 | self.expires_at += dur; |
| 239 | Poll::Ready(()) | 239 | Poll::Ready(()) |
| 240 | } else { | 240 | } else { |
| 241 | embassy_time_queue_driver::schedule_wake(self.expires_at.as_ticks(), cx.waker()); | 241 | embassy_time_driver::schedule_wake(self.expires_at.as_ticks(), cx.waker()); |
| 242 | Poll::Pending | 242 | Poll::Pending |
| 243 | } | 243 | } |
| 244 | }) | 244 | }) |
| @@ -255,7 +255,7 @@ impl Stream for Ticker { | |||
| 255 | self.expires_at += dur; | 255 | self.expires_at += dur; |
| 256 | Poll::Ready(Some(())) | 256 | Poll::Ready(Some(())) |
| 257 | } else { | 257 | } else { |
| 258 | embassy_time_queue_driver::schedule_wake(self.expires_at.as_ticks(), cx.waker()); | 258 | embassy_time_driver::schedule_wake(self.expires_at.as_ticks(), cx.waker()); |
| 259 | Poll::Pending | 259 | Poll::Pending |
| 260 | } | 260 | } |
| 261 | } | 261 | } |
