From e5b3bd339146ff2e2acbf6dd2f924fcad0bcfc31 Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Mon, 7 Mar 2022 17:15:04 +1100 Subject: [PATCH] Make left / right thumb combos optional --- miryoku/miryoku_kludge_thumbcombos.dtsi | 26 ++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/miryoku/miryoku_kludge_thumbcombos.dtsi b/miryoku/miryoku_kludge_thumbcombos.dtsi index 99464db..8fd0287 100644 --- a/miryoku/miryoku_kludge_thumbcombos.dtsi +++ b/miryoku/miryoku_kludge_thumbcombos.dtsi @@ -13,28 +13,36 @@ thumbcombos_ ## layer ## _ ## position { \ / { combos { compatible = "zmk,combos"; - #if defined (MIRYOKU_LAYERS_FLIP) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, < MEDIA ESC) +#if defined (MIRYOKU_LAYERS_FLIP) + #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, < FUN DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, LEFT, &kp DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, LEFT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, LEFT, &kp C_MUTE) + #endif + #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, < MEDIA ESC) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, RIGHT, &kp DOT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, RIGHT, &kp RPAR) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(FUN, RIGHT, &kp K_APP) - #else + #endif +#else + #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, < MEDIA ESC) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, < FUN DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN2) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, RIGHT, &kp DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, RIGHT, U_BTN2) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, RIGHT, &kp C_MUTE) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, LEFT, &kp DOT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, LEFT, &kp LPAR) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(FUN, LEFT, &kp K_APP) #endif + #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, < FUN DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, RIGHT, &kp DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, RIGHT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, RIGHT, &kp C_MUTE) + #endif +#endif }; };