From d1198593f859717d617115ca4da212c35922c358 Mon Sep 17 00:00:00 2001
From: Haobo Gu <haobogu@outlook.com>
Date: Tue, 23 Jan 2024 20:34:47 +0800
Subject: [PATCH] chore(dep): use embassy-rs on crates.io

Signed-off-by: Haobo Gu <haobogu@outlook.com>
---
 Cargo.lock                | 244 +++++++++++++++++++++++++++-----------
 boards/rp2040/Cargo.toml  |  26 ++--
 boards/stm32f4/Cargo.toml |  11 +-
 boards/stm32h7/Cargo.toml |  13 +-
 rmk/Cargo.toml            |   8 +-
 5 files changed, 194 insertions(+), 108 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa455ad7..310f2a68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,7 +53,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
 dependencies = [
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -114,6 +114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40ac3d0c0a542d0ab5521211f873f62706a7136df415676f676d347e5a41dd80"
 dependencies = [
  "bitflags 1.3.2",
+ "defmt",
  "embedded-hal 0.2.7",
  "nb 1.1.0",
  "vcell",
@@ -131,6 +132,15 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -147,6 +157,26 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "const-gen"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbfc446f8d46196335995e72ee07271b558d0fab5152edc8b5c3d2a44da30e87"
+dependencies = [
+ "const-gen-derive",
+]
+
+[[package]]
+name = "const-gen-derive"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ab3a2f53a0577d76789175307af9b6ab5ed3c119f3ce4e0646f6ba5ae6ff100"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "cortex-m"
 version = "0.7.7"
@@ -329,10 +359,12 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 [[package]]
 name = "embassy-embedded-hal"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca4a9380d03e61063067b8239f67d2fa9f108ede7c46b4273804f6b79e59a1d"
 dependencies = [
+ "defmt",
  "embassy-futures",
- "embassy-sync",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embedded-hal 0.2.7",
  "embedded-hal 1.0.0",
@@ -345,7 +377,8 @@ dependencies = [
 [[package]]
 name = "embassy-executor"
 version = "0.5.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec648daedd2143466eff4b3e8002024f9f6c1de4ab7666bb679688752624c925"
 dependencies = [
  "cortex-m",
  "critical-section",
@@ -359,7 +392,8 @@ dependencies = [
 [[package]]
 name = "embassy-executor-macros"
 version = "0.4.1"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad454accf80050e9cf7a51e994132ba0e56286b31f9317b68703897c328c59b5"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -370,12 +404,14 @@ dependencies = [
 [[package]]
 name = "embassy-futures"
 version = "0.1.1"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+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#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0ec47cf8bab914018d4bd2b4f0aaeb46e4f52ab1e7985df88aeef2c6eda5aed"
 dependencies = [
  "cortex-m",
  "critical-section",
@@ -386,22 +422,28 @@ dependencies = [
 [[package]]
 name = "embassy-net-driver"
 version = "0.2.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d"
+dependencies = [
+ "defmt",
+]
 
 [[package]]
 name = "embassy-net-driver-channel"
 version = "0.2.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+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#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "438f170cbd97d4a870e8d57e1738ee815255028ad31dd409d891e2bf797dc531"
 dependencies = [
  "atomic-polyfill",
  "cfg-if",
@@ -413,7 +455,7 @@ dependencies = [
  "embassy-embedded-hal",
  "embassy-futures",
  "embassy-hal-internal",
- "embassy-sync",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embassy-time-driver",
  "embassy-usb-driver",
@@ -438,7 +480,8 @@ dependencies = [
 [[package]]
 name = "embassy-stm32"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32bc0257b5ade13a1b93e8b9949268f44d57e8ce03e599ef1c5a62024a0fbff9"
 dependencies = [
  "bit_field",
  "bxcan",
@@ -446,12 +489,13 @@ dependencies = [
  "cortex-m",
  "cortex-m-rt",
  "critical-section",
+ "defmt",
  "document-features",
  "embassy-embedded-hal",
  "embassy-futures",
  "embassy-hal-internal",
  "embassy-net-driver",
- "embassy-sync",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embassy-time-driver",
  "embassy-usb-driver",
@@ -474,22 +518,37 @@ dependencies = [
  "vcell",
 ]
 
+[[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#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec"
 dependencies = [
  "cfg-if",
  "critical-section",
+ "defmt",
  "embedded-io-async",
  "futures-util",
- "heapless",
+ "heapless 0.8.0",
 ]
 
 [[package]]
 name = "embassy-time"
 version = "0.3.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c844070d9f80dc66ee739299183312baee2e1cdeb6e90b4ea2af44f4676da5"
 dependencies = [
  "cfg-if",
  "critical-section",
@@ -501,13 +560,14 @@ dependencies = [
  "embedded-hal 1.0.0",
  "embedded-hal-async",
  "futures-util",
- "heapless",
+ "heapless 0.8.0",
 ]
 
 [[package]]
 name = "embassy-time-driver"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24"
 dependencies = [
  "document-features",
 ]
@@ -515,18 +575,20 @@ dependencies = [
 [[package]]
 name = "embassy-time-queue-driver"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+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#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+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",
+ "heapless 0.8.0",
  "ssmarshal",
  "usbd-hid",
 ]
@@ -534,7 +596,8 @@ dependencies = [
 [[package]]
 name = "embassy-usb-driver"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/embassy#20fd03a14f1261e7b2264dcbca8e164393e66b94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970"
 dependencies = [
  "defmt",
 ]
@@ -564,9 +627,6 @@ name = "embedded-hal"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
-dependencies = [
- "defmt",
-]
 
 [[package]]
 name = "embedded-hal-async"
@@ -592,6 +652,9 @@ name = "embedded-io"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+dependencies = [
+ "defmt",
+]
 
 [[package]]
 name = "embedded-io-async"
@@ -599,6 +662,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f"
 dependencies = [
+ "defmt",
  "embedded-io",
 ]
 
@@ -772,6 +836,15 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "hash32"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "hash32"
 version = "0.3.1"
@@ -787,13 +860,26 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
+[[package]]
+name = "heapless"
+version = "0.7.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
+dependencies = [
+ "atomic-polyfill",
+ "hash32 0.2.1",
+ "rustc_version 0.4.0",
+ "spin",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "heapless"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
 dependencies = [
- "hash32",
+ "hash32 0.3.1",
  "stable_deref_trait",
 ]
 
@@ -839,6 +925,12 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "json"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
+
 [[package]]
 name = "lalrpop"
 version = "0.19.12"
@@ -921,6 +1013,17 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.1"
@@ -1034,16 +1137,6 @@ dependencies = [
  "defmt",
 ]
 
-[[package]]
-name = "panic-rtt-target"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ab67bc881453e4c90f958c657c1303670ea87bc1a16e87fd71a40f656dce9"
-dependencies = [
- "cortex-m",
- "rtt-target 0.3.1",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1144,6 +1237,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "pkg-config"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+
 [[package]]
 name = "portable-atomic"
 version = "1.6.0"
@@ -1274,7 +1373,7 @@ version = "0.1.2"
 dependencies = [
  "byteorder",
  "embassy-futures",
- "embassy-sync",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embassy-usb",
  "embedded-alloc",
@@ -1291,17 +1390,13 @@ dependencies = [
 name = "rmk-rp2040"
 version = "0.1.2"
 dependencies = [
- "cortex-m",
  "cortex-m-rt",
  "defmt",
  "defmt-rtt",
  "embassy-executor",
- "embassy-futures",
  "embassy-rp",
  "embassy-time",
- "embedded-hal 1.0.0",
  "embedded-storage",
- "log",
  "packed_struct",
  "panic-probe",
  "portable-atomic",
@@ -1313,18 +1408,21 @@ dependencies = [
 name = "rmk-stm32h7"
 version = "0.1.2"
 dependencies = [
+ "const-gen",
  "cortex-m",
  "cortex-m-rt",
+ "defmt",
+ "defmt-rtt",
  "embassy-executor",
  "embassy-stm32",
  "embassy-time",
  "embedded-storage",
- "log",
+ "json",
  "packed_struct",
- "panic-rtt-target",
+ "panic-probe",
  "rmk",
- "rtt-target 0.5.0",
  "static_cell",
+ "xz2",
 ]
 
 [[package]]
@@ -1347,31 +1445,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "rtt-target"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065d6058bb1204f51a562a67209e1817cf714759d5cf845aa45c75fa7b0b9d9b"
-dependencies = [
- "ufmt-write",
-]
-
-[[package]]
-name = "rtt-target"
-version = "0.5.0"
+name = "rustc_version"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b34c9e6832388e45f3c01f1bb60a016384a0a4ad80cdd7d34913bed25037f0"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "critical-section",
- "ufmt-write",
+ "semver 0.9.0",
 ]
 
 [[package]]
 name = "rustc_version"
-version = "0.2.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver",
+ "semver 1.0.21",
 ]
 
 [[package]]
@@ -1414,6 +1502,12 @@ dependencies = [
  "semver-parser",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
 [[package]]
 name = "semver-parser"
 version = "0.7.0"
@@ -1452,6 +1546,15 @@ version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "ssmarshal"
 version = "1.0.0"
@@ -1598,12 +1701,6 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
-[[package]]
-name = "ufmt-write"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -1858,3 +1955,12 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 dependencies = [
  "tap",
 ]
+
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
diff --git a/boards/rp2040/Cargo.toml b/boards/rp2040/Cargo.toml
index 60b2aeae..1a269306 100644
--- a/boards/rp2040/Cargo.toml
+++ b/boards/rp2040/Cargo.toml
@@ -1,5 +1,3 @@
-# cargo-features = ["per-package-target"]
-
 [package]
 name = "rmk-rp2040"
 version = "0.1.2"
@@ -11,43 +9,33 @@ readme = "../../README.md"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 
-# forced-target = "thumbv6m-none-eabi"
-
 [dependencies]
 rmk = { version = "0.1.2", path = "../../rmk", features = [
     "eeprom",
     "col2row",
 ] }
-embassy-time = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy", features = [
-    "defmt",
-    "defmt-timestamp-uptime",
-] }
-embassy-rp = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = [
+embassy-time = { version = "0.3", features = ["defmt"] }
+embassy-rp = { version = "0.1", features = [
     "defmt",
     "time-driver",
     "critical-section-impl",
 ] }
-embassy-executor = { version = "0.5.0", git = "https://github.com/embassy-rs/embassy", features = [
+embassy-executor = { version = "0.5", features = [
     "defmt",
     "arch-cortex-m",
     "executor-thread",
     "integrated-timers",
 ] }
-embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" }
-
-cortex-m = { version = "0.7.7", features = ["inline-asm"] }
 cortex-m-rt = "0.7.3"
-defmt = "0.3"
-defmt-rtt = "0.4"
-embedded-hal = { version = "1.0.0", features = ["defmt-03"] }
 embedded-storage = "0.3"
-log = "0.4.19"
-panic-probe = { version = "0.3", features = ["print-defmt"] }
 portable-atomic = { version = "1.5", features = ["critical-section"] }
 packed_struct = { version = "0.10.1", default-features = false }
 static_cell = { version = "2" }
+defmt = "0.3"
+defmt-rtt = "0.4"
+panic-probe = { version = "0.3", features = ["print-defmt"] }
 
-[features]
+# [features]
 # avoid having to use --allow-multiple-definition linker flag
 # on macOS with Apple Silicon at least
 # default = ["rp-pico/disable-intrinsics"]
diff --git a/boards/stm32f4/Cargo.toml b/boards/stm32f4/Cargo.toml
index c7bc6526..d0e271b1 100644
--- a/boards/stm32f4/Cargo.toml
+++ b/boards/stm32f4/Cargo.toml
@@ -16,18 +16,13 @@ rmk = { version = "0.1.2", path = "../../rmk", features = [
 ] }
 cortex-m = { version = "0.7.7", features = ['critical-section-single-core'] }
 cortex-m-rt = "0.7.3"
-embassy-time = { version = "0.3", git = "https://github.com/embassy-rs/embassy", features = [
-    "tick-hz-32_768",
-    "defmt",
-] }
-embassy-stm32 = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = [
+embassy-time = { version = "0.3", features = ["tick-hz-32_768", "defmt"] }
+embassy-stm32 = { version = "0.1", features = [
     "stm32f411ce",
     "defmt",
     "time-driver-any",
-    "exti",
-    "time",
 ] }
-embassy-executor = { version = "0.5.0", git = "https://github.com/embassy-rs/embassy", features = [
+embassy-executor = { version = "0.5", features = [
     "defmt",
     "arch-cortex-m",
     "executor-thread",
diff --git a/boards/stm32h7/Cargo.toml b/boards/stm32h7/Cargo.toml
index 2805b9fd..28c76542 100644
--- a/boards/stm32h7/Cargo.toml
+++ b/boards/stm32h7/Cargo.toml
@@ -16,17 +16,14 @@ rmk = { version = "0.1.2", path = "../../rmk", features = [
 ] }
 cortex-m = { version = "0.7.7", features = ['critical-section-single-core'] }
 cortex-m-rt = "0.7.3"
-embassy-time = { version = "0.3", git = "https://github.com/embassy-rs/embassy", features = [
-    # "tick-hz-1_000_000",
-    "tick-hz-32_768",
-] }
-embassy-stm32 = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = [
+embassy-time = { version = "0.3", features = ["tick-hz-32_768", "defmt"] }
+embassy-stm32 = { version = "0.1", features = [
     "stm32h7b0vb",
+    "defmt",
     "time-driver-any",
-    "exti",
-    "time",
 ] }
-embassy-executor = { version = "0.5.0", git = "https://github.com/embassy-rs/embassy", features = [
+embassy-executor = { version = "0.5", features = [
+    "defmt",
     "arch-cortex-m",
     "executor-thread",
     "integrated-timers",
diff --git a/rmk/Cargo.toml b/rmk/Cargo.toml
index 1a3f7ca3..13368f36 100644
--- a/rmk/Cargo.toml
+++ b/rmk/Cargo.toml
@@ -13,14 +13,14 @@ license = "MIT OR Apache-2.0"
 embedded-hal = "1.0.0"
 embedded-storage = "0.3"
 embedded-alloc = "0.5"
-embassy-time = { version = "0.3", git = "https://github.com/embassy-rs/embassy" }
-embassy-usb = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = [
+embassy-time = { version = "0.3" }
+embassy-usb = { version = "0.1", features = [
     "usbd-hid",
     "max-interface-count-8",
     "max-handler-count-8",
 ] }
-embassy-sync = { version = "0.5.0", git = "https://github.com/embassy-rs/embassy" }
-embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" }
+embassy-sync = { version = "0.5" }
+embassy-futures = { version = "0.1" }
 num_enum = { version = "0.7", default-features = false }
 log = "0.4"
 static_cell = { version = "2" }