fix(direct): the size of futs for waiting is incorrect

keyboard cannot start scanning when some keys are pressed
HaoboGu · Dec 17, 2024 · 10ddf43 · 10ddf43
1 parent d4e4786
commit 10ddf43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rmk-macro/src/split/peripheral.rs b/rmk-macro/src/split/peripheral.rs
@@ -160,13 +160,13 @@ fn expand_split_peripheral_entry(
                 .expect("Missing central ble address");
             let row = peripheral_config.rows;
             let col = peripheral_config.cols;
-            let size = row + col;
             let peripheral_addr = peripheral_config.ble_addr.expect(
                 "Peripheral should have a ble address, please check the `ble_addr` field in `keyboard.toml`",
             );
             let low_active = peripheral_config.matrix.direct_pin_low_active;
             match peripheral_config.matrix.matrix_type {
                 MatrixType::direct_pin => {
+                    let size = row * col;
                     quote! {
                         ::rmk::split::peripheral::run_rmk_split_peripheral_direct_pin::<
                             ::embassy_nrf::gpio::Input<'_>,
@@ -184,6 +184,7 @@ fn expand_split_peripheral_entry(
                     }
                 }
                 MatrixType::normal => {
+                    let size = row + col;
                     quote! {
                         ::rmk::split::peripheral::run_rmk_split_peripheral::<
                             ::embassy_nrf::gpio::Input<'_>,

diff --git a/rmk/src/split/central.rs b/rmk/src/split/central.rs
@@ -544,7 +544,7 @@ impl<
         use heapless::Vec;
         use embassy_futures::select::select_slice;
         if let Some(start_time) = self.scan_start {
-            // If no key press over 1ms, stop scanning and wait for interupt
+            // If no key press over 1ms, stop scanning and wait for interrupt
             if start_time.elapsed().as_millis() <= 1 {
                 return;
             } else {