aboutsummaryrefslogtreecommitdiff
path: root/embassy-executor
diff options
context:
space:
mode:
authorxgroleau🐢 <[email protected]>2024-02-06 10:38:48 -0500
committerxgroleau🐢 <[email protected]>2024-02-06 15:08:05 -0500
commit5f36108896d909ed990a587941d74e0488bcd190 (patch)
tree11a12c4650ad61ace7cf53e3633cf4af8d928ec8 /embassy-executor
parentad7d4494fad12f98c7e8e2b776bc12453a66be9a (diff)
fix: rtos-usage time missing
Diffstat (limited to 'embassy-executor')
-rw-r--r--embassy-executor/Cargo.toml4
-rw-r--r--embassy-executor/src/raw/mod.rs2
2 files changed, 5 insertions, 1 deletions
diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index 409df0d75..0762e2434 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -34,6 +34,7 @@ log = { version = "0.4.14", optional = true }
34rtos-trace = { version = "0.1.2", optional = true } 34rtos-trace = { version = "0.1.2", optional = true }
35 35
36embassy-executor-macros = { version = "0.4.0", path = "../embassy-executor-macros" } 36embassy-executor-macros = { version = "0.4.0", path = "../embassy-executor-macros" }
37embassy-time = { version = "0.3.0", path = "../embassy-time", optional = true }
37embassy-time-driver = { version = "0.1.0", path = "../embassy-time-driver", optional = true } 38embassy-time-driver = { version = "0.1.0", path = "../embassy-time-driver", optional = true }
38embassy-time-queue-driver = { version = "0.1.0", path = "../embassy-time-queue-driver", optional = true } 39embassy-time-queue-driver = { version = "0.1.0", path = "../embassy-time-queue-driver", optional = true }
39critical-section = "1.1" 40critical-section = "1.1"
@@ -71,6 +72,9 @@ turbowakers = []
71## Use the executor-integrated `embassy-time` timer queue. 72## Use the executor-integrated `embassy-time` timer queue.
72integrated-timers = ["dep:embassy-time-driver", "dep:embassy-time-queue-driver"] 73integrated-timers = ["dep:embassy-time-driver", "dep:embassy-time-queue-driver"]
73 74
75# Support for rtos trace require time
76rtos-trace = ["dep:rtos-trace", "dep:embassy-time"]
77
74#! ### Architecture 78#! ### Architecture
75_arch = [] # some arch was picked 79_arch = [] # some arch was picked
76## std 80## std
diff --git a/embassy-executor/src/raw/mod.rs b/embassy-executor/src/raw/mod.rs
index 3f00be4a8..fbc0481c2 100644
--- a/embassy-executor/src/raw/mod.rs
+++ b/embassy-executor/src/raw/mod.rs
@@ -588,7 +588,7 @@ impl rtos_trace::RtosTraceOSCallbacks for Executor {
588 } 588 }
589 #[cfg(feature = "integrated-timers")] 589 #[cfg(feature = "integrated-timers")]
590 fn time() -> u64 { 590 fn time() -> u64 {
591 Instant::now().as_micros() 591 embassy_time::Instant::now().as_millis()
592 } 592 }
593 #[cfg(not(feature = "integrated-timers"))] 593 #[cfg(not(feature = "integrated-timers"))]
594 fn time() -> u64 { 594 fn time() -> u64 {