aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2025-01-04 12:02:05 +0000
committerGitHub <[email protected]>2025-01-04 12:02:05 +0000
commitad2f7c329bbbefc0e3be38b36627705a5f42427b (patch)
tree672db0c4cc5f3d7e93355a87951cab6a1585f5aa /embassy-nrf
parente68efc2d7cdea195aec112ecb61231e148a282c2 (diff)
parent0d824beb1139ad18d36a5e3a321f2c3fb46ce868 (diff)
Merge pull request #3720 from NZRosto/eh-time-feature-nrf
Correctly gate `time` feature of embassy-embedded-hal in embassy-nrf
Diffstat (limited to 'embassy-nrf')
-rw-r--r--embassy-nrf/Cargo.toml6
1 files changed, 3 insertions, 3 deletions
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
index 45666ade8..79e919f68 100644
--- a/embassy-nrf/Cargo.toml
+++ b/embassy-nrf/Cargo.toml
@@ -32,7 +32,7 @@ default = ["rt"]
32rt = ["nrf-pac/rt"] 32rt = ["nrf-pac/rt"]
33 33
34## Enable features requiring `embassy-time` 34## Enable features requiring `embassy-time`
35time = ["dep:embassy-time"] 35time = ["dep:embassy-time", "embassy-embedded-hal/time"]
36 36
37## Enable defmt 37## Enable defmt
38defmt = ["dep:defmt", "embassy-hal-internal/defmt", "embassy-sync/defmt", "embassy-usb-driver/defmt", "embassy-embedded-hal/defmt"] 38defmt = ["dep:defmt", "embassy-hal-internal/defmt", "embassy-sync/defmt", "embassy-usb-driver/defmt", "embassy-embedded-hal/defmt"]
@@ -119,7 +119,7 @@ _nrf52 = ["_ppi"]
119_nrf51 = ["_ppi"] 119_nrf51 = ["_ppi"]
120_nrf91 = [] 120_nrf91 = []
121 121
122_time-driver = ["dep:embassy-time-driver", "embassy-time-driver?/tick-hz-32_768", "dep:embassy-time-queue-utils"] 122_time-driver = ["dep:embassy-time-driver", "embassy-time-driver?/tick-hz-32_768", "dep:embassy-time-queue-utils", "embassy-embedded-hal/time"]
123 123
124# trustzone state. 124# trustzone state.
125_s = [] 125_s = []
@@ -139,7 +139,7 @@ embassy-time-queue-utils = { version = "0.1", path = "../embassy-time-queue-util
139embassy-time = { version = "0.4.0", path = "../embassy-time", optional = true } 139embassy-time = { version = "0.4.0", path = "../embassy-time", optional = true }
140embassy-sync = { version = "0.6.1", path = "../embassy-sync" } 140embassy-sync = { version = "0.6.1", path = "../embassy-sync" }
141embassy-hal-internal = {version = "0.2.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-3"] } 141embassy-hal-internal = {version = "0.2.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-3"] }
142embassy-embedded-hal = {version = "0.2.0", path = "../embassy-embedded-hal" } 142embassy-embedded-hal = {version = "0.2.0", path = "../embassy-embedded-hal", default-features = false }
143embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver" } 143embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver" }
144 144
145embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } 145embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] }