From 1fab1027235bfd2f9e9f52002baa59f559d49007 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Fri, 12 Jan 2024 20:20:59 +0100 Subject: [PATCH] update to embedded-hal 1.0 and embassy releases --- firmware/app/Cargo.lock | 84 +++++++++++++++++++++++++++------------- firmware/app/Cargo.toml | 33 +++------------- firmware/boot/Cargo.lock | 71 ++++++++++++++++++++++----------- firmware/boot/Cargo.toml | 25 ++---------- 4 files changed, 114 insertions(+), 99 deletions(-) diff --git a/firmware/app/Cargo.lock b/firmware/app/Cargo.lock index acb6786..1123f55 100644 --- a/firmware/app/Cargo.lock +++ b/firmware/app/Cargo.lock @@ -377,8 +377,9 @@ dependencies = [ [[package]] name = "embassy-boot" -version = "0.1.1" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e917a2dba10553ab6188fdafd81e971b0441953c663842285709eaf2a5de5e5b" dependencies = [ "digest", "embassy-embedded-hal", @@ -390,8 +391,9 @@ dependencies = [ [[package]] name = "embassy-boot-nrf" -version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97e96e3f3e8d38dc47c2adeb1651c177612f28990c93a14a1891d363a1403c4e" dependencies = [ "cfg-if", "cortex-m 0.7.7", @@ -406,14 +408,15 @@ dependencies = [ [[package]] name = "embassy-embedded-hal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca4a9380d03e61063067b8239f67d2fa9f108ede7c46b4273804f6b79e59a1d" dependencies = [ "defmt", "embassy-futures", "embassy-sync", "embassy-time", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-storage", "embedded-storage-async", @@ -422,21 +425,24 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.4.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec648daedd2143466eff4b3e8002024f9f6c1de4ab7666bb679688752624c925" dependencies = [ "cortex-m 0.7.7", "critical-section", "defmt", "document-features", "embassy-executor-macros", - "embassy-time", + "embassy-time-driver", + "embassy-time-queue-driver", ] [[package]] name = "embassy-executor-macros" version = "0.4.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab0f725ba52827eb44be22c85c52614c7402045968b26349de7f9df8421f74f" dependencies = [ "darling 0.20.3", "proc-macro2", @@ -447,12 +453,14 @@ dependencies = [ [[package]] name = "embassy-futures" version = "0.1.1" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067" [[package]] name = "embassy-hal-internal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ec47cf8bab914018d4bd2b4f0aaeb46e4f52ab1e7985df88aeef2c6eda5aed" dependencies = [ "cortex-m 0.7.7", "critical-section", @@ -463,7 +471,8 @@ dependencies = [ [[package]] name = "embassy-nrf" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2faba661a13ac3417714ef23aa191af65941586dee692dbffe76ff7d3529321b" dependencies = [ "cfg-if", "cortex-m 0.7.7", @@ -475,9 +484,10 @@ dependencies = [ "embassy-hal-internal", "embassy-sync", "embassy-time", + "embassy-time-driver", "embassy-usb-driver", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-io", "embedded-io-async", @@ -500,7 +510,8 @@ dependencies = [ [[package]] name = "embassy-sync" version = "0.5.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", @@ -512,24 +523,43 @@ dependencies = [ [[package]] name = "embassy-time" -version = "0.2.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c844070d9f80dc66ee739299183312baee2e1cdeb6e90b4ea2af44f4676da5" dependencies = [ "cfg-if", "critical-section", "defmt", "document-features", + "embassy-time-driver", + "embassy-time-queue-driver", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-hal-async", "futures-util", "heapless 0.8.0", ] +[[package]] +name = "embassy-time-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24" +dependencies = [ + "document-features", +] + +[[package]] +name = "embassy-time-queue-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1177859559ebf42cd24ae7ba8fe6ee707489b01d0bf471f8827b7b12dcb0bc0" + [[package]] name = "embassy-usb-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970" dependencies = [ "defmt", ] @@ -569,17 +599,17 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "1.0.0-rc.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc402f79e1fd22731ca945b4f97b5ff37e7b3f379312595c42bb2e8811c29920" +checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" [[package]] name = "embedded-hal-async" -version = "1.0.0-rc.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fba2ef2ffb35d614acc6fb323ddf7facc45c069f24544d49ea54e5043626d" +checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", ] [[package]] @@ -840,7 +870,7 @@ name = "hrs3300" version = "0.1.0" source = "git+https://github.com/lulf/hrs3300-rs.git?branch=hal-1.0#5f9cb751538df4db662071af36ab5f70553c2fda" dependencies = [ - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", ] [[package]] @@ -1161,7 +1191,7 @@ version = "0.1.0" dependencies = [ "bitflags 2.4.1", "defmt", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-storage", ] @@ -1530,7 +1560,7 @@ dependencies = [ "embassy-sync", "embassy-time", "embedded-graphics", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-io", "embedded-io-async", "embedded-storage", diff --git a/firmware/app/Cargo.toml b/firmware/app/Cargo.toml index 6479197..5d50a02 100644 --- a/firmware/app/Cargo.toml +++ b/firmware/app/Cargo.toml @@ -11,15 +11,15 @@ embassy-futures = { version = "0.1" } futures = { version = "0.3", default-features = false, features = ["async-await"]} embassy-embedded-hal = { version = "0.1", default-features = false } embassy-sync = { version = "0.5" } -embassy-executor = { version = "0.4", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers", "executor-interrupt"] } -embassy-time = { version = "0.2", features = ["defmt", "defmt-timestamp-uptime"] } +embassy-executor = { version = "0.5", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers", "executor-interrupt"] } +embassy-time = { version = "0.3", features = ["defmt", "defmt-timestamp-uptime"] } embassy-nrf = { version = "0.1", features = ["defmt", "nrf52832", "time-driver-rtc1", "gpiote", "unstable-pac", "time", "nfc-pins-as-gpio"] } -embassy-boot-nrf = { version = "0.1" } -embassy-boot = { version = "0.1" } +embassy-boot-nrf = { version = "0.2" } +embassy-boot = { version = "0.2" } embedded-io = "0.6" embedded-io-async = "0.6" embedded-storage = "0.3" -embedded-hal = "1.0.0-rc.3" +embedded-hal = "1.0" nrf-dfu-target = { version = "0.1.0", features = ["defmt"] } pinetime-flash = { version = "0.1.0", path = "../../pinetime-flash", features = ["defmt"] } watchful-ui = { version = "0.1.0", path = "../../watchful-ui", features = ["defmt"] } @@ -50,33 +50,10 @@ byte-slice-cast = { version = "1.2.0", default-features = false } vergen = { version = "8", features = ["build", "git", "gitcl"] } [patch.crates-io] -embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-sync = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-nrf = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-boot = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-boot-nrf = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-futures = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } - hrs3300 = { git = "https://github.com/lulf/hrs3300-rs.git", branch = "hal-1.0" } -#embassy-executor = { path = "../../embassy/embassy-executor" } -#embassy-time = {path = "../../embassy/embassy-time"} -#embassy-sync = {path = "../../embassy/embassy-sync"} -#embassy-nrf = {path = "../../embassy/embassy-nrf"} -#embassy-embedded-hal = {path = "../../embassy/embassy-embedded-hal"} -#embassy-boot = {path = "../../embassy/embassy-boot/boot"} -#embassy-boot-nrf = {path = "../../embassy/embassy-boot/nrf"} -#embassy-futures = {path = "../../embassy/embassy-futures"} - - nrf-softdevice = { git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master" } nrf-softdevice-s132 = { git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master" } -# -#nrf-softdevice = { path = "../../nrf-softdevice/nrf-softdevice"} -#nrf-softdevice-s132 = { path = "../../nrf-softdevice/nrf-softdevice-s132"} -# [profile.release] debug = 2 diff --git a/firmware/boot/Cargo.lock b/firmware/boot/Cargo.lock index 203119c..4d2ab7c 100644 --- a/firmware/boot/Cargo.lock +++ b/firmware/boot/Cargo.lock @@ -195,8 +195,9 @@ dependencies = [ [[package]] name = "embassy-boot" -version = "0.1.1" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e917a2dba10553ab6188fdafd81e971b0441953c663842285709eaf2a5de5e5b" dependencies = [ "digest", "embassy-embedded-hal", @@ -208,8 +209,9 @@ dependencies = [ [[package]] name = "embassy-boot-nrf" -version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97e96e3f3e8d38dc47c2adeb1651c177612f28990c93a14a1891d363a1403c4e" dependencies = [ "cfg-if", "cortex-m", @@ -225,13 +227,14 @@ dependencies = [ [[package]] name = "embassy-embedded-hal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca4a9380d03e61063067b8239f67d2fa9f108ede7c46b4273804f6b79e59a1d" dependencies = [ "embassy-futures", "embassy-sync", "embassy-time", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-storage", "embedded-storage-async", @@ -241,12 +244,14 @@ dependencies = [ [[package]] name = "embassy-futures" version = "0.1.1" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067" [[package]] name = "embassy-hal-internal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ec47cf8bab914018d4bd2b4f0aaeb46e4f52ab1e7985df88aeef2c6eda5aed" dependencies = [ "cortex-m", "critical-section", @@ -256,7 +261,8 @@ dependencies = [ [[package]] name = "embassy-nrf" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2faba661a13ac3417714ef23aa191af65941586dee692dbffe76ff7d3529321b" dependencies = [ "cfg-if", "cortex-m", @@ -267,9 +273,10 @@ dependencies = [ "embassy-hal-internal", "embassy-sync", "embassy-time", + "embassy-time-driver", "embassy-usb-driver", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-hal-async", "embedded-io", "embedded-io-async", @@ -292,7 +299,8 @@ dependencies = [ [[package]] name = "embassy-sync" version = "0.5.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", @@ -303,23 +311,42 @@ dependencies = [ [[package]] name = "embassy-time" -version = "0.2.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c844070d9f80dc66ee739299183312baee2e1cdeb6e90b4ea2af44f4676da5" dependencies = [ "cfg-if", "critical-section", "document-features", + "embassy-time-driver", + "embassy-time-queue-driver", "embedded-hal 0.2.7", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-hal-async", "futures-util", "heapless", ] +[[package]] +name = "embassy-time-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24" +dependencies = [ + "document-features", +] + +[[package]] +name = "embassy-time-queue-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1177859559ebf42cd24ae7ba8fe6ee707489b01d0bf471f8827b7b12dcb0bc0" + [[package]] name = "embassy-usb-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git?branch=main#0d5711b219add4c8e7e4a3524e81071c5bd85ec6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970" [[package]] name = "embedded-hal" @@ -333,17 +360,17 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "1.0.0-rc.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc402f79e1fd22731ca945b4f97b5ff37e7b3f379312595c42bb2e8811c29920" +checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" [[package]] name = "embedded-hal-async" -version = "1.0.0-rc.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fba2ef2ffb35d614acc6fb323ddf7facc45c069f24544d49ea54e5043626d" +checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", ] [[package]] @@ -623,7 +650,7 @@ name = "pinetime-flash" version = "0.1.0" dependencies = [ "bitflags 2.3.3", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-storage", ] @@ -815,7 +842,7 @@ dependencies = [ "embassy-futures", "embassy-nrf", "embassy-sync", - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "embedded-io", "embedded-storage", "embedded-storage-async", diff --git a/firmware/boot/Cargo.toml b/firmware/boot/Cargo.toml index 644b4ee..20922f0 100644 --- a/firmware/boot/Cargo.toml +++ b/firmware/boot/Cargo.toml @@ -10,12 +10,12 @@ embassy-futures = { version = "0.1", default-features = false } embassy-sync = { version = "0.5", default-features = false } embassy-nrf = { version = "0.1", default-features = false, features = ["rt", "nrf52832", "time", "gpiote", "time-driver-rtc1"] } embassy-embedded-hal = { version = "0.1", default-features = false } -embassy-boot = { version = "0.1", default-features = false } -embassy-boot-nrf = { version = "0.1", default-features = false, features = ["softdevice"] } +embassy-boot = { version = "0.2", default-features = false } +embassy-boot-nrf = { version = "0.2", default-features = false, features = ["softdevice"] } embedded-io = "0.6" embedded-storage-async = "0.4" embedded-storage = "0.3" -embedded-hal = "1.0.0-rc.3" +embedded-hal = "1.0" nrf-softdevice-mbr = { version = "0.2" } pinetime-flash = { version = "0.1.0", path = "../../pinetime-flash" } @@ -28,26 +28,7 @@ cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-sing cortex-m-rt = "0.7.0" [patch.crates-io] -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-sync = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-nrf = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-boot = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-boot-nrf = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -embassy-futures = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } - -#embassy-time = {path = "../../embassy/embassy-time"} -#embassy-sync = {path = "../../embassy/embassy-sync"} -#embassy-nrf = {path = "../../embassy/embassy-nrf"} -#embassy-embedded-hal = {path = "../../embassy/embassy-embedded-hal"} -#embassy-boot = {path = "../../embassy/embassy-boot/boot"} -#embassy-boot-nrf = {path = "../../embassy/embassy-boot/nrf"} -#embassy-futures = {path = "../../embassy/embassy-futures"} - nrf-softdevice-mbr = { git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master" } -# -#nrf-softdevice-mbr = { path = "../../nrf-softdevice/nrf-softdevice-mbr"} -# [profile.release] debug = 2