diff --git a/miryoku/miryoku_babel/miryoku_alternatives.h b/miryoku/miryoku_babel/miryoku_alternatives.h index 5e103f5..9c6dd44 100644 --- a/miryoku/miryoku_babel/miryoku_alternatives.h +++ b/miryoku/miryoku_babel/miryoku_alternatives.h @@ -283,31 +283,31 @@ U_NP, U_NP, U_NA, U_NA, U_NA U_WH_U, U_WH_L, U_MS_U, U_WH_R, U_NU, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ U_WH_D, U_MS_L, U_MS_D, U_MS_R, U_NU, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to MOUSE, &to SYM, &kp RALT, U_NA, \ -U_NP, U_NP, U_BTN2, U_BTN3, U_BTN1, U_NA, U_NA, U_NA, U_NP, U_NP +U_NP, U_NP, U_BTN3, U_BTN1, U_BTN2, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \ U_WH_L, U_WH_D, U_WH_U, U_WH_R, U_NU, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ U_MS_L, U_MS_D, U_MS_U, U_MS_R, U_NU, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to MOUSE, &to SYM, &kp RALT, U_NA, \ -U_NP, U_NP, U_BTN2, U_BTN3, U_BTN1, U_NA, U_NA, U_NA, U_NP, U_NP +U_NP, U_NP, U_BTN3, U_BTN1, U_BTN2, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT \ &bootloader, &to TAP, &to EXTRA, &to BASE, U_NA, U_NU, U_WH_L, U_MS_U, U_WH_R, U_WH_U, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_NU, U_MS_L, U_MS_D, U_MS_R, U_WH_D, \ U_NA, &kp RALT, &to SYM, &to MOUSE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ -U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN1, U_BTN3, U_BTN2, U_NP, U_NP +U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN2, U_BTN1, U_BTN3, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_VI \ &bootloader, &to TAP, &to EXTRA, &to BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_MS_L, U_MS_D, U_MS_U, U_MS_R, U_NU, \ U_NA, &kp RALT, &to SYM, &to MOUSE, U_NA, U_WH_L, U_WH_D, U_WH_U, U_WH_R, U_NU, \ -U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN1, U_BTN3, U_BTN2, U_NP, U_NP +U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN2, U_BTN1, U_BTN3, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE \ &bootloader, &to TAP, &to EXTRA, &to BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_NU, U_MS_L, U_MS_D, U_MS_U, U_MS_R, \ U_NA, &kp RALT, &to SYM, &to MOUSE, U_NA, U_NU, U_WH_L, U_WH_D, U_WH_U, U_WH_R, \ -U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN1, U_BTN3, U_BTN2, U_NP, U_NP +U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN2, U_BTN1, U_BTN3, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \ @@ -384,4 +384,4 @@ U_NP, U_NP, &kp K_APP, &kp SPC, &kp U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NU, U_NU, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ -U_NP, U_NP, U_BTN2, U_BTN3, U_BTN1, U_BTN1, U_BTN3, U_BTN2, U_NP, U_NP +U_NP, U_NP, U_BTN3, U_BTN1, U_BTN2, U_BTN2, U_BTN1, U_BTN3, U_NP, U_NP diff --git a/miryoku/miryoku_kludge_thumbcombos.dtsi b/miryoku/miryoku_kludge_thumbcombos.dtsi index c453be7..ebe5e25 100644 --- a/miryoku/miryoku_kludge_thumbcombos.dtsi +++ b/miryoku/miryoku_kludge_thumbcombos.dtsi @@ -17,15 +17,15 @@ thumbcombos_ ## layer ## _ ## position { \ #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, < FUN DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, LEFT, < FUN DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN3) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, LEFT, &kp DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, LEFT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, LEFT, U_BTN3) 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(EXTRA, RIGHT, < MEDIA ESC) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN3) 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) @@ -34,7 +34,7 @@ thumbcombos_ ## layer ## _ ## position { \ #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, < MEDIA ESC) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, LEFT, < MEDIA ESC) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN3) 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) @@ -42,9 +42,9 @@ thumbcombos_ ## layer ## _ ## position { \ #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, < FUN DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, RIGHT, < FUN DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN3) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, RIGHT, &kp DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, RIGHT, U_BTN2) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, RIGHT, U_BTN3) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, RIGHT, &kp C_MUTE) #endif #endif