diff --git a/keymap.c b/keymap.c index 81285e4839d7af52c350533d4750b3c3b7623780..a4066735652ea9ab54e01d82969a23af25c481ce 100644 --- a/keymap.c +++ b/keymap.c @@ -10,10 +10,14 @@ enum ctrl_layers { }; enum tapdance_keycodes { - TD_F9_LGUI_0 = 0, - TD_F10_LCAG_0, - TD_F11_SGUI_Y, - TD_F12_LGUI_1, + TD_F9 = 0, + TD_F10, + TD_F11, + TD_F12, + TD_HOME_UPLEFT, + TD_END_DNLEFT, + TD_PGUP_UPRIGHT, + TD_PGDN_DNRIGHT, }; enum ctrl_keycodes { @@ -47,27 +51,31 @@ bool autoshift_enabled; //Associate our tap dance key with its functionality qk_tap_dance_action_t tap_dance_actions[] = { - [TD_F9_LGUI_0] = ACTION_TAP_DANCE_DOUBLE(KC_F9, LGUI(KC_0)), - [TD_F10_LCAG_0] = ACTION_TAP_DANCE_DOUBLE(KC_F10, LCAG(KC_0)), - [TD_F11_SGUI_Y] = ACTION_TAP_DANCE_DOUBLE(KC_F11, SGUI(KC_Y)), - [TD_F12_LGUI_1] = ACTION_TAP_DANCE_DOUBLE(KC_F12, LGUI(KC_1)), + [TD_F9] = ACTION_TAP_DANCE_DOUBLE(KC_F9, LCTL(KC_TAB)), + [TD_F10] = ACTION_TAP_DANCE_DOUBLE(KC_F10, LSFT(LCTL(KC_TAB))), + [TD_F11] = ACTION_TAP_DANCE_DOUBLE(KC_F11, LALT(KC_TAB)), + [TD_F12] = ACTION_TAP_DANCE_DOUBLE(KC_F12, LSFT(LALT(KC_TAB))), + [TD_HOME_UPLEFT] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, LGUI(LSFT(KC_1))), + [TD_END_DNLEFT] = ACTION_TAP_DANCE_DOUBLE(KC_END, LGUI(LSFT(KC_2))), + [TD_PGUP_UPRIGHT] = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, LGUI(LSFT(KC_3))), + [TD_PGDN_DNRIGHT] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, LGUI(LSFT(KC_4))), }; keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, TD(TD_F9_LGUI_0), TD(TD_F10_LCAG_0), TD(TD_F11_SGUI_Y), TD(TD_F12_LGUI_1), RGB_TOG, KC_SLCK, TG(_KEN), \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), RGB_TOG, KC_SLCK, TG(_KEN), \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, TD(TD_HOME_UPLEFT), TD(TD_PGUP_UPRIGHT), \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, TD(TD_END_DNLEFT), (TD_PGDN_DNRIGHT), \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(_PROG), MO(_FNC), KC_APP, KC_LEAD, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(_PROG), MO(_FNC), MO(_NAV), KC_LEAD, KC_LEFT, KC_DOWN, KC_RGHT \ ), [_NAV] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, \ - _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, _______, KC_P4, KC_P5, KC_P6, KC_PSLS, _______, _______, KC_EQL, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PMNS, KC_PPLS, _______, LGUI(KC_TAB) , LALT(KC_TAB) , LCTL(KC_TAB), \ + _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, _______, KC_P4, KC_P5, KC_P6, KC_PSLS, _______, _______, KC_EQL, LSFT(LGUI(KC_TAB)), LSFT(LALT(KC_TAB)), LSFT(LCTL(KC_TAB)), \ _V_V_V_, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, KC_PPLS, _______, \ _______, _______, _______, _______, _______, _______, KC_P0, KC_P0, KC_P0, KC_PDOT, KC_PSLS, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ @@ -78,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT, RGB_RMOD, RGB_MOD, _______, KC_MPRV, KC_MNXT, KC_VOLD, \ _______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP, _______, _______, \ MAS_TOG, RGB_TOG, _______, _______, _______, MD_BOOT, TG_NKRO, MAS_YEL, MAS_GRN, MAS_CRM, _______, _______, RGB_VAI, \ - _______, _______, _______, _______, _______, _V_V_V_, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI \ + _______, _______, _______, _______, _______, _V_V_V_, _______, _______, LSFT(LCTL(KC_TAB)), RGB_VAD, LCTL(KC_TAB) \ ), [_KEN] = LAYOUT( LGUI(KC_R), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ diff --git a/massdrop_ctrl_keleher1.bin b/massdrop_ctrl_keleher1.bin index 1c7e27c6d9bee00aa25d72c284e1aa5b39e6fb27..84c3f0f6b63ffe60b5789408b41962cef3691d8d 100644 Binary files a/massdrop_ctrl_keleher1.bin and b/massdrop_ctrl_keleher1.bin differ