diff --git a/keyboards/ergodox/keymaps/sjb/keymap.c b/keyboards/ergodox/keymaps/sjb/keymap.c index e90cee016b56..48c69ae1b98d 100644 --- a/keyboards/ergodox/keymaps/sjb/keymap.c +++ b/keyboards/ergodox/keymaps/sjb/keymap.c @@ -67,13 +67,12 @@ #define TD_GRV TD(3) #define TD_RGHT TD(4) #define TD_LEFT TD(5) -#define TD_SCLN TD(6) -#define TD_TSKSWCH TD(7) -#define TD_LGUI TD(8) -#define TD_ESC TD(9) -#define TD_TERM TD(10) -#define TD_PGUP TD(11) -#define TD_PGDN TD(12) +#define TD_TSKSWCH TD(6) +#define TD_LGUI TD(7) +#define TD_ESC TD(8) +#define TD_TERM TD(9) +#define TD_PGUP TD(10) +#define TD_PGDN TD(11) #else #define TD_LBRC KC_LBRC @@ -83,7 +82,6 @@ #define TD_RGHT KC_RGHT #define TD_LEFT KC_LEFT #define TD_TAB KC_TAB -#define TD_SCLN KC_SCLN #define TD_TSKSWCH M(TSKSWCH) #define TD_LGUI KC_LGUI #define TD_ESC KC_ESC @@ -149,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand KC_MYCM, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TD_GRV, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, - KC_H, KC_J, KC_K, KC_L, TD_SCLN, KC_QUOT, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, TD_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM_RSFT, OSL_MOTION, KC_DOWN, TD_RGHT, OSL_FNx, TD_TSKSWCH, TD_PGUP, TD_PGDN, @@ -317,7 +315,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand KC_TRNS, KC_0, KC_2, KC_4, KC_6, KC_8, KC_MINS, KC_TRNS, KC_M, KC_G, KC_L, KC_P, KC_SLSH, KC_EQL, - KC_D, KC_R, KC_T, KC_N, KC_S, TD_SCLN, + KC_D, KC_R, KC_T, KC_N, KC_S, KC_SCLN, KC_TRNS, KC_B, KC_K, KC_V, KC_Y, KC_J, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -359,7 +357,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, // right hand KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_TRNS, KC_J, KC_U, KC_R, KC_L, TD_SCLN, KC_EQL, + KC_TRNS, KC_J, KC_U, KC_R, KC_L, KC_SCLN, KC_EQL, KC_Y, KC_N, KC_I, KC_O, KC_H, KC_QUOT, KC_TRNS, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -442,13 +440,12 @@ qk_tap_dance_action_t tap_dance_actions[] = { [3] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_MINS), [4] = ACTION_TAP_DANCE_DOUBLE(KC_RGHT, LSS(KC_RGHT)), [5] = ACTION_TAP_DANCE_DOUBLE(KC_LEFT, LSS(KC_LEFT)), - [6] = ACTION_TAP_DANCE_SHIFT_WITH_DOUBLE(KC_SCLN), - [7] = ACTION_TAP_DANCE_TSKSWCH(), // switch application / switch windows (gnome) - [8] = ACTION_TAP_DANCE_MOD_TAP_LOCK(MOD_LGUI | MOD_LSFT, KC_LGUI), - [9] = ACTION_TAP_DANCE_MOD_TAP_LOCK(MOD_LGUI | MOD_LCTL, KC_ESC), - [10] = ACTION_TAP_DANCE_DOUBLE(F_TERM, F_LOCK), // TAB / switch windows (gnome) - [11] = ACTION_TAP_DANCE_LAYER_TAP(ADORE, KC_PGUP), - [12] = ACTION_TAP_DANCE_LAYER_TAP(NORMAN, KC_PGDN), + [6] = ACTION_TAP_DANCE_TSKSWCH(), // switch application / switch windows (gnome) + [7] = ACTION_TAP_DANCE_MOD_TAP_LOCK(MOD_LGUI | MOD_LSFT, KC_LGUI), + [8] = ACTION_TAP_DANCE_MOD_TAP_LOCK(MOD_LGUI | MOD_LCTL, KC_ESC), + [9] = ACTION_TAP_DANCE_DOUBLE(F_TERM, F_LOCK), // TAB / switch windows (gnome) + [10] = ACTION_TAP_DANCE_LAYER_TAP(ADORE, KC_PGUP), + [11] = ACTION_TAP_DANCE_LAYER_TAP(NORMAN, KC_PGDN), }; #endif diff --git a/keyboards/infinity60/keymaps/sjb/keymap.c b/keyboards/infinity60/keymaps/sjb/keymap.c index 7d0e3dd44b28..55d4ddc85c54 100644 --- a/keyboards/infinity60/keymaps/sjb/keymap.c +++ b/keyboards/infinity60/keymaps/sjb/keymap.c @@ -65,10 +65,9 @@ #define TD_QUOT TD(3) #define TD_RGHT TD(4) #define TD_LEFT TD(5) -#define TD_SCLN TD(6) -#define TD_TSKSWCH TD(7) -#define TD_LGUI TD(8) -#define TD_ESC TD(9) +#define TD_TSKSWCH TD(6) +#define TD_LGUI TD(7) +#define TD_ESC TD(8) #else #define TD_LBRC KC_LBRC @@ -78,7 +77,6 @@ #define TD_RGHT KC_RGHT #define TD_LEFT KC_LEFT #define TD_TAB KC_TAB -#define TD_SCLN KC_SCLN #define TD_TSKSWCH M(TSKSWCH) #define TD_LGUI KC_LGUI #define TD_ESC KC_ESC @@ -107,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = KEYMAP( TD_ESC, 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_BSPC, \ MT_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD_LBRC, TD_RBRC, TD_BSLS, \ - OSM_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD_SCLN, TD_QUOT, KC_ENT, \ + OSM_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, TD_QUOT, KC_ENT, \ OSM_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM_LSFT, M(BESC), \ OSL_NAV, OSM_MEH, TD_LGUI, MT_SPC, OSM_LALT, OSM_HYPR, OSL_FNx, TD_TSKSWCH \ ), @@ -206,10 +204,9 @@ qk_tap_dance_action_t tap_dance_actions[] = { [3] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_GRV), [4] = ACTION_TAP_DANCE_DOUBLE(KC_RGHT, LSS(KC_RGHT)), [5] = ACTION_TAP_DANCE_DOUBLE(KC_LEFT, LSS(KC_LEFT)), - [6] = ACTION_TAP_DANCE_SHIFT_WITH_DOUBLE(KC_SCLN), - [7] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_tskswch_on_finished, td_tskswch_on_reset), // switch application / switch windows (gnome) - [8] = ACTION_TAP_DANCE_MOD_TAP_LOCK(MOD_LGUI | MOD_LSFT, KC_LGUI), - [9] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, F_LOCK), + [6] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_tskswch_on_finished, td_tskswch_on_reset), // switch application / switch windows (gnome) + [7] = ACTION_TAP_DANCE_MOD_TAP_LOCK(MOD_LGUI | MOD_LSFT, KC_LGUI), + [8] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, F_LOCK), }; #endif diff --git a/keyboards/kc60/keymaps/sjb/keymap.c b/keyboards/kc60/keymaps/sjb/keymap.c index 184f6c7fd51e..76271f103afa 100644 --- a/keyboards/kc60/keymaps/sjb/keymap.c +++ b/keyboards/kc60/keymaps/sjb/keymap.c @@ -65,10 +65,9 @@ #define TD_QUOT TD(3) #define TD_RGHT TD(4) #define TD_LEFT TD(5) -#define TD_SCLN TD(6) -#define TD_TSKSWCH TD(7) -#define TD_LGUI TD(8) -#define TD_ESC TD(9) +#define TD_TSKSWCH TD(6) +#define TD_LGUI TD(7) +#define TD_ESC TD(8) #else #define TD_LBRC KC_LBRC @@ -107,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = KEYMAP( TD_ESC, 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, \ MT_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD_LBRC, TD_RBRC, TD_BSLS, \ - OSM_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD_SCLN, TD_QUOT, KC_NO, KC_ENT, \ + OSM_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, TD_QUOT, KC_NO, KC_ENT, \ OSM_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, OSM_LSFT, \ OSL_NAV, OSM_MEH, TD(10), MT_SPC, KC_NO, TD_LGUI, OSM_HYPR, OSL_FNx, TD_TSKSWCH \ ), @@ -200,10 +199,9 @@ qk_tap_dance_action_t tap_dance_actions[] = { [3] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_GRV), [4] = ACTION_TAP_DANCE_DOUBLE(KC_RGHT, LSS(KC_RGHT)), [5] = ACTION_TAP_DANCE_DOUBLE(KC_LEFT, LSS(KC_LEFT)), - [6] = ACTION_TAP_DANCE_SHIFT_WITH_DOUBLE(KC_SCLN), - [7] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_tskswch_on_finished, td_tskswch_on_reset), // switch application / switch windows (gnome) - [8] = ACTION_TAP_DANCE_MOD_TAP_LOCK((MOD_LGUI | MOD_LSFT), KC_LGUI), - [9] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, F_LOCK), + [6] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_tskswch_on_finished, td_tskswch_on_reset), // switch application / switch windows (gnome) + [7] = ACTION_TAP_DANCE_MOD_TAP_LOCK((MOD_LGUI | MOD_LSFT), KC_LGUI), + [8] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, F_LOCK), }; #endif