diff --git a/img/overview.png b/img/overview.png index 4f9e33a4..891b1246 100644 Binary files a/img/overview.png and b/img/overview.png differ diff --git a/src/zmk/definitions/config.dtsi b/src/zmk/definitions/config.dtsi index f4a1f52d..5ab6e801 100644 --- a/src/zmk/definitions/config.dtsi +++ b/src/zmk/definitions/config.dtsi @@ -22,17 +22,19 @@ #define CODING 14 #define NMODS 15 #define ALPHA2 16 -#define SHIFT_A2 17 -#define CASE_A2 18 -#define SYMBOLS 19 -#define SEN_CASE 20 -#define SEN_E1 21 -#define SEN_E2 22 -#define NAV 23 -#define MEDIA 24 -#define NAV_F 25 -#define LOCK_KB 26 -#define SYSTEM 27 +#define CCEDIL 17 +#define SHIFT_A2 18 +#define CASE_A2 19 +#define CASE_CCEDIL 20 +#define SYMBOLS 21 +#define SEN_CASE 22 +#define SEN_E1 23 +#define SEN_E2 24 +#define NAV 25 +#define MEDIA 26 +#define NAV_F 27 +#define LOCK_KB 28 +#define SYSTEM 29 #define TAPPING_TERM 175 #define TD_TAPPING_TERM 225 diff --git a/src/zmk/definitions/keymap.dtsi b/src/zmk/definitions/keymap.dtsi index 1495de1c..a9ee0369 100644 --- a/src/zmk/definitions/keymap.dtsi +++ b/src/zmk/definitions/keymap.dtsi @@ -179,6 +179,15 @@ &trans &ht_magic NAV 0 &sl SYMBOLS &trans &mc_sqo &trans >; }; + ccedil_layer { + label = "ALPHA2"; + bindings = < + &trans &trans &trans &trans &trans &trans &ac_ocir &trans &trans &trans + &trans &trans &trans &trans &trans &trans &ac_atil &trans &trans &ac_uacu + &trans &trans &trans &trans &trans &trans &ac_otil &ac_aacu &ac_oacu &trans + &trans &trans &trans &trans &trans &trans + >; + }; shifted_alpha2_layer { label = "CASE"; bindings = < @@ -197,6 +206,15 @@ &trans &ht_magic NAV 0 &sl SYMBOLS &trans &mc_sqo_c &trans >; }; + case_ccedil_layer { + label = "CASE"; + bindings = < + &trans &trans &trans &trans &trans &trans &ac_ocir_c &trans &trans &trans + &trans &trans &trans &trans &trans &trans &ac_atil_c &trans &trans &ac_uacu_c + &trans &trans &trans &trans &trans &trans &ac_otil_c &ac_aacu_c &ac_oacu_c &trans + &trans &trans &trans &trans &trans &trans + >; + }; symbols_layer { label = "SYMBOLS"; bindings = < diff --git a/src/zmk/features/accents.dtsi b/src/zmk/features/accents.dtsi index 6d0eaa17..0c90f21a 100644 --- a/src/zmk/features/accents.dtsi +++ b/src/zmk/features/accents.dtsi @@ -76,9 +76,9 @@ ACCENTED_KEY(ac_ocir, O, I , OCIR_TERM, C_OCIR_TERM, S_OCIR_TERM) ACCENTED_KEY(ac_uacu, U, E , UACU_TERM, C_UACU_TERM, S_UACU_TERM) - MACRO_KEY(mc_ced, &kp C_CEDIL) - MACRO_KEY(mc_ced_c, &kp LS(C_CEDIL)) - MACRO_KEY(mc_ced_s, &kp RS(C_CEDIL)) + MACRO_KEY(mc_ced, &kp C_CEDIL &sl CCEDIL) + MACRO_KEY(mc_ced_c, &kp LS(C_CEDIL) &sl CASE_CCEDIL) + MACRO_KEY(mc_ced_s, &kp RS(C_CEDIL) &sl CCEDIL) MACRO_KEY(mc_qu, ¯o_tap &kp Q ¯o_wait_time 10 ¯o_tap &kp U &kp QU_TERM) MACRO_KEY(mc_qu_c, ¯o_press &kp LSHFT ¯o_tap &kp Q ¯o_wait_time 10 ¯o_tap &kp U ¯o_release &kp LSHFT &kp QU_TERM) MACRO_KEY(mc_qu_s, ¯o_press &kp LSHFT ¯o_tap &kp Q ¯o_wait_time 10 ¯o_release &kp LSHFT ¯o_tap &kp U &kp QU_TERM)