refactor: Proper per-device input listeners.

* Buffer data from input devices and only surface to HID once synd'd.
petejohanson · Apr 7, 2024 · 36c7827 · 36c7827
1 parent 3ff6051
commit 36c7827
Show file tree

Hide file tree

Showing 10 changed files with 220 additions and 201 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -23,7 +23,6 @@ target_sources(app PRIVATE src/behavior.c)
 target_sources(app PRIVATE src/kscan.c)
 target_sources_ifdef(CONFIG_ZMK_KSCAN_SIDEBAND_BEHAVIORS app PRIVATE src/kscan_sideband_behaviors.c)
 target_sources(app PRIVATE src/matrix_transform.c)
-target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/input_config.c)
 target_sources(app PRIVATE src/sensors.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/wpm.c)
 target_sources(app PRIVATE src/event_manager.c)
@@ -40,7 +39,7 @@ target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext
 target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SOFT_OFF app PRIVATE src/behaviors/behavior_soft_off.c)
 if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   target_sources(app PRIVATE src/hid.c)
-  target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/hid_input_listener.c)
+  target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse/input_listener.c)
   target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_KEY_TOGGLE app PRIVATE src/behaviors/behavior_key_toggle.c)
   target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c)

diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi
@@ -21,6 +21,4 @@
 #include <behaviors/macros.dtsi>
 #include <behaviors/mouse_key_press.dtsi>
 #include <behaviors/soft_off.dtsi>
-#include <behaviors/mouse_move.dtsi>
-#include <behaviors/mouse_scroll.dtsi>
 #include <behaviors/macros.dtsi>
diff --git a/app/dts/behaviors/mouse_move.dtsi b/app/dts/behaviors/mouse_move.dtsi
@@ -11,4 +11,9 @@
             acceleration-exponent = <1>;
         };
     };
+
+    mmv_input_listener {
+        compatible = "zmk,input-listener";
+        device = <&mmv>;
+    };
 };
diff --git a/app/dts/behaviors/mouse_scroll.dtsi b/app/dts/behaviors/mouse_scroll.dtsi
@@ -11,4 +11,9 @@
             acceleration-exponent = <0>;
         };
     };
+
+    msc_input_listener {
+        compatible = "zmk,input-listener";
+        device = <&msc>;
+    };
 };
diff --git a/app/dts/bindings/zmk,input-configs.yaml b/app/dts/bindings/zmk,input-configs.yaml
diff --git a/app/dts/bindings/zmk,input-listener.yaml b/app/dts/bindings/zmk,input-listener.yaml
@@ -0,0 +1,21 @@
+description: |
+  Listener to subscribe to input events and send HID updates after processing
+
+compatible: "zmk,input-listener"
+
+properties:
+  device:
+    type: phandle
+    required: true
+  xy-swap:
+    type: boolean
+  x-invert:
+    type: boolean
+  y-invert:
+    type: boolean
+  scale-multiplier:
+    type: int
+    default: 1
+  scale-divisor:
+    type: int
+    default: 1
diff --git a/app/include/zmk/mouse/input_config.h b/app/include/zmk/mouse/input_config.h
diff --git a/app/src/mouse/hid_input_listener.c b/app/src/mouse/hid_input_listener.c
diff --git a/app/src/mouse/input_config.c b/app/src/mouse/input_config.c