debug: try mod-morph with ref but avoir name collision

JeffDess · Aug 4, 2024 · 991f558 · 991f558
1 parent 097801b
commit 991f558
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/urchin.keymap b/config/urchin.keymap
@@ -39,7 +39,7 @@ ZMK_LAYER(ColeAcc,
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
      &A_GR COL  &CIRC E COL  &E_CU COL  &hrmeg SL COL XXX            XXX         &hrmic SL COL &O_CI COL     &U_CI COL   &KPD ACC_GR COL
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
-     &A_CI COL   XXX         &CEDIL COL  XXX          XXX            XXX         XXX           XXX           &MA u_gr COL   &KPD ACC_CI COL
+     &A_CI COL   XXX         &CEDIL COL  XXX          XXX            XXX         XXX           XXX           &MA UGR COL   &KPD ACC_CI COL
 // ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯
                                          ___          &to COL        ___         ___
 //                                     ╰────────────┴────────────╯ ╰───────────┴─────────────╯

diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi
@@ -4,8 +4,6 @@
 #undef CONFIG_ZMK_MACRO_DEFAULT_TAP_MS
 #define CONFIG_ZMK_MACRO_DEFAULT_TAP_MS 40
 
-#define u_gr &u_gr
-
 /* Canadian Multilingual Standard Mappings */
 
 #define SLSH   GRAVE         // /
@@ -25,6 +23,8 @@
 #define ACC_GR RA(LBKT)      // `
 #define ACC_TR LS(LBKT)      // ¨
 
+#define UGR &u_gr 
+
 // The following must return to the base layer after being pressed
 ZMK_MACRO_ONE_PARAM(A_GR, bindings = <&kp BACKSLASH>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;)  // À
 ZMK_MACRO_ONE_PARAM(A_CI, bindings = <&fr_a_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;)       // Â
@@ -80,7 +80,7 @@ ZMK_MACRO_TWO_PARAM(AGRA, bindings =
 )
 
 ZMK_MOD_MORPH(u_gr,
-    bindings = <&kp U>, <&kp U>;
+    bindings = <&AGRA U 0>, <&AGRA U LSHIFT>;
     mods = <(MOD_LSFT|MOD_RSFT)>;
 )