From 5f817cfa3fecf5544726965baa6405051e48ea46 Mon Sep 17 00:00:00 2001
From: caksoylar <caksoylar@users.noreply.github.com>
Date: Sat, 18 Nov 2023 19:25:30 -0800
Subject: [PATCH] Update mouse config to work with PR2027

---
 config/3x5.dtsi                 |  7 ++-----
 config/mouse.dtsi               | 18 ++++--------------
 keymap-drawer/corneish_zen.svg  | 32 ++++++++++++++++++++++++--------
 keymap-drawer/corneish_zen.yaml | 16 ++++++++--------
 keymap-drawer/rommana.svg       | 32 ++++++++++++++++++++++++--------
 keymap-drawer/rommana.yaml      | 16 ++++++++--------
 6 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/config/3x5.dtsi b/config/3x5.dtsi
index cffee553..0034d91d 100644
--- a/config/3x5.dtsi
+++ b/config/3x5.dtsi
@@ -5,9 +5,6 @@
 #ifdef EXTERNAL_POWER
 #    include <dt-bindings/zmk/ext_power.h>
 #endif
-#ifdef MOUSE_KEYS
-#    include <dt-bindings/zmk/mouse.h>
-#endif
 
 // Layer aliases
 #define DEF 0
@@ -295,9 +292,9 @@
             label = "MSE";
             bindings = <
 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
-     &none         &none         &none         &none         &none             &mwh S_LEFT   &mwh S_DOWN   &mmv M_UP     &mwh S_UP     &mwh S_RIGHT
+     &none         &none         &none         &none         &none           &msc SCRL_LEFT &msc SCRL_DOWN &mmv MOVE_UP  &msc SCRL_UP  &msc SCRL_RIGHT
 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
-     &kp LCTRL     &kp LGUI      &kp LALT      &kp LSHFT     &none             &none         &mmv M_LEFT   &mmv M_DOWN   &mmv M_RIGHT  &none
+     &kp LCTRL     &kp LGUI      &kp LALT      &kp LSHFT     &none             &none       &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &none
 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
      ALP_XXX       &none         &none         &none         ALP_XXX           ALP_XXX       &mkp MB4      &mkp MCLK     &mkp MB5      ALP_XXX
 // ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
diff --git a/config/mouse.dtsi b/config/mouse.dtsi
index 934fc815..ea8ade87 100644
--- a/config/mouse.dtsi
+++ b/config/mouse.dtsi
@@ -1,3 +1,6 @@
+#define ZMK_MOUSE_DEFAULT_MOVE_VAL 1500  // 600
+#define ZMK_MOUSE_DEFAULT_SCRL_VAL 20    // 10
+
 #include <dt-bindings/zmk/mouse.h>
 
 &mmv {
@@ -6,21 +9,8 @@
     delay-ms = <0>;                   // 0
 };
 
-&mwh {
+&msc {
     acceleration-exponent = <1>;      // 0
     time-to-max-speed-ms = <40>;      // 300
     delay-ms = <0>;                   // 0
 };
-
-#define U_MOUSE_MOVE_MAX 1500       // 600
-#define U_MOUSE_SCROLL_MAX 20       // 10
-
-#define M_UP MOVE_VERT(-U_MOUSE_MOVE_MAX)
-#define M_DOWN MOVE_VERT(U_MOUSE_MOVE_MAX)
-#define M_LEFT MOVE_HOR(-U_MOUSE_MOVE_MAX)
-#define M_RIGHT MOVE_HOR(U_MOUSE_MOVE_MAX)
-
-#define S_UP SCROLL_VERT(U_MOUSE_SCROLL_MAX)
-#define S_DOWN SCROLL_VERT(-U_MOUSE_SCROLL_MAX)
-#define S_LEFT SCROLL_HOR(-U_MOUSE_SCROLL_MAX)
-#define S_RIGHT SCROLL_HOR(U_MOUSE_SCROLL_MAX)
diff --git a/keymap-drawer/corneish_zen.svg b/keymap-drawer/corneish_zen.svg
index 855a5aa6..6f681d41 100644
--- a/keymap-drawer/corneish_zen.svg
+++ b/keymap-drawer/corneish_zen.svg
@@ -1225,23 +1225,33 @@ path.combo {
 </g>
 <g transform="translate(476, 42)" class="key keypos-5">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW←</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_LEFT</tspan>
+</text>
 </g>
 <g transform="translate(532, 35)" class="key keypos-6">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW↓</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_DOWN</tspan>
+</text>
 </g>
 <g transform="translate(588, 28)" class="key keypos-7">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M↑</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">&amp;mmv</tspan><tspan x="0" dy="1.2em">MOVE_UP</tspan>
+</text>
 </g>
 <g transform="translate(644, 35)" class="key keypos-8">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW↑</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">&amp;msc</tspan><tspan x="0" dy="1.2em">SCRL_UP</tspan>
+</text>
 </g>
 <g transform="translate(700, 49)" class="key keypos-9">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW→</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">SCRL_RIGHT</tspan>
+</text>
 </g>
 <g transform="translate(28, 105)" class="key keypos-10">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1267,15 +1277,21 @@ path.combo {
 </g>
 <g transform="translate(532, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M←</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_LEFT</tspan>
+</text>
 </g>
 <g transform="translate(588, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M↓</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_DOWN</tspan>
+</text>
 </g>
 <g transform="translate(644, 91)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M→</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">MOVE_RIGHT</tspan>
+</text>
 </g>
 <g transform="translate(700, 105)" class="key keypos-19">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
diff --git a/keymap-drawer/corneish_zen.yaml b/keymap-drawer/corneish_zen.yaml
index 62a572a2..a6cefbec 100644
--- a/keymap-drawer/corneish_zen.yaml
+++ b/keymap-drawer/corneish_zen.yaml
@@ -192,20 +192,20 @@ layers:
   - ''
   - ''
   - ''
-  - MW←
-  - MW↓
-  - M↑
-  - MW↑
-  - MW→
+  - '&msc SCRL_LEFT'
+  - '&msc SCRL_DOWN'
+  - '&mmv MOVE_UP'
+  - '&msc SCRL_UP'
+  - '&msc SCRL_RIGHT'
   - Ctrl
   - Gui
   - Alt
   - Shift
   - ''
   - ''
-  - M←
-  - M↓
-  - M→
+  - '&mmv MOVE_LEFT'
+  - '&mmv MOVE_DOWN'
+  - '&mmv MOVE_RIGHT'
   - ''
   - ''
   - ''
diff --git a/keymap-drawer/rommana.svg b/keymap-drawer/rommana.svg
index e6b7852e..e8000b8d 100644
--- a/keymap-drawer/rommana.svg
+++ b/keymap-drawer/rommana.svg
@@ -1091,23 +1091,33 @@ path.combo {
 </g>
 <g transform="translate(449, 71)" class="key keypos-5">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW←</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_LEFT</tspan>
+</text>
 </g>
 <g transform="translate(510, 42)" class="key keypos-6">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW↓</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_DOWN</tspan>
+</text>
 </g>
 <g transform="translate(570, 28)" class="key keypos-7">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M↑</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">&amp;mmv</tspan><tspan x="0" dy="1.2em">MOVE_UP</tspan>
+</text>
 </g>
 <g transform="translate(637, 46) rotate(3.0)" class="key keypos-8">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW↑</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">&amp;msc</tspan><tspan x="0" dy="1.2em">SCRL_UP</tspan>
+</text>
 </g>
 <g transform="translate(702, 93) rotate(8.0)" class="key keypos-9">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MW→</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">SCRL_RIGHT</tspan>
+</text>
 </g>
 <g transform="translate(38, 150) rotate(-8.0)" class="key keypos-10">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -1133,15 +1143,21 @@ path.combo {
 </g>
 <g transform="translate(510, 100)" class="key keypos-16">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M←</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_LEFT</tspan>
+</text>
 </g>
 <g transform="translate(570, 86)" class="key keypos-17">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M↓</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_DOWN</tspan>
+</text>
 </g>
 <g transform="translate(634, 103) rotate(3.0)" class="key keypos-18">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M→</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">MOVE_RIGHT</tspan>
+</text>
 </g>
 <g transform="translate(694, 150) rotate(8.0)" class="key keypos-19">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
diff --git a/keymap-drawer/rommana.yaml b/keymap-drawer/rommana.yaml
index 82f3ce3d..eade5ae0 100644
--- a/keymap-drawer/rommana.yaml
+++ b/keymap-drawer/rommana.yaml
@@ -162,20 +162,20 @@ layers:
   - ''
   - ''
   - ''
-  - MW←
-  - MW↓
-  - M↑
-  - MW↑
-  - MW→
+  - '&msc SCRL_LEFT'
+  - '&msc SCRL_DOWN'
+  - '&mmv MOVE_UP'
+  - '&msc SCRL_UP'
+  - '&msc SCRL_RIGHT'
   - Ctrl
   - Gui
   - Alt
   - Shift
   - ''
   - ''
-  - M←
-  - M↓
-  - M→
+  - '&mmv MOVE_LEFT'
+  - '&mmv MOVE_DOWN'
+  - '&mmv MOVE_RIGHT'
   - ''
   - ''
   - ''