refactor: change variable names making it more clear

Signed-off-by: Haobo Gu <[email protected]>
HaoboGu · Nov 1, 2023 · 1c295b7 · 1c295b7
1 parent 4721dad
commit 1c295b7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/boards/rp2040/src/main.rs b/boards/rp2040/src/main.rs
@@ -143,15 +143,19 @@ mod app {
         info!("Start matrix scanning");
         loop {
             cx.local.keyboard.keyboard_task().await.unwrap();
-            cx.shared.usb_device.lock(|d| {
-                cx.local.keyboard.send_report(d);
+            cx.shared.usb_device.lock(|usb_device| {
+                // Send keyboard report
+                cx.local.keyboard.send_report(usb_device);
+
+                // Process via report
+                cx.local.keyboard.process_via_report(usb_device);
             });
 
             // Blink LED
             let _ = cx.local.led.toggle();
 
-            // Scanning frequency: 1KHZ
-            Systick::delay(1.millis()).await;
+            // Scanning frequency: 10KHZ
+            Systick::delay(100.micros()).await;
         }
     }
 

diff --git a/boards/stm32h7/src/main.rs b/boards/stm32h7/src/main.rs
@@ -151,14 +151,14 @@ mod app {
         info!("Start matrix scanning");
         loop {
             cx.local.keyboard.keyboard_task().await.unwrap();
-            cx.shared.usb_device.lock(|d| {
-                cx.local.keyboard.send_report(d);
-                // Read via report
-                // TODO: move it to another thread?
-                cx.local.keyboard.read_report(d);
+            cx.shared.usb_device.lock(|usb_device| {
+                // Send keyboard report
+                cx.local.keyboard.send_report(usb_device);
+                // Process via report
+                cx.local.keyboard.process_via_report(usb_device);
             });
-            // Scanning frequency: 1KHZ
-            Systick::delay(1.millis()).await;
+            // Scanning frequency: 10KHZ
+            Systick::delay(100.micros()).await;
         }
     }
 

diff --git a/rmk/src/keyboard.rs b/rmk/src/keyboard.rs
@@ -191,7 +191,7 @@ impl<
     }
 
     /// Read hid report.
-    pub fn read_report<B: UsbBus>(&mut self, usb_device: &mut KeyboardUsbDevice<'_, B>) {
+    pub fn process_via_report<B: UsbBus>(&mut self, usb_device: &mut KeyboardUsbDevice<'_, B>) {
         if usb_device.read_via_report(&mut self.via_report) > 0 {
             process_via_packet(&mut self.via_report, &mut self.keymap, &mut self.eeprom);