fix

Incblob · Nov 3, 2024 · 583aaf6 · 583aaf6
1 parent 142021b
commit 583aaf6
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/config/boards/shields/horizon/behaviors.dtsi b/config/boards/shields/horizon/behaviors.dtsi
@@ -45,10 +45,15 @@ behaviors {
     //
     td_dot: td_dot {
         TD_template;
-        bindings = <&mt &colon_space_cap &dot_space_cap>
+        bindings = <&mt_dot>
                  , <AS(DOT)>
                  , <&dotdotdot>;
     };
+
+    mt_dot: mt_dot {
+            my_lk_config;
+            bindings = <&colon_space_cap>, <&dot_space_cap>;
+        };
 
     td_comma: td_comma {
         TD_template;
@@ -64,11 +69,11 @@ behaviors {
 
     td_qu: td_qu {
             TD_template;
-            bindings = <&mt &macro_QU_cap &macro_QU>, <AS(Q)>;
+            bindings = <&td_qu_test>, <AS(Q)>;
         };
 
     td_qu_test: td_qu_test {
-            TD_template;
+            my_lk_config;
             bindings = <&macro_QU>, <&macro_QU_cap>;
         };
     // shift_qu: shift_qu_macro {

diff --git a/config/boards/shields/horizon/combos.dtsi b/config/boards/shields/horizon/combos.dtsi
@@ -36,13 +36,13 @@ COMBO_LAYER(home, &kp HOME, RM1 RM2, <l_ALPHA l_CODE l_L l_HD>)
 //
 // H Digraphs
 //
-COMBO_LAYER(sch, &macro_Sch,     LB1  LM2 LM3, <l_HD> ) // Sch
-COMBO_LAYER(tch, &macro_Tch,     LM2  LM3 LM4, <l_HD>) // Tch
-COMBO_LAYER(th,  &lk_th H T,     LM3  LM4,      <l_HD>) // Th/tion
-COMBO_LAYER(ch,  &macro_Ch,      LM2  LM3,      <l_HD>) // Ch
-COMBO_LAYER(wh,  &macro_Wh,      LT2  LT3,      <l_HD>) // Wh
-COMBO_LAYER(sh,  &lk_sh H S,     LB1  LM2,      <l_HD>) // Sh/sion
-COMBO_LAYER(gh,  &lk_gh H G,     LT3  LT4,      <l_HD>) // Gh/ght
-COMBO_LAYER(ph,  &macro_Ph,      LB2  LB3,      <l_HD>) // Ph
+COMBO_LAYER(sch, &macro_Sch,     LB1  LM2 LM3, <l_HD l_HD_CODE> ) // Sch
+COMBO_LAYER(tch, &macro_Tch,     LM2  LM3 LM4, <l_HD l_HD_CODE>) // Tch
+COMBO_LAYER(th,  &lk_th H T,     LM3  LM4,      <l_HD l_HD_CODE>) // Th/tion
+COMBO_LAYER(ch,  &macro_Ch,      LM2  LM3,      <l_HD l_HD_CODE>) // Ch
+COMBO_LAYER(wh,  &macro_Wh,      LT2  LT3,      <l_HD l_HD_CODE>) // Wh
+COMBO_LAYER(sh,  &lk_sh H S,     LB1  LM2,      <l_HD l_HD_CODE>) // Sh/sion
+COMBO_LAYER(gh,  &lk_gh H G,     LT3  LT4,      <l_HD l_HD_CODE>) // Gh/ght
+COMBO_LAYER(ph,  &macro_Ph,      LB2  LB3,      <l_HD l_HD_CODE>) // Ph
 
 };
diff --git a/config/boards/shields/horizon/horizon.keymap b/config/boards/shields/horizon/horizon.keymap
@@ -11,13 +11,14 @@
 
 #define l_ALPHA 0
 #define l_CODE 1
-#define l_L  2
-#define l_R  3
-#define l_B  4
-#define l_G1 5
-#define l_G2 6
-#define l_HD 7
-#define l_HD_CODE 8
+#define l_HD 2
+#define l_HD_CODE 3
+#define l_L  4
+#define l_R  5
+#define l_B  6
+#define l_G1 7
+#define l_G2 8
+
 
 &mt {
     tapping-term-ms = <145>;

diff --git a/config/boards/shields/horizon/horizon_layers.dtsi b/config/boards/shields/horizon/horizon_layers.dtsi
@@ -4,7 +4,7 @@ default_layer {
     bindings = <
         &kp ESC       AS(F12)   AS(W)      AS(F)         AS(P)         AS(B)                                    AS(J)          AS(L)      AS(U)      AS(Z)     &as LC(G) LC(F)   &kp LC(HOME)
         &kp LSHFT     AS(Q)     AS(R)      AS(S)         AS(T)         AS(G)                                    AS(M)          AS(N)      AS(E)      AS(I)     AS(NON_US_HASH)   &kp LC(END)
-        AS(TAB)       AS(A)     AS(X)      AS(C)         AS(D)         AS(V)      &kp LS(LC(LALT))  &caps_word  AS(K)          AS(H)      &comma_space  &td_dot   AS(O)             AS(RET)
+        AS(TAB)       AS(A)     AS(X)      AS(C)         AS(D)         AS(V)      &kp LS(LC(LALT))  &caps_word  AS(K)          AS(H)      &td_comma  &td_dot   AS(O)             AS(RET)
         &kp LCTRL     AS(Y)     &kp LGUI   &kp LG(LS(S)) &mt LALT ESC  &lt l_L SPACE  &kp BSPC     &kp DELETE   &lt l_R SPACE  AS(FSLH)   &kp LEFT  &kp UP    &kp DOWN          &kp RIGHT
     >;
 };

diff --git a/config/boards/shields/horizon/horizon_layout.dtsi b/config/boards/shields/horizon/horizon_layout.dtsi
@@ -4,7 +4,7 @@
 │  X   W   M   G   J  │ │  #$  .:  /*  "[  ']  │
 │  S   C   N   T   K  | |  ,;   A   E   I   H  │
 │  B   P   L   D   V  │ │  -+   U   O   Y   F  │
-╰──────────╮   SPC  BSC │ │  R -   ╭───────────╯
+╰──────────╮   SPC  BSC │ │  R -    ╭──────────────╯
            ╰────────────╯ ╰───────────╯
 */