Skip to content

Commit

Permalink
chore: revert CSA explicit macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@JeffDess
JeffDess committed May 24, 2024
1 parent 25b8a30 commit 383f275
Showing 1 changed file with 28 additions and 27 deletions.
55 changes: 28 additions & 27 deletions layouts/canadian-multilingual-standard.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,51 +31,52 @@
#define ACC_TR LS(LBKT) // ¨

// 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>;) // Â
ZMK_MACRO_ONE_PARAM(E_CU, bindings = <&kp SLASH>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // É
ZMK_MACRO_ONE_PARAM(E_GR, bindings = <&kp APOS>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // È
ZMK_MACRO_ONE_PARAM(E_CI, bindings = <&fr_e_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ê
ZMK_MACRO_ONE_PARAM(I_CI, bindings = <&fr_i_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Î
ZMK_MACRO_ONE_PARAM(O_CI, bindings = <&fr_o_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ô
ZMK_MACRO_ONE_PARAM(U_CI, bindings = <&fr_u_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Û
ZMK_MACRO_ONE_PARAM(U_GR, bindings = <&fr_u_gr>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ù
ZMK_MACRO_ONE_PARAM(AE_L, bindings = <&fr_ae>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Æ
ZMK_MACRO_ONE_PARAM(OE_L, bindings = <&fr_oe>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Œ
ZMK_MACRO_ONE_PARAM(CEDIL, bindings = <&kp RBKT>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ç
ZMK_BEHAVIOR(A_GR, macro_one_param, bindings = <&kp BACKSLASH>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // À
ZMK_BEHAVIOR(A_CI, macro_one_param, bindings = <&fr_a_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Â
ZMK_BEHAVIOR(E_CU, macro_one_param, bindings = <&kp SLASH>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // É
ZMK_BEHAVIOR(E_GR, macro_one_param, bindings = <&kp APOS>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // È
ZMK_BEHAVIOR(E_CI, macro_one_param, bindings = <&fr_e_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ê
ZMK_BEHAVIOR(I_CI, macro_one_param, bindings = <&fr_i_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Î
ZMK_BEHAVIOR(O_CI, macro_one_param, bindings = <&fr_o_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ô
ZMK_BEHAVIOR(U_CI, macro_one_param, bindings = <&fr_u_cf>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Û
ZMK_BEHAVIOR(U_GR, macro_one_param, bindings = <&fr_u_gr>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ù
ZMK_BEHAVIOR(AE_L, macro_one_param, bindings = <&fr_ae>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Æ
ZMK_BEHAVIOR(OE_L, macro_one_param, bindings = <&fr_oe>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Œ
ZMK_BEHAVIOR(CEDIL, macro_one_param, bindings = <&kp RBKT>, <&macro_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ç

// QWERTY Homerow Mods
ZMK_MACRO(E_GR_D, bindings = <&kp APOS>, <&to QWE>;) // È
ZMK_MACRO(I_CI_D, bindings = <&fr_i_cf>, <&to QWE>;) // Î
ZMK_BEHAVIOR(E_GR_D, macro, bindings = <&kp APOS>, <&to QWE>;) // È
ZMK_BEHAVIOR(I_CI_D, macro, bindings = <&fr_i_cf>, <&to QWE>;) // Î

// Colemak Homerow Mods
ZMK_MACRO(E_GR_C, bindings = <&kp APOS>, <&to COL>;) // È
ZMK_MACRO(I_CI_C, bindings = <&fr_i_cf>, <&to COL>;) // Î
ZMK_BEHAVIOR(E_GR_C, macro, bindings = <&kp APOS>, <&to COL>;) // È
ZMK_BEHAVIOR(I_CI_C, macro, bindings = <&fr_i_cf>, <&to COL>;) // Î

// Ergo-L Homerow Mods
ZMK_MACRO(E_CI_E, bindings = <&fr_e_cf>, <&to ERG>;) // Ê
ZMK_BEHAVIOR(E_CI_E, macro, bindings = <&fr_e_cf>, <&to ERG>;) // Ê


// ` directly
ZMK_MACRO(GRA, bindings =
ZMK_BEHAVIOR(GRA, macro, bindings =
<&macro_press &kp RALT>,
<&macro_tap &kp LBKT &kp LBKT>,
<&macro_release &kp RALT>;
)

// ^ directly
ZMK_MACRO(CAR, bindings =
ZMK_BEHAVIOR(CAR, macro, bindings =
<&macro_tap &kp LBKT &kp SPACE>;
)

// ¨ directly
ZMK_MACRO_ONE_PARAM(TREMA, bindings =
ZMK_BEHAVIOR(TREMA, macro_one_param, bindings =
<&macro_tap &kp LS(LBKT) &kp SPACE>,
<&macro_param_1to1>,
<&to MACRO_PLACEHOLDER>;
)

// ` to input
ZMK_MACRO_TWO_PARAM(AGRA, bindings =
ZMK_BEHAVIOR(AGRA, macro_two_param, bindings =
<&kp RA(LBKT)>,
<&macro_param_1to1>,
<&macro_tap &kp MACRO_PLACEHOLDER>,
Expand All @@ -84,15 +85,15 @@ ZMK_MACRO_TWO_PARAM(AGRA, bindings =
)

// ` to input then to default layer
ZMK_MACRO_ONE_PARAM(AGRA_D, bindings =
ZMK_BEHAVIOR(AGRA_D, macro_one_param, bindings =
<&kp RA(LBKT)>,
<&macro_param_1to1>,
<&macro_tap &kp MACRO_PLACEHOLDER>,
<&to QWE>;
)

// ´ to input
ZMK_MACRO_TWO_PARAM(AIGU, bindings =
ZMK_BEHAVIOR(AIGU, macro_two_param, bindings =
<&kp RA(SLASH)>,
<&macro_param_1to1>,
<&macro_tap &kp MACRO_PLACEHOLDER>,
Expand All @@ -101,7 +102,7 @@ ZMK_MACRO_TWO_PARAM(AIGU, bindings =
)

// ¨ to input
ZMK_MACRO_TWO_PARAM(TREM, bindings =
ZMK_BEHAVIOR(TREM, macro_two_param, bindings =
<&kp LS(LBKT)>,
<&macro_param_1to1>,
<&macro_tap &kp MACRO_PLACEHOLDER>,
Expand All @@ -110,7 +111,7 @@ ZMK_MACRO_TWO_PARAM(TREM, bindings =
)

// ^ to input
ZMK_MACRO_TWO_PARAM(CIRC, bindings =
ZMK_BEHAVIOR(CIRC, macro_two_param, bindings =
<&kp LBKT>,
<&macro_param_1to1>,
<&macro_tap &kp MACRO_PLACEHOLDER>,
Expand All @@ -119,15 +120,15 @@ ZMK_MACRO_TWO_PARAM(CIRC, bindings =
)

// ^ to input then to default layer
ZMK_MACRO_ONE_PARAM(CIRC_D, bindings =
ZMK_BEHAVIOR(CIRC_D, macro_one_param, bindings =
<&kp LBKT>,
<&macro_param_1to1>,
<&macro_tap &kp MACRO_PLACEHOLDER>,
<&to QWE>;
)

// Keypress then return to default layer
ZMK_MACRO_TWO_PARAM(KPD, bindings =
ZMK_BEHAVIOR(KPD, macro_two_param, bindings =
<&macro_param_1to1>,
<&kp MACRO_PLACEHOLDER>,
<&macro_param_2to1>,
Expand Down

0 comments on commit 383f275

Please sign in to comment.