compile

sashalex007 · May 24, 2024 · a6e4287 · a6e4287
1 parent c10c997
commit a6e4287
Showing 1 changed file with 52 additions and 21 deletions.
diff --git a/config/boards/shields/ergoalex/ergoalex.keymap b/config/boards/shields/ergoalex/ergoalex.keymap
@@ -18,6 +18,8 @@
 #define IDLE 150
 #define COMBO_IDLE 50
 
+#define NUM_KEY 16
+
 / { 
 
     macros {
@@ -177,12 +179,20 @@
 
         r_combo_amps {
             timeout-ms = <COMBO>;
-            key-positions = <12 6>;
+            key-positions = <12 5>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac SPR AMPS>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
+        r_combo_under {
+            timeout-ms = <COMBO>;
+            key-positions = <12 6>;
+            layers = <DEF>;
+            slow-release;
+            bindings = <&mac SPR UNDER>;
+            require-prior-idle-ms = <COMBO_IDLE>;
+        };
         r_combo_pipe {
             timeout-ms = <COMBO>;
             key-positions = <12 7>;
@@ -215,14 +225,6 @@
             bindings = <&mac SPR EQUAL>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
-        r_combo_under {
-            timeout-ms = <COMBO>;
-            key-positions = <12 16>;
-            layers = <DEF>;
-            slow-release;
-            bindings = <&mac SPR UNDER>;
-            require-prior-idle-ms = <COMBO_IDLE>;
-        };
         r_combo_qmark {
             timeout-ms = <COMBO>;
             key-positions = <12 18>;
@@ -276,86 +278,113 @@
 
         r_combo_five {
             timeout-ms = <COMBO>;
-            key-positions = <33 0>;
+            key-positions = <NUM_KEY 0>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N5>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_six {
             timeout-ms = <COMBO>;
-            key-positions = <33 1>;
+            key-positions = <NUM_KEY 1>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N6>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_seven {
             timeout-ms = <COMBO>;
-            key-positions = <33 2>;
+            key-positions = <NUM_KEY 2>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N7>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_eight {
             timeout-ms = <COMBO>;
-            key-positions = <33 3>;
+            key-positions = <NUM_KEY 3>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N8>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_nine {
             timeout-ms = <COMBO>;
-            key-positions = <33 4>;
+            key-positions = <NUM_KEY 4>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N9>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_zero {
             timeout-ms = <COMBO>;
-            key-positions = <33 10>;
+            key-positions = <NUM_KEY 10>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N0>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_one {
             timeout-ms = <COMBO>;
-            key-positions = <33 11>;
+            key-positions = <NUM_KEY 11>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N1>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_two {
             timeout-ms = <COMBO>;
-            key-positions = <33 12>;
+            key-positions = <NUM_KEY 12>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N2>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_three {
             timeout-ms = <COMBO>;
-            key-positions = <33 13>;
+            key-positions = <NUM_KEY 13>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N3>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
         r_combo_four {
             timeout-ms = <COMBO>;
-            key-positions = <33 14>;
+            key-positions = <NUM_KEY 14>;
             layers = <DEF>;
             slow-release;
             bindings = <&mac NUM N4>;
             require-prior-idle-ms = <COMBO_IDLE>;
         };
 
 
+
+        nav_combo_ret {
+            timeout-ms = <COMBO>;
+            key-positions = <32 13>;
+            layers = <DEF>;
+            slow-release;
+            bindings = <&mac NAV RET>;
+            require-prior-idle-ms = <COMBO_IDLE>;
+        };
+        nav_combo_bspc {
+            timeout-ms = <COMBO>;
+            key-positions = <32 12>;
+            layers = <DEF>;
+            slow-release;
+            bindings = <&mac NAV BSPC>;
+            require-prior-idle-ms = <COMBO_IDLE>;
+        };
+        nav_combo_tab {
+            timeout-ms = <COMBO>;
+            key-positions = <32 23>;
+            layers = <DEF>;
+            slow-release;
+            bindings = <&mac NAV TAB>;
+            require-prior-idle-ms = <COMBO_IDLE>;
+        };
+
+
         sft_combo_double_quote {
             timeout-ms = <COMBO>;
             key-positions = <19 20>;
@@ -443,6 +472,7 @@
             >;
         };
 
+
         nav_layer {
             bindings = <
             &kp ESC         &kp LG(X)  &kp LG(C)  &kp LG(V)  &kp LG(FSLH)       &kp PG_UP     &kp LA(LEFT)  &kp UP    &kp LA(RIGHT)  ___
@@ -463,13 +493,14 @@
 
         spr_layer {
             bindings = <
-                ___  ___  ___  ___  ___     ___        &kp AMPS   &kp PIPE   &kp LT     &kp GT
-                ___  ___  ___  ___  ___     &kp EQUAL  &kp UNDER  ___        &kp QMARK  &kp MINUS
+                ___  ___  ___  ___  ___     &kp AMPS   &kp UNDER  &kp PIPE   &kp LT     &kp GT
+                ___  ___  ___  ___  ___     &kp EQUAL  ___        ___        &kp QMARK  &kp MINUS
                 ___  ___  ___  ___  ___     ___        &kp DLLR   &kp TILDE  &kp CARET  &kp GRAVE
                                ___  ___     ___        ___
             >;
         };
 
+
 
         num_layer {
             bindings = <