Refactor dtsi files

config/base.keymap

@@ -1,6 +1,5 @@
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/mouse.h>
 
 #define XXX &none
 #define ___ &trans
@@ -14,6 +13,10 @@
 #define FN 4
 #define UC 5
 
+#include "mouse.dtsi"
+#include "unicode.dtsi"
+#include "combos.dtsi"
+
 /* create stubs if undefined */
 #if !defined EXTRA_MID
     #define EXTRA_MID
@@ -31,11 +34,11 @@ TODOs and ISSUES
  * tap-only combos not yet possible (#544), prevents rapid chaining of HRMs
  * &bootloader doesn't work with Planck_rev6 (#1086)
  * no global-quick-tap for combos
- * mouse wheel keys not yet implemented (#319), using up/down for now
  * mod-taps getting stuck with heterogenous combo-terms (#986, #905)
  * sticky-hold swallows OS shift when typing quickly, using sticky-tap for now
  * native sleep key doesn't work with windows (#1077), using sleep-macro for now
  * no native unicode support (#232), using preprocessor workaround instead
+ * no native mouse keys (#319), using mouse PR #778
  * mod-morph doesn't swallow mod (#686), using masked-mod PR #1114
 */
 
@@ -56,9 +59,6 @@ TODOs and ISSUES
 /* root node */
 / {
 
-    #include "unicode.dtsi"
-    #include "combos.dtsi"
-
     macros {
         // Windows sleep key
         win_sleep: win_sleep {

config/combos.dtsi

@@ -21,8 +21,8 @@
         layers = <LAYERS>; \
     };
 
-combos {
+/ {
-
+    combos {
         compatible = "zmk,combos";
 
         /* Capsword */
@@ -69,4 +69,5 @@ combos {
         COMBO(fslh,  &kp FSLH,      RM2 RB2, DEF NUM, COMBO_TERM_V)
         COMBO(pipe,  &kp PIPE,      RM3 RB3, DEF NUM, COMBO_TERM_V)
 
+    };
 };

config/mouse.dtsi

@@ -0,0 +1,35 @@
+#include <dt-bindings/zmk/mouse.h>
+
+&mmv {
+  time-to-max-speed-ms = <1500>;  // 300
+  acceleration-exponent = <1>;
+  delay-ms = <0>;
+};
+
+&mwh {
+  time-to-max-speed-ms = <5000>;  // 300
+  acceleration-exponent = <1>;    // 0
+  delay-ms = <0>;
+};
+
+#define U_MOUSE_MOVE_MAX 1250
+#define U_MOUSE_SCROLL_MAX 100
+
+#undef MOVE_UP
+#undef MOVE_DOWN
+#undef MOVE_LEFT
+#undef MOVE_RIGHT
+#define MOVE_UP MOVE_VERT(-U_MOUSE_MOVE_MAX)
+#define MOVE_DOWN MOVE_VERT(U_MOUSE_MOVE_MAX)
+#define MOVE_LEFT MOVE_HOR(-U_MOUSE_MOVE_MAX)
+#define MOVE_RIGHT MOVE_HOR(U_MOUSE_MOVE_MAX)
+
+#undef SCROLL_UP
+#undef SCROLL_DOWN
+#undef SCROLL_LEFT
+#undef SCROLL_RIGHT
+#define SCROLL_UP SCROLL_VERT(U_MOUSE_SCROLL_MAX)
+#define SCROLL_DOWN SCROLL_VERT(-U_MOUSE_SCROLL_MAX)
+#define SCROLL_LEFT SCROLL_HOR(-U_MOUSE_SCROLL_MAX)
+#define SCROLL_RIGHT SCROLL_HOR(U_MOUSE_SCROLL_MAX)
+

config/unicode.dtsi

@@ -38,32 +38,35 @@
     UC_MODMORPH(uc_ ## NAME, &uc_lower_ ## NAME, &uc_upper_ ## NAME)
 
 /* User definitions */
-UNICODE_SINGLE( alpha,   N0, N3,  B, N1)
+/ {
-UNICODE_SINGLE( beta,    N0, N3,  B, N2)
-UNICODE_PAIR(   gamma,   N0, N3,  B, N3,    N0, N3, N9, N3)
-UNICODE_PAIR(   delta,   N0, N3,  B, N4,    N0, N3, N9, N4)
-UNICODE_SINGLE( epsilon, N0, N3,  F, N5)                      // varepsilon = 03B5
-UNICODE_SINGLE( zeta,    N0, N3,  B, N6)
-UNICODE_SINGLE( eta,     N0, N3,  B, N7)
-UNICODE_PAIR(   theta,   N0, N3,  B, N8,    N0, N3, N9, N8)
-UNICODE_SINGLE( iota,    N0, N3,  B, N9)
-UNICODE_SINGLE( kappa,   N0, N3,  B,  A)
-UNICODE_PAIR(   lambda,  N0, N3,  B,  B,    N0, N3, N9,  B)
-UNICODE_SINGLE( mu,      N0, N3,  B,  C)
-UNICODE_SINGLE( nu,      N0, N3,  B,  D)
-UNICODE_PAIR(   xi,      N0, N3,  B,  E,    N0, N3, N9,  E)
-UNICODE_PAIR(   pi,      N0, N3,  C, N0,    N0, N3,  A, N0)
-UNICODE_SINGLE( rho,     N0, N3,  C, N1)
-UNICODE_PAIR(   sigma,   N0, N3,  C, N3,    N0, N3,  A, N3)
-UNICODE_SINGLE( tau,     N0, N3,  C, N4)
-UNICODE_PAIR(   upsilon, N0, N3,  C, N5,    N0, N3,  A, N5)
-UNICODE_PAIR(   phi,     N0, N3,  C, N6,    N0, N3,  A, N6)  // varphi = 03C6
-UNICODE_SINGLE( chi,     N0, N3,  C, N7)
-UNICODE_PAIR(   psi,     N0, N3,  C, N8,    N0, N3,  A, N8)
-UNICODE_PAIR(   omega,   N0, N3,  C, N9,    N0, N3,  A, N9)
 
-UNICODE_PAIR(   ae,      N0, N0,  E, N4,    N0, N0,  C, N4)
+    UNICODE_SINGLE( alpha,   N0, N3,  B, N1)
-UNICODE_PAIR(   oe,      N0, N0,  F, N6,    N0, N0,  D, N6)
+    UNICODE_SINGLE( beta,    N0, N3,  B, N2)
-UNICODE_PAIR(   ue,      N0, N0,  F,  C,    N0, N0,  D,  C)
+    UNICODE_PAIR(   gamma,   N0, N3,  B, N3,    N0, N3, N9, N3)
-UNICODE_SINGLE( eszett,  N0, N0,  D,  F)
+    UNICODE_PAIR(   delta,   N0, N3,  B, N4,    N0, N3, N9, N4)
+    UNICODE_SINGLE( epsilon, N0, N3,  F, N5)                      // varepsilon = 03B5
+    UNICODE_SINGLE( zeta,    N0, N3,  B, N6)
+    UNICODE_SINGLE( eta,     N0, N3,  B, N7)
+    UNICODE_PAIR(   theta,   N0, N3,  B, N8,    N0, N3, N9, N8)
+    UNICODE_SINGLE( iota,    N0, N3,  B, N9)
+    UNICODE_SINGLE( kappa,   N0, N3,  B,  A)
+    UNICODE_PAIR(   lambda,  N0, N3,  B,  B,    N0, N3, N9,  B)
+    UNICODE_SINGLE( mu,      N0, N3,  B,  C)
+    UNICODE_SINGLE( nu,      N0, N3,  B,  D)
+    UNICODE_PAIR(   xi,      N0, N3,  B,  E,    N0, N3, N9,  E)
+    UNICODE_PAIR(   pi,      N0, N3,  C, N0,    N0, N3,  A, N0)
+    UNICODE_SINGLE( rho,     N0, N3,  C, N1)
+    UNICODE_PAIR(   sigma,   N0, N3,  C, N3,    N0, N3,  A, N3)
+    UNICODE_SINGLE( tau,     N0, N3,  C, N4)
+    UNICODE_PAIR(   upsilon, N0, N3,  C, N5,    N0, N3,  A, N5)
+    UNICODE_PAIR(   phi,     N0, N3,  C, N6,    N0, N3,  A, N6)  // varphi = 03C6
+    UNICODE_SINGLE( chi,     N0, N3,  C, N7)
+    UNICODE_PAIR(   psi,     N0, N3,  C, N8,    N0, N3,  A, N8)
+    UNICODE_PAIR(   omega,   N0, N3,  C, N9,    N0, N3,  A, N9)
 
+    UNICODE_PAIR(   ae,      N0, N0,  E, N4,    N0, N0,  C, N4)
+    UNICODE_PAIR(   oe,      N0, N0,  F, N6,    N0, N0,  D, N6)
+    UNICODE_PAIR(   ue,      N0, N0,  F,  C,    N0, N0,  D,  C)
+    UNICODE_SINGLE( eszett,  N0, N0,  D,  F)
+
+};