diff --git a/Cargo.lock b/Cargo.lock index 8489bb5..e7127da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -286,6 +286,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + [[package]] name = "either" version = "1.9.0" @@ -295,13 +304,14 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "embassy-embedded-hal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca4a9380d03e61063067b8239f67d2fa9f108ede7c46b4273804f6b79e59a1d" dependencies = [ "embassy-futures", - "embassy-sync", + "embassy-sync 0.5.0", "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", @@ -310,20 +320,23 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.4.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec648daedd2143466eff4b3e8002024f9f6c1de4ab7666bb679688752624c925" dependencies = [ "cortex-m", "critical-section", + "document-features", "embassy-executor-macros", - "embassy-time", - "log", + "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#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad454accf80050e9cf7a51e994132ba0e56286b31f9317b68703897c328c59b5" dependencies = [ "darling", "proc-macro2", @@ -334,15 +347,14 @@ dependencies = [ [[package]] name = "embassy-futures" version = "0.1.1" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" -dependencies = [ - "log", -] +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#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ec47cf8bab914018d4bd2b4f0aaeb46e4f52ab1e7985df88aeef2c6eda5aed" dependencies = [ "cortex-m", "critical-section", @@ -352,36 +364,41 @@ dependencies = [ [[package]] name = "embassy-net-driver" version = "0.2.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d" [[package]] name = "embassy-net-driver-channel" version = "0.2.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "584ab4da7e5612efaa7d55ee76161d9549adf788eab48d49362eddbf322f9933" dependencies = [ "embassy-futures", "embassy-net-driver", - "embassy-sync", + "embassy-sync 0.3.0", ] [[package]] name = "embassy-rp" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "438f170cbd97d4a870e8d57e1738ee815255028ad31dd409d891e2bf797dc531" dependencies = [ "atomic-polyfill", "cfg-if", "cortex-m", "cortex-m-rt", "critical-section", + "document-features", "embassy-embedded-hal", "embassy-futures", "embassy-hal-internal", - "embassy-sync", + "embassy-sync 0.5.0", "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-hal-nb", "embedded-io 0.6.1", @@ -390,7 +407,6 @@ dependencies = [ "embedded-storage-async", "fixed", "futures", - "log", "nb 1.1.0", "pio", "pio-proc", @@ -399,42 +415,73 @@ dependencies = [ "rp2040-boot2", ] +[[package]] +name = "embassy-sync" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0525b466ca3ace30b57f2db868a35215dfaecd038d8668cb2db03feb7c069a0" +dependencies = [ + "cfg-if", + "critical-section", + "futures-util", + "heapless 0.7.17", +] + [[package]] name = "embassy-sync" version = "0.5.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", "critical-section", "embedded-io-async", "futures-util", "heapless 0.8.0", - "log", ] [[package]] name = "embassy-time" -version = "0.2.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +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 0.8.0", - "log", ] +[[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" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1587e58ed8f7e0215246e6bb8d7ef4837db682e209e5ef7410a81c500dc949e5" dependencies = [ "embassy-futures", "embassy-net-driver-channel", - "embassy-sync", + "embassy-sync 0.5.0", "embassy-usb-driver", "heapless 0.8.0", "ssmarshal", @@ -444,20 +491,19 @@ dependencies = [ [[package]] name = "embassy-usb-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970" [[package]] name = "embassy-usb-logger" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy.git#a2d4bab2f8a4a9b994bc0289938a9f725950715f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80417656bff296da3394ad97fae231569a437d17bbea36af6f14a4a562c3c12c" dependencies = [ "embassy-futures", - "embassy-sync", + "embassy-sync 0.5.0", "embassy-usb", - "futures", "log", - "static_cell 2.0.0", - "usbd-hid", ] [[package]] @@ -482,26 +528,26 @@ 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]] name = "embedded-hal-nb" -version = "1.0.0-rc.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cde58312a0675b6c0389eb0dceb2bf8c735a697b0b5baa1f23bbaf030636deb" +checksum = "fba4268c14288c828995299e59b12babdbe170f6c6d73731af1b4648142e8605" dependencies = [ - "embedded-hal 1.0.0-rc.3", + "embedded-hal 1.0.0", "nb 1.1.0", ] @@ -852,6 +898,12 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -1385,15 +1437,6 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "static_cell" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6ba4cf83bf80d3eb25f098ea5e790a0a1fcb5e357442259b231e412c2d3ca0" -dependencies = [ - "portable-atomic", -] - [[package]] name = "string_cache" version = "0.8.7" @@ -1443,7 +1486,7 @@ dependencies = [ "embassy-executor", "embassy-futures", "embassy-rp", - "embassy-sync", + "embassy-sync 0.5.0", "embassy-time", "log", "postcard", @@ -1465,7 +1508,7 @@ dependencies = [ "embassy-executor", "embassy-futures", "embassy-rp", - "embassy-sync", + "embassy-sync 0.5.0", "embassy-time", "embassy-usb", "embassy-usb-driver", @@ -1486,7 +1529,7 @@ dependencies = [ "serde", "simple_logger", "smart-leds", - "static_cell 1.3.0", + "static_cell", "tgnt", "usb-device", "usbd-hid", @@ -1500,7 +1543,7 @@ dependencies = [ "embassy-executor", "embassy-futures", "embassy-rp", - "embassy-sync", + "embassy-sync 0.5.0", "embassy-time", "log", "postcard", diff --git a/left/Cargo.toml b/left/Cargo.toml index 65e9850..cb9ae06 100644 --- a/left/Cargo.toml +++ b/left/Cargo.toml @@ -12,11 +12,11 @@ package = "tangentbord1-lib" [dependencies] tgnt = { git = "https://git.nubo.sh/hulthe/tgnt.git", default-features = false } cortex-m-rt = "0.7" -embassy-rp = { git = "https://github.com/embassy-rs/embassy.git", features = ["log", "unstable-pac", "time-driver", "critical-section-impl"] } -embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", features = ["arch-cortex-m", "log", "executor-thread", "nightly", "integrated-timers" ] } -embassy-sync = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } -embassy-futures = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } +embassy-rp = { version = "0.1.0", features = ["time-driver", "critical-section-impl"] } +embassy-executor = { version = "0.5.0", features = ["nightly", "executor-thread", "integrated-timers", "arch-cortex-m"] } +embassy-sync = "0.5.0" +embassy-time = "0.3.0" +embassy-futures = "0.1.1" log = "0.4.17" postcard = { version = "1.0.4", features = ["alloc"] } diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 4461324..ca60d1c 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -15,13 +15,13 @@ usbd-hid = "0.6.1" static_cell = "1.0.0" embedded-io-async = "*" futures = { version = "0.3", default-features = false, features = ["async-await"] } -embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", features = ["log", "executor-thread", "nightly", "integrated-timers" ] } -embassy-sync = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } -embassy-futures = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } -embassy-usb = { git = "https://github.com/embassy-rs/embassy.git", features = ["usbd-hid"] } -embassy-usb-logger = { git = "https://github.com/embassy-rs/embassy.git", features = [] } -embassy-usb-driver = { git = "https://github.com/embassy-rs/embassy.git", features = [] } +embassy-executor = { version = "0.5.0", features = ["nightly", "nightly", "executor-thread", "integrated-timers"] } +embassy-sync = "0.5.0" +embassy-time = "0.3.0" +embassy-futures = "0.1.1" +embassy-usb = { version = "0.1.0", features = ["usbd-hid"] } +embassy-usb-logger = "0.1.0" +embassy-usb-driver = "0.1.0" log = "0.4.17" pio = "0.2.1" pio-proc = "0.2.1" @@ -39,13 +39,13 @@ serde = { version = "1.0.163", default-features = false, features = ["derive"] } bytemuck = { version = "1.13.1", features = ["derive"] } [target.'cfg(target_arch = "x86_64")'.dependencies] -embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", features = ["arch-std"] } -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", features = ["std", "generic-queue"] } +embassy-executor = { version = "0.5.0", features = ["arch-std"] } +embassy-time = { version = "0.3.0", features = ["std", "generic-queue"] } simple_logger = "4" [target.thumbv6m-none-eabi.dependencies] -embassy-rp = { git = "https://github.com/embassy-rs/embassy.git", features = ["log", "unstable-pac", "time-driver", "critical-section-impl"] } -embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", features = ["arch-cortex-m"] } +embassy-rp = { version = "0.1.0", features = ["time-driver", "critical-section-impl"] } +embassy-executor = { version = "0.5.0", features = ["arch-cortex-m"] } [build-dependencies] tgnt = { git = "https://git.nubo.sh/hulthe/tgnt.git", default-features = false } diff --git a/right/Cargo.toml b/right/Cargo.toml index 171b0ce..4f4fcc5 100644 --- a/right/Cargo.toml +++ b/right/Cargo.toml @@ -12,11 +12,11 @@ package = "tangentbord1-lib" [dependencies] tgnt = { git = "https://git.nubo.sh/hulthe/tgnt.git", default-features = false } cortex-m-rt = "0.7" -embassy-rp = { git = "https://github.com/embassy-rs/embassy.git", features = ["log", "unstable-pac", "time-driver", "critical-section-impl"] } -embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", features = ["arch-cortex-m", "log", "executor-thread", "nightly", "integrated-timers" ] } -embassy-sync = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } -embassy-time = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } -embassy-futures = { git = "https://github.com/embassy-rs/embassy.git", features = ["log"] } +embassy-rp = { version = "0.1.0", features = ["time-driver", "critical-section-impl"] } +embassy-executor = { version = "0.5.0", features = ["nightly", "executor-thread", "integrated-timers", "arch-cortex-m"] } +embassy-sync = "0.5.0" +embassy-time = "0.3.0" +embassy-futures = "0.1.1" log = "0.4.17" postcard = { version = "1.0.4", features = ["alloc"] }