sync with latest mouse branch

deividaspetraitis · Feb 29, 2024 · 2c03483 · 2c03483
1 parent 3284d25
commit 2c03483
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,4 +2,4 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    uses: petejohanson/zmk/.github/workflows/build-user-config.yml@core/zephyr-3.5-update
+    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
diff --git a/build.yaml b/build.yaml
@@ -19,6 +19,8 @@
 ---
 include:
   - board: nice_nano_v2
-    shield: corne_left
+    shield: think_corne_left
   - board: nice_nano_v2
-    shield: corne_right
+    shield: think_corne_right
+  - board: nice_nano_v2
+    shield: settings_reset
diff --git a/config/boards/shields/think_corne/think_corne.dtsi b/config/boards/shields/think_corne/think_corne.dtsi
@@ -254,16 +254,14 @@ nice_view_spi: &spi0 {
 #endif
     };
 
-    input_config: input_config {
-      compatible = "zmk,input-configs";
+    mouse_ps2_input_listener: mouse_ps2_input_listener {
+      compatible = "zmk,input-listener";
       status = "disabled";
 
-      mouse_ps2_config: mouse_ps2_config {
-        device = <&mouse_ps2>;
+	  device = <&mouse_ps2>;
 
 		// Some of the available settings depend on the keymap. So they
 		// are adjusted in...
 		// ../../../includes/trackpoint.dtsi
-      };
     };
 };
diff --git a/config/boards/shields/think_corne/think_corne_right.overlay b/config/boards/shields/think_corne/think_corne_right.overlay
@@ -59,8 +59,12 @@
 #endif
 };
 
-&input_config {
+&mouse_ps2_input_listener {
     status = "okay";
+
+   // Some of the available settings depend on the keymap. So they
+   // are adjusted in...
+   // ../../../includes/trackpoint.dsi
 };
 
 // Adjust GPIO interrupt priority to the highest level.

diff --git a/config/includes/mouse_keys.dtsi b/config/includes/mouse_keys.dtsi
@@ -1,5 +1,6 @@
 #ifdef HAS_MOUSE_KEYS
   #include <dt-bindings/zmk/mouse.h>
+  #include <behaviors/mouse_keys.dtsi>
 #endif
 
 

diff --git a/config/includes/mouse_tp.dtsi b/config/includes/mouse_tp.dtsi
@@ -1,5 +1,6 @@
 #ifdef HAS_MOUSE_TP
   #include <dt-bindings/zmk/mouse_settings.h>
+  #include <behaviors/mouse_setting.dtsi>
 
  /*
   * Key Behaviors to adjust settings
@@ -120,7 +121,7 @@
   * Input Config
   */
 
-  &mouse_ps2_config {
+  &mouse_ps2_input_listener {
     xy-swap;
     x-invert;
     y-invert;

diff --git a/config/think_corne.conf b/config/think_corne.conf
@@ -1,6 +1,6 @@
 # Uncomment the following lines to enable the Corne RGB Underglow
 CONFIG_ZMK_RGB_UNDERGLOW=n
-CONFIG_WS2812_STRIP=y
+CONFIG_WS2812_STRIP=n
 
 # Uncomment the following line to enable the Corne OLED Display
 # CONFIG_ZMK_DISPLAY=y

diff --git a/config/think_corne_left.conf b/config/think_corne_left.conf
@@ -2,4 +2,4 @@
 # Logging
 #
 
-CONFIG_ZMK_USB_LOGGING=n
+CONFIG_ZMK_USB_LOGGING=y
diff --git a/config/think_corne_right.conf b/config/think_corne_right.conf
@@ -2,4 +2,4 @@
 # Logging
 #
 
-CONFIG_ZMK_USB_LOGGING=n
+CONFIG_ZMK_USB_LOGGING=y
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ on: [push, pull_request, workflow_dispatch] @@
     jobs:
       build:
-        uses: petejohanson/zmk/.github/workflows/build-user-config.yml@core/zephyr-3.5-update
+        uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main