aboutsummaryrefslogtreecommitdiff
path: root/embassy-time
diff options
context:
space:
mode:
authorUlf Lilleengen <[email protected]>2022-09-29 11:02:43 +0200
committerUlf Lilleengen <[email protected]>2022-09-29 11:27:46 +0200
commit72c2e985bb481fbc2e138a8e98b9dbb27878f370 (patch)
treef573324f2449b68b7b1fef579b755a67dbb406d7 /embassy-time
parent77ece3f903735b50f265ddd43520c50e0f28c1a1 (diff)
Update embedded-hal versions and explicitly pin
Diffstat (limited to 'embassy-time')
-rw-r--r--embassy-time/Cargo.toml6
-rw-r--r--embassy-time/src/delay.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml
index 6d71e100f..c3b361b8a 100644
--- a/embassy-time/Cargo.toml
+++ b/embassy-time/Cargo.toml
@@ -105,8 +105,8 @@ defmt = { version = "0.3", optional = true }
105log = { version = "0.4.14", optional = true } 105log = { version = "0.4.14", optional = true }
106 106
107embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } 107embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" }
108embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8", optional = true} 108embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.9", optional = true}
109embedded-hal-async = { version = "0.1.0-alpha.1", optional = true} 109embedded-hal-async = { version = "=0.1.0-alpha.2", optional = true}
110 110
111futures-util = { version = "0.3.17", default-features = false } 111futures-util = { version = "0.3.17", default-features = false }
112embassy-macros = { version = "0.1.0", path = "../embassy-macros"} 112embassy-macros = { version = "0.1.0", path = "../embassy-macros"}
@@ -117,4 +117,4 @@ cfg-if = "1.0.0"
117# WASM dependencies 117# WASM dependencies
118wasm-bindgen = { version = "0.2.81", optional = true } 118wasm-bindgen = { version = "0.2.81", optional = true }
119js-sys = { version = "0.3", optional = true } 119js-sys = { version = "0.3", optional = true }
120wasm-timer = { version = "0.2.5", optional = true } \ No newline at end of file 120wasm-timer = { version = "0.2.5", optional = true }
diff --git a/embassy-time/src/delay.rs b/embassy-time/src/delay.rs
index 0a7982963..ff6b6869a 100644
--- a/embassy-time/src/delay.rs
+++ b/embassy-time/src/delay.rs
@@ -18,7 +18,7 @@ pub struct Delay;
18mod eh1 { 18mod eh1 {
19 use super::*; 19 use super::*;
20 20
21 impl embedded_hal_1::delay::blocking::DelayUs for Delay { 21 impl embedded_hal_1::delay::DelayUs for Delay {
22 type Error = core::convert::Infallible; 22 type Error = core::convert::Infallible;
23 23
24 fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> { 24 fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> {