refactor: rename fork's StateBits and minor fixes

Signed-off-by: Haobo Gu <haobogu@outlook.com>

Author: HaoboGu

examples/use_rust/nrf52840_ble_split/Cargo.lock

@@ -20,13 +20,13 @@ use crate::mouse_button::MouseButtons;
     postcard_schema::Schema,
 )]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
-pub struct ForkStateBits {
+pub struct StateBits {
     pub modifiers: ModifierCombination,
     pub leds: LedIndicator,
     pub mouse: MouseButtons,
 }
 
-impl BitOr for ForkStateBits {
+impl BitOr for StateBits {
     type Output = Self;
 
     fn bitor(self, rhs: Self) -> Self::Output {
@@ -38,7 +38,7 @@ impl BitOr for ForkStateBits {
     }
 }
 
-impl BitAnd for ForkStateBits {
+impl BitAnd for StateBits {
     type Output = Self;
 
     fn bitand(self, rhs: Self) -> Self::Output {
@@ -50,7 +50,7 @@ impl BitAnd for ForkStateBits {
     }
 }
 
-impl Not for ForkStateBits {
+impl Not for StateBits {
     type Output = Self;
 
     fn not(self) -> Self::Output {
@@ -62,7 +62,7 @@ impl Not for ForkStateBits {
     }
 }
 
-impl ForkStateBits {
+impl StateBits {
     pub const fn new_from(modifiers: ModifierCombination, leds: LedIndicator, mouse: MouseButtons) -> Self {
         Self { modifiers, leds, mouse }
     }

rmk-types/src/fork.rs

@@ -201,8 +201,8 @@ pub fn to_ascii(keycode: HidKeyCode, shifted: bool) -> u8 {
         (HidKeyCode::Quote, true) => b'"',
         (HidKeyCode::Grave, false) => b'`',
         (HidKeyCode::Grave, true) => b'~',
-        (HidKeyCode::Backslash, true) => b'\\',
-        (HidKeyCode::Backslash, false) => b'|',
+        (HidKeyCode::Backslash, false) => b'\\',
+        (HidKeyCode::Backslash, true) => b'|',
         (HidKeyCode::Comma, false) => b',',
         (HidKeyCode::Comma, true) => b'<',
         (HidKeyCode::Dot, false) => b'.',

rmk-types/src/keycode/ascii.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 
 use super::{MAX_COMBO_KEYS, MAX_MORSE_PATTERNS};
 use crate::action::{KeyAction, MorseProfile};
-use crate::fork::ForkStateBits;
+use crate::fork::StateBits;
 use crate::modifier::ModifierCombination;
 
 /// Protocol-facing morse/tap-dance configuration.
@@ -30,8 +30,8 @@ pub struct ForkConfig {
     pub trigger: KeyAction,
     pub negative_output: KeyAction,
     pub positive_output: KeyAction,
-    pub match_any: ForkStateBits,
-    pub match_none: ForkStateBits,
+    pub match_any: StateBits,
+    pub match_none: StateBits,
     pub kept_modifiers: ModifierCombination,
     pub bindable: bool,
 }

rmk-types/src/protocol/rmk/config.rs

@@ -247,7 +247,7 @@ mod tests {
     use crate::action::MorseProfile;
     use crate::battery::ChargeState;
     use crate::ble::BleState;
-    use crate::fork::ForkStateBits;
+    use crate::fork::StateBits;
     use crate::led_indicator::LedIndicator;
     use crate::modifier::ModifierCombination;
     use crate::mouse_button::MouseButtons;
@@ -557,12 +557,12 @@ mod tests {
             trigger: KeyAction::No,
             negative_output: KeyAction::No,
             positive_output: KeyAction::No,
-            match_any: ForkStateBits {
+            match_any: StateBits {
                 modifiers: ModifierCombination::new(),
                 leds: LedIndicator::new(),
                 mouse: MouseButtons::new(),
             },
-            match_none: ForkStateBits {
+            match_none: StateBits {
                 modifiers: ModifierCombination::new(),
                 leds: LedIndicator::new(),
                 mouse: MouseButtons::new(),

rmk-types/src/protocol/rmk/mod.rs

@@ -61,7 +61,7 @@ pub(crate) mod led;
 pub mod passkey;
 pub(crate) mod profile;
 
-pub use rmk_types::ble::{BleState, BleStatus};
+use rmk_types::ble::{BleState, BleStatus};
 
 /// Global BLE status: tracks the active profile and current BLE state.
 pub static BLE_STATUS: Mutex<crate::RawMutex, Cell<BleStatus>> = Mutex::new(Cell::new(BleStatus {

rmk/src/ble/mod.rs

@@ -1,6 +1,6 @@
 use postcard::experimental::max_size::MaxSize;
 use rmk_types::action::KeyAction;
-pub use rmk_types::fork::ForkStateBits as StateBits;
+use rmk_types::fork::StateBits;
 use rmk_types::modifier::ModifierCombination;
 use serde::{Deserialize, Serialize};
 

rmk/src/fork.rs

@@ -22,7 +22,9 @@ use crate::event::ClearPeerEvent;
 use crate::event::{
     ActionEvent, KeyboardEvent, KeyboardEventPos, ModifierEvent, SubscribableEvent, publish_event, publish_event_async,
 };
-use crate::fork::{ActiveFork, StateBits};
+use rmk_types::fork::StateBits;
+
+use crate::fork::ActiveFork;
 use crate::hid::Report;
 use crate::input_device::Runnable;
 use crate::keyboard::held_buffer::{HeldBuffer, HeldKey, KeyState};

rmk/src/keyboard.rs

@@ -732,7 +732,9 @@ mod test {
     use rmk_types::modifier::ModifierCombination;
 
     use crate::combo::{Combo, ComboConfig};
-    use crate::fork::{Fork, StateBits};
+    use rmk_types::fork::StateBits;
+
+    use crate::fork::Fork;
     use crate::keymap::fill_vec;
     use crate::{COMBO_MAX_NUM, FORK_MAX_NUM, k};