diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-01-04 12:02:05 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-04 12:02:05 +0000 |
| commit | ad2f7c329bbbefc0e3be38b36627705a5f42427b (patch) | |
| tree | 672db0c4cc5f3d7e93355a87951cab6a1585f5aa | |
| parent | e68efc2d7cdea195aec112ecb61231e148a282c2 (diff) | |
| parent | 0d824beb1139ad18d36a5e3a321f2c3fb46ce868 (diff) | |
Merge pull request #3720 from NZRosto/eh-time-feature-nrf
Correctly gate `time` feature of embassy-embedded-hal in embassy-nrf
| -rw-r--r-- | embassy-nrf/Cargo.toml | 6 |
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"] | |||
| 32 | rt = ["nrf-pac/rt"] | 32 | rt = ["nrf-pac/rt"] |
| 33 | 33 | ||
| 34 | ## Enable features requiring `embassy-time` | 34 | ## Enable features requiring `embassy-time` |
| 35 | time = ["dep:embassy-time"] | 35 | time = ["dep:embassy-time", "embassy-embedded-hal/time"] |
| 36 | 36 | ||
| 37 | ## Enable defmt | 37 | ## Enable defmt |
| 38 | defmt = ["dep:defmt", "embassy-hal-internal/defmt", "embassy-sync/defmt", "embassy-usb-driver/defmt", "embassy-embedded-hal/defmt"] | 38 | defmt = ["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 | |||
| 139 | embassy-time = { version = "0.4.0", path = "../embassy-time", optional = true } | 139 | embassy-time = { version = "0.4.0", path = "../embassy-time", optional = true } |
| 140 | embassy-sync = { version = "0.6.1", path = "../embassy-sync" } | 140 | embassy-sync = { version = "0.6.1", path = "../embassy-sync" } |
| 141 | embassy-hal-internal = {version = "0.2.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-3"] } | 141 | embassy-hal-internal = {version = "0.2.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-3"] } |
| 142 | embassy-embedded-hal = {version = "0.2.0", path = "../embassy-embedded-hal" } | 142 | embassy-embedded-hal = {version = "0.2.0", path = "../embassy-embedded-hal", default-features = false } |
| 143 | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver" } | 143 | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver" } |
| 144 | 144 | ||
| 145 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | 145 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } |
