feat(combo): add config for combo timeout

rmk-macro/src/behavior.rs

@@ -41,10 +41,10 @@ fn expand_one_shot(one_shot: &Option<OneShotConfig>) -> proc_macro2::TokenStream
 }
 
 fn expand_combos(combos: &Option<CombosConfig>) -> proc_macro2::TokenStream {
-    let default = quote! {::core::default::Default::default()};
+    let default = quote! { ::core::default::Default::default() };
     match combos {
         Some(combos) => {
-            let combos = combos.combos.iter().map(|combo| {
+            let combos_def = combos.combos.iter().map(|combo| {
                 let actions = combo.actions.iter().map(|a| parse_key(a.to_owned()));
                 let output = parse_key(combo.output.to_owned());
                 let layer = match combo.layer {
@@ -54,7 +54,21 @@ fn expand_combos(combos: &Option<CombosConfig>) -> proc_macro2::TokenStream {
                 quote! { ::rmk::combo::Combo::new([#(#actions),*], #output, #layer) }
             });
 
-            quote! { ::heapless::Vec::from_iter([#(#combos),*]) }
+            let timeout = match &combos.timeout {
+                Some(t) => {
+                    let millis = t.0;
+                    quote! { timeout: ::embassy_time::Duration::from_millis(#millis), }
+                }
+                None => quote! {},
+            };
+
+            quote! {
+                ::rmk::config::CombosConfig {
+                    combos: ::rmk::heapless::Vec::from_iter([#(#combos_def),*]),
+                    #timeout
+                    ..Default::default()
+                }
+            }
         }
         None => default,
     }
@@ -69,7 +83,7 @@ pub(crate) fn expand_behavior_config(keyboard_config: &KeyboardConfig) -> proc_m
         let behavior_config = ::rmk::config::BehaviorConfig {
             tri_layer: #tri_layer,
             one_shot: #one_shot,
-            combos: #combos,
+            combo: #combos,
         };
     }
 }

rmk-macro/src/config/mod.rs

@@ -155,6 +155,7 @@ pub struct OneShotConfig {
 #[derive(Clone, Debug, Deserialize)]
 pub struct CombosConfig {
     pub combos: Vec<ComboConfig>,
+    pub timeout: Option<DurationMillis>,
 }
 
 /// Configurations for combo
@@ -220,8 +221,10 @@ fn parse_duration_millis<'de, D: de::Deserializer<'de>>(deserializer: D) -> Resu
     })?;
 
     match unit {
-        "s" => Ok(num*1000),
+        "s" => Ok(num * 1000),
         "ms" => Ok(num),
-        other => Err(de::Error::custom(format!("Invalid unit \"{other}\" in [one_shot.timeout]: unit part must be either \"s\" or \"ms\""))),
+        other => Err(de::Error::custom(format!(
+            "Invalid unit \"{other}\" for duration: unit part must be either \"s\" or \"ms\""
+        ))),
     }
 }

rmk-macro/src/keyboard_config.rs

@@ -22,9 +22,9 @@ macro_rules! rmk_compile_error {
     };
 }
 
-// Max number of macros
+// Max number of combos
 pub const COMBO_MAX_NUM: usize = 8;
-// Max size of macros
+// Max size of combos
 pub const COMBO_MAX_LENGTH: usize = 4;
 
 /// Keyboard's basic info

rmk/src/combo.rs

@@ -2,9 +2,9 @@ use heapless::Vec;
 
 use crate::{action::KeyAction, keyboard::KeyEvent};
 
-// Max number of macros
+// Max number of combos
 pub(crate) const COMBO_MAX_NUM: usize = 8;
-// Max size of macros
+// Max size of combos
 pub(crate) const COMBO_MAX_LENGTH: usize = 4;
 
 #[derive(Clone)]

rmk/src/config/mod.rs

@@ -48,7 +48,7 @@ impl<'a, O: OutputPin> Default for RmkConfig<'a, O> {
 pub struct BehaviorConfig {
     pub tri_layer: Option<[u8; 3]>,
     pub one_shot: OneShotConfig,
-    pub combos: Vec<Combo, COMBO_MAX_NUM>,
+    pub combo: CombosConfig,
 }
 
 /// Config for one shot behavior
@@ -64,6 +64,21 @@ impl Default for OneShotConfig {
     }
 }
 
+/// Config for combo behavior
+pub struct CombosConfig {
+    pub combos: Vec<Combo, COMBO_MAX_NUM>,
+    pub timeout: Duration,
+}
+
+impl Default for CombosConfig {
+    fn default() -> Self {
+        Self {
+            timeout: Duration::from_millis(50),
+            combos: Vec::new(),
+        }
+    }
+}
+
 /// Config for storage
 #[derive(Clone, Copy, Debug)]
 pub struct StorageConfig {

rmk/src/keyboard.rs

@@ -346,7 +346,8 @@ impl<'a, const ROW: usize, const COL: usize, const NUM_LAYER: usize>
             if next_action.is_some() {
                 self.combo_actions_buffer.clear();
             } else {
-                let timeout = embassy_time::Timer::after_millis(50);
+                let timeout =
+                    embassy_time::Timer::after(self.keymap.borrow().behavior.combo.timeout);
                 match select(timeout, key_event_channel.receive()).await {
                     embassy_futures::select::Either::First(_) => self.dispatch_combos().await,
                     embassy_futures::select::Either::Second(event) => {

rmk/src/keymap.rs

@@ -43,7 +43,7 @@ impl<'a, const ROW: usize, const COL: usize, const NUM_LAYER: usize>
         behavior: BehaviorConfig,
     ) -> Self {
         let mut combos: [Combo; COMBO_MAX_NUM] = Default::default();
-        for (i, combo) in behavior.combos.iter().enumerate() {
+        for (i, combo) in behavior.combo.combos.iter().enumerate() {
             combos[i] = combo.clone();
         }
         KeyMap {
@@ -65,7 +65,7 @@ impl<'a, const ROW: usize, const COL: usize, const NUM_LAYER: usize>
         // If the storage is initialized, read keymap from storage
         let mut macro_cache = [0; MACRO_SPACE_SIZE];
         let mut combos: [Combo; COMBO_MAX_NUM] = Default::default();
-        for (i, combo) in behavior.combos.iter().enumerate() {
+        for (i, combo) in behavior.combo.combos.iter().enumerate() {
             combos[i] = combo.clone();
         }
         if let Some(storage) = storage {

rmk/src/lib.rs

@@ -45,6 +45,7 @@ use embedded_hal_async::digital::Wait;
 use embedded_storage::nor_flash::NorFlash;
 pub use flash::EmptyFlashWrapper;
 use futures::pin_mut;
+pub use heapless;
 use keyboard::{
     communication_task, keyboard_report_channel, Keyboard, KeyboardReportMessage,
     REPORT_CHANNEL_SIZE,