From 4b436ce634ce722e3c535c4502bfc53e1bd1e0ca Mon Sep 17 00:00:00 2001 From: Haobo Gu Date: Wed, 27 Nov 2024 10:20:28 +0800 Subject: [PATCH 1/4] fix(config): try fix rmk-config link error on windows Signed-off-by: Haobo Gu --- rmk-config/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmk-config/Cargo.toml b/rmk-config/Cargo.toml index ce2a5646..97f98edf 100644 --- a/rmk-config/Cargo.toml +++ b/rmk-config/Cargo.toml @@ -17,7 +17,7 @@ embassy-nrf = { version = "0.2.0", features = [ "unstable-pac", "time", ], optional = true } -embassy-time = { version = "0.3", features = ["defmt"] } +embassy-time = { version = "0.3" } [features] default = [] From 6772de5a3aaaa5eb5cc641ad6aa0ccd996fc5a46 Mon Sep 17 00:00:00 2001 From: Haobo Gu Date: Wed, 27 Nov 2024 10:58:43 +0800 Subject: [PATCH 2/4] fix(config): enable embassy-time std feature for rmk-macro Signed-off-by: Haobo Gu --- rmk-config/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmk-config/Cargo.toml b/rmk-config/Cargo.toml index 97f98edf..57effe43 100644 --- a/rmk-config/Cargo.toml +++ b/rmk-config/Cargo.toml @@ -21,6 +21,6 @@ embassy-time = { version = "0.3" } [features] default = [] -toml = ["serde", "serde_derive"] +toml = ["serde", "serde_derive", "embassy-time/std"] _esp_ble = [] _nrf_ble = ["embassy-nrf"] From d04e056f0bdda4a183d06f1ab684503a0f3cd0fb Mon Sep 17 00:00:00 2001 From: Haobo Gu Date: Wed, 27 Nov 2024 11:11:37 +0800 Subject: [PATCH 3/4] fix(config): try fix windows link error again Signed-off-by: Haobo Gu --- rmk-config/src/lib.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rmk-config/src/lib.rs b/rmk-config/src/lib.rs index c62cf977..b372752f 100644 --- a/rmk-config/src/lib.rs +++ b/rmk-config/src/lib.rs @@ -14,7 +14,10 @@ //! [keyboard_config] is what RMK's code receives. You can safely ignore it unless you want to dive into the RMK source code. #![cfg_attr(not(feature = "toml"), no_std)] + +#[cfg(not(feature = "toml"))] pub mod keyboard_config; +#[cfg(not(feature = "toml"))] pub use keyboard_config::*; #[cfg(feature = "toml")] From ffdce777737a8bbcc56e1c46e402b22b7541a749 Mon Sep 17 00:00:00 2001 From: Haobo Gu Date: Wed, 27 Nov 2024 11:32:51 +0800 Subject: [PATCH 4/4] chore: prepare new release Signed-off-by: Haobo Gu --- examples/use_rust/nrf52840_ble/Cargo.lock | 6 +++--- examples/use_rust/nrf52840_ble_split/Cargo.lock | 6 +++--- examples/use_rust/stm32h7/Cargo.lock | 6 +++--- rmk-config/CHANGELOG.md | 4 ++++ rmk-config/Cargo.toml | 4 ++-- rmk-macro/CHANGELOG.md | 4 ++++ rmk-macro/Cargo.toml | 4 ++-- rmk/CHANGELOG.md | 6 ++++++ rmk/Cargo.toml | 6 +++--- 9 files changed, 30 insertions(+), 16 deletions(-) diff --git a/examples/use_rust/nrf52840_ble/Cargo.lock b/examples/use_rust/nrf52840_ble/Cargo.lock index f7d262c4..2ba78768 100644 --- a/examples/use_rust/nrf52840_ble/Cargo.lock +++ b/examples/use_rust/nrf52840_ble/Cargo.lock @@ -1225,7 +1225,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rmk" -version = "0.4.3" +version = "0.4.4" dependencies = [ "bitfield-struct", "byteorder", @@ -1261,7 +1261,7 @@ dependencies = [ [[package]] name = "rmk-config" -version = "0.2.2" +version = "0.2.3" dependencies = [ "embassy-nrf", "embassy-time", @@ -1272,7 +1272,7 @@ dependencies = [ [[package]] name = "rmk-macro" -version = "0.3.2" +version = "0.3.3" dependencies = [ "cargo_toml", "darling 0.20.3", diff --git a/examples/use_rust/nrf52840_ble_split/Cargo.lock b/examples/use_rust/nrf52840_ble_split/Cargo.lock index 46ed0e2c..90df877b 100644 --- a/examples/use_rust/nrf52840_ble_split/Cargo.lock +++ b/examples/use_rust/nrf52840_ble_split/Cargo.lock @@ -1225,7 +1225,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rmk" -version = "0.4.3" +version = "0.4.4" dependencies = [ "bitfield-struct", "byteorder", @@ -1261,7 +1261,7 @@ dependencies = [ [[package]] name = "rmk-config" -version = "0.2.2" +version = "0.2.3" dependencies = [ "embassy-nrf", "embassy-time", @@ -1272,7 +1272,7 @@ dependencies = [ [[package]] name = "rmk-macro" -version = "0.3.2" +version = "0.3.3" dependencies = [ "cargo_toml", "darling 0.20.3", diff --git a/examples/use_rust/stm32h7/Cargo.lock b/examples/use_rust/stm32h7/Cargo.lock index 84a4e5c6..8c9482b2 100644 --- a/examples/use_rust/stm32h7/Cargo.lock +++ b/examples/use_rust/stm32h7/Cargo.lock @@ -975,7 +975,7 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rmk" -version = "0.4.3" +version = "0.4.4" dependencies = [ "bitfield-struct", "byteorder", @@ -1007,7 +1007,7 @@ dependencies = [ [[package]] name = "rmk-config" -version = "0.2.2" +version = "0.2.3" dependencies = [ "embassy-time", "embedded-hal 1.0.0", @@ -1017,7 +1017,7 @@ dependencies = [ [[package]] name = "rmk-macro" -version = "0.3.2" +version = "0.3.3" dependencies = [ "cargo_toml", "darling", diff --git a/rmk-config/CHANGELOG.md b/rmk-config/CHANGELOG.md index 04f09264..2d7e8831 100644 --- a/rmk-config/CHANGELOG.md +++ b/rmk-config/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.2.3] - 2024-11-27 + +- Fix link error on Windows + ## [0.2.2] - 2024-11-25 - Add behavior config diff --git a/rmk-config/Cargo.toml b/rmk-config/Cargo.toml index 57effe43..3b549e6c 100644 --- a/rmk-config/Cargo.toml +++ b/rmk-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rmk-config" -version = "0.2.2" +version = "0.2.3" edition = "2021" authors = ["Haobo Gu "] description = "Config crate of RMK" @@ -21,6 +21,6 @@ embassy-time = { version = "0.3" } [features] default = [] -toml = ["serde", "serde_derive", "embassy-time/std"] +toml = ["serde", "serde_derive"] _esp_ble = [] _nrf_ble = ["embassy-nrf"] diff --git a/rmk-macro/CHANGELOG.md b/rmk-macro/CHANGELOG.md index da1523c3..3ad4c6b5 100644 --- a/rmk-macro/CHANGELOG.md +++ b/rmk-macro/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.3.3] - 2024-11-27 + +- Fix link error on Windows + ## [0.3.2] - 2024-11-25 ### Added diff --git a/rmk-macro/Cargo.toml b/rmk-macro/Cargo.toml index c64f05f2..7b93fbc7 100644 --- a/rmk-macro/Cargo.toml +++ b/rmk-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rmk-macro" -version = "0.3.2" +version = "0.3.3" edition = "2021" authors = ["Haobo Gu "] description = "Proc-macro crate of RMK" @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" resolver = "2" [dependencies] -rmk-config = { version = "0.2.2", path = "../rmk-config", features = ["toml"] } +rmk-config = { version = "0.2.3", path = "../rmk-config", features = ["toml"] } toml = "0.8" serde = "1.0" serde_derive = "1.0" diff --git a/rmk/CHANGELOG.md b/rmk/CHANGELOG.md index 5467babd..c27affe6 100644 --- a/rmk/CHANGELOG.md +++ b/rmk/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.4] - 2024-11-27 + +### Fixed + +- Fix link error on Windows + ## [0.4.3] - 2024-11-25 ### Added diff --git a/rmk/Cargo.toml b/rmk/Cargo.toml index f53ef447..47f16bb5 100644 --- a/rmk/Cargo.toml +++ b/rmk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rmk" -version = "0.4.3" +version = "0.4.4" authors = ["Haobo Gu "] description = "Keyboard firmware written in Rust" homepage = "https://github.com/haobogu/rmk" @@ -11,8 +11,8 @@ license = "MIT OR Apache-2.0" resolver = "2" [dependencies] -rmk-config = { version = "0.2.2", path = "../rmk-config" } -rmk-macro = { version = "0.3.2", path = "../rmk-macro" } +rmk-config = { version = "0.2.3", path = "../rmk-config" } +rmk-macro = { version = "0.3.3", path = "../rmk-macro" } embedded-hal = { version = "1.0.0", features = ["defmt-03"] } embedded-hal-async = { version = "1.0.0", features = [ "defmt-03",