Merge pull request #154 from HaoboGu/fix/windows_link_err

Fix link error on Windows
HaoboGu · Nov 27, 2024 · c86631d · c86631d
2 parents 9d23289 + ffdce77
commit c86631d
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 16 deletions.
diff --git a/examples/use_rust/nrf52840_ble/Cargo.lock b/examples/use_rust/nrf52840_ble/Cargo.lock
diff --git a/examples/use_rust/nrf52840_ble_split/Cargo.lock b/examples/use_rust/nrf52840_ble_split/Cargo.lock
diff --git a/examples/use_rust/stm32h7/Cargo.lock b/examples/use_rust/stm32h7/Cargo.lock
diff --git 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
@@ -1,6 +1,6 @@
 [package]
 name = "rmk-config"
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 authors = ["Haobo Gu <[email protected]>"]
 description = "Config crate of RMK"
@@ -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 = []

diff --git 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")]

diff --git 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
@@ -1,6 +1,6 @@
 [package]
 name = "rmk-macro"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 authors = ["Haobo Gu <[email protected]>"]
 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
@@ -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
@@ -1,6 +1,6 @@
 [package]
 name = "rmk"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Haobo Gu <[email protected]>"]
 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",