From 5629ba18077ee5dcde72e497ddf46d848817dd5c Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 14 Oct 2022 04:28:14 +1100 Subject: Remove legacy keycodes, part 4 (#18683) * `KC_PGDOWN` -> `KC_PGDN` * `KC_PSCREEN` -> `KC_PSCR` * `KC_SCOLON` -> `KC_SCLN` * `KC_BSLASH` -> `KC_BSLS` * `KC_BSPACE` -> `KC_BSPC` --- layouts/community/60_ansi/mechmerlin-ansi/keymap.c | 2 +- layouts/community/60_ansi/readme.md | 2 +- .../mechmerlin-split/keymap.c | 2 +- layouts/community/ergodox/adnw_p_u_q/keymap.c | 4 +-- layouts/community/ergodox/bepo_alt/keymap.c | 2 +- layouts/community/ergodox/berfarah/keymap.c | 2 +- layouts/community/ergodox/choromanski/keymap.c | 2 +- layouts/community/ergodox/dave/keymap.c | 2 +- layouts/community/ergodox/dvorak_emacs/keymap.c | 2 +- .../ergodox/dvorak_intl_squisher/keymap.c | 2 +- layouts/community/ergodox/german-kinergo/keymap.c | 2 +- layouts/community/ergodox/german-lukas/keymap.c | 2 +- layouts/community/ergodox/issmirnov/keymap.c | 6 ++--- layouts/community/ergodox/maz/keymap.c | 10 ++++---- layouts/community/ergodox/mclennon_osx/keymap.c | 2 +- layouts/community/ergodox/meagerfindings/keymap.c | 12 ++++----- layouts/community/ergodox/osx_neo2/keymap.c | 30 +++++++++++----------- .../twentylives_dvorak_with_hebrew/keymap.c | 10 ++++---- layouts/community/ortho_4x12/ajp10304/keymap.c | 4 +-- layouts/community/ortho_5x12/333fred/keymap.c | 2 +- layouts/community/planck_mit/guidoism/keys.json | 10 ++++---- 21 files changed, 56 insertions(+), 56 deletions(-) (limited to 'layouts') diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c index f87c294c4c..131601fa99 100644 --- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c +++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c @@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BL] = LAYOUT_60_ansi( KC_GESC, 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_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_BSLASH, \ + 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_CTCP, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_FNX, KC_RALT, KC_RGUI, KC_RCTL), diff --git a/layouts/community/60_ansi/readme.md b/layouts/community/60_ansi/readme.md index 9e81c96153..e4e59f1a64 100644 --- a/layouts/community/60_ansi/readme.md +++ b/layouts/community/60_ansi/readme.md @@ -50,7 +50,7 @@ This keymap must have a `LAYOUT_60_ansi` layout defined. const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_60_ansi( KC_GESC, 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_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_BSLASH, \ + 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPACE, MO(1), KC_RALT, KC_RGUI, KC_RCTL), diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c index f48b53e303..794ff92c5d 100644 --- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c @@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BL] = LAYOUT_60_ansi_split_bs_rshift( KC_GESC, 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, \ - 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_BSLASH, \ + 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_CTCP, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TG(_AL), \ KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, MO(_FL), KC_RALT, KC_RGUI, KC_RCTL), diff --git a/layouts/community/ergodox/adnw_p_u_q/keymap.c b/layouts/community/ergodox/adnw_p_u_q/keymap.c index cf2ab93589..58be35bbaa 100644 --- a/layouts/community/ergodox/adnw_p_u_q/keymap.c +++ b/layouts/community/ergodox/adnw_p_u_q/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right thumb-cluster DE_QUES, DE_DLR, LCTL(DE_C), - KC_ESCAPE, KC_ENTER, KC_BSPACE + KC_ESCAPE, KC_ENTER, KC_BSPC ), @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDOWN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, diff --git a/layouts/community/ergodox/bepo_alt/keymap.c b/layouts/community/ergodox/bepo_alt/keymap.c index edf9ba23d5..7793eef31d 100644 --- a/layouts/community/ergodox/bepo_alt/keymap.c +++ b/layouts/community/ergodox/bepo_alt/keymap.c @@ -35,7 +35,7 @@ KC_TAB, BP_B, BP_EACU, BP_P, BP_O, BP_EGRV, KC_BSPC, BP_W, BP_A, BP_U, BP_I, BP_E, BP_COMM, KC_LSHIFT, BP_ECIR, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_LCTL, KC_LGUI, KC_LGUI, KC_LGUI, KC_LALT, - KC_PGUP, KC_PGDOWN, + KC_PGUP, KC_PGDN, KC_INS, KC_SPC, KC_LSHIFT, DF(FNAV), diff --git a/layouts/community/ergodox/berfarah/keymap.c b/layouts/community/ergodox/berfarah/keymap.c index 7dc09e7543..b58829370e 100644 --- a/layouts/community/ergodox/berfarah/keymap.c +++ b/layouts/community/ergodox/berfarah/keymap.c @@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,VIM_W, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDOWN,KC_END, + KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDN,KC_END, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,VIM_B, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, diff --git a/layouts/community/ergodox/choromanski/keymap.c b/layouts/community/ergodox/choromanski/keymap.c index 01786aab3c..8cd3f34dab 100644 --- a/layouts/community/ergodox/choromanski/keymap.c +++ b/layouts/community/ergodox/choromanski/keymap.c @@ -243,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT, KC_COMM, TO(0), KC_LALT, KC_LCTL, KC_PGUP, - KC_PGDOWN, KC_BSPC, KC_DEL + KC_PGDN, KC_BSPC, KC_DEL ), }; diff --git a/layouts/community/ergodox/dave/keymap.c b/layouts/community/ergodox/dave/keymap.c index c54e50ba98..054cbd3ed8 100644 --- a/layouts/community/ergodox/dave/keymap.c +++ b/layouts/community/ergodox/dave/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_H, CTL_T(KC_GRV),KC_NUBS,KC_NO, KC_NO, KC_LALT, - KC_PSCREEN, KC_PSCREEN, + KC_PSCR, KC_PSCR, TO(PROG), KC_SPC, MO(NAVI), KC_LGUI, // right hand diff --git a/layouts/community/ergodox/dvorak_emacs/keymap.c b/layouts/community/ergodox/dvorak_emacs/keymap.c index 4494e4b976..5c310593be 100644 --- a/layouts/community/ergodox/dvorak_emacs/keymap.c +++ b/layouts/community/ergodox/dvorak_emacs/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_RBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH, LT(AUX, KC_D), SFT_T(KC_H), KC_T, KC_N, KC_S, KC_MINUS, KC_LGUI, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_RBRC), - MO(AUX), KC_NO, KC_NO, KC_BSLASH, KC_NO, + MO(AUX), KC_NO, KC_NO, KC_BSLS, KC_NO, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, ALT_T(KC_ENT), CTL_T(KC_SPC) diff --git a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c index 2d3ec3806b..5d998a110b 100644 --- a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c +++ b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, MEH_T(KC_NO),KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_RSFT, KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, TT(SYMB), - TG(2), KC_PSCREEN, + TG(2), KC_PSCR, KC_PGUP, KC_PGDN,RALT(KC_RSFT), KC_ENT ), diff --git a/layouts/community/ergodox/german-kinergo/keymap.c b/layouts/community/ergodox/german-kinergo/keymap.c index eae02d8925..46caa986a6 100644 --- a/layouts/community/ergodox/german-kinergo/keymap.c +++ b/layouts/community/ergodox/german-kinergo/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_BSPC,KC_DEL,KC_END, // right hand - KC_PSCREEN, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_PSCR, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, MO(1), DE_Z, KC_U, KC_I, KC_O, KC_P, DE_UDIA, KC_H, KC_J, KC_K, KC_L, DE_ODIA, LT(MDIA,DE_ADIA), MO(2), KC_N, KC_M, KC_COMM, KC_DOT, DE_MINS, KC_RSFT, diff --git a/layouts/community/ergodox/german-lukas/keymap.c b/layouts/community/ergodox/german-lukas/keymap.c index a63a13c12d..ca7335cae2 100644 --- a/layouts/community/ergodox/german-lukas/keymap.c +++ b/layouts/community/ergodox/german-lukas/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_SPC ,KC_DEL,KC_END, // right hand - KC_PSCREEN, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_PSCR, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TG(MDIA), DE_Z, KC_U, KC_I, KC_O, KC_P, LT(SHRT,DE_UDIA), KC_H, KC_J, KC_K, KC_L, DE_ODIA, LT(MDIA,DE_ADIA), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, DE_MINS, KC_RSFT, diff --git a/layouts/community/ergodox/issmirnov/keymap.c b/layouts/community/ergodox/issmirnov/keymap.c index c5a7a29121..1322681d22 100644 --- a/layouts/community/ergodox/issmirnov/keymap.c +++ b/layouts/community/ergodox/issmirnov/keymap.c @@ -13,7 +13,7 @@ OSM(MOD_LSFT), _________________QWERTY_L3_________________, KC_SLASH, KC_LCTL, LSFT(KC_LGUI), LSFT(KC_LALT), KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, - KC_SPACE, KC_BSPACE, KC_DEL, + KC_SPACE, KC_BSPC, KC_DEL, KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_ESCAPE , KC_PLUS , _________________QWERTY_R1_________________ , LGUI(KC_SPACE) , @@ -36,7 +36,7 @@ KC_LCTL , LSFT(KC_LGUI) , LSFT(KC_LALT) , KC_LALT , WKSP_LEFT , XXXXXXX, XXXXXXX, XXXXXXX, - WKSP_RIGHT, KC_BSPACE, KC_DEL, + WKSP_RIGHT, KC_BSPC, KC_DEL, KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , XXXXXXX , KC_PLUS , _________________SYMB_R1___________________ , MO(_NAVI) , @@ -59,7 +59,7 @@ TO(0) , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX , XXXXXXX , - KC_SPACE , KC_BSPACE , KC_DEL , + KC_SPACE , KC_BSPC , KC_DEL , KC_EQL , ___________________XXXXX___________________ , QK_BOOT , KC_PLUS , _________________NUMP_R1___________________ , XXXXXXX , diff --git a/layouts/community/ergodox/maz/keymap.c b/layouts/community/ergodox/maz/keymap.c index 4073d79f54..fc0509e8a2 100644 --- a/layouts/community/ergodox/maz/keymap.c +++ b/layouts/community/ergodox/maz/keymap.c @@ -128,11 +128,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, // right hand - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_PGDOWN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, - KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/layouts/community/ergodox/mclennon_osx/keymap.c b/layouts/community/ergodox/mclennon_osx/keymap.c index ae67d8fb40..fc53581030 100644 --- a/layouts/community/ergodox/mclennon_osx/keymap.c +++ b/layouts/community/ergodox/mclennon_osx/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, - KC_DELETE, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, + KC_DELETE, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_ENT, KC_RBRC, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_QUOT, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c index 9d4eba205d..f04cd47c97 100644 --- a/layouts/community/ergodox/meagerfindings/keymap.c +++ b/layouts/community/ergodox/meagerfindings/keymap.c @@ -97,12 +97,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRAVE, ZENDESK, RUBYMINE, LGUI(KC_S), TODO, KC_ESCAPE, KC_HOME, KC_END, - OSM(MOD_LSFT), LT(NUM,KC_BSPACE), LT(MKDWN,KC_DELETE), + OSM(MOD_LSFT), LT(NUM,KC_BSPC), LT(MKDWN,KC_DELETE), //right hand KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MINUS, - MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, - KC_H, KC_J, ALT_T(KC_K), LGUI_T(KC_L), LT(MEDIA,KC_SCOLON), ALL_T(KC_QUOTE), + MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, ALT_T(KC_K), LGUI_T(KC_L), LT(MEDIA,KC_SCLN), ALL_T(KC_QUOTE), TD(CT_RBP), KC_N, KC_M, KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH), SCMD_T(_______), LSFT(KC_MINUS), _______, DBLE_ZER0, DBLE_ZER0, TO(OLD_BASE), L_ID_0, KC_ESCAPE, @@ -144,12 +144,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRAVE, ZENDESK, RUBYMINE, LGUI(KC_S), TODO, KC_ESCAPE, KC_HOME, KC_END, - OSM(MOD_LSFT), LT(NUM,KC_BSPACE), LT(MKDWN,KC_DELETE), + OSM(MOD_LSFT), LT(NUM,KC_BSPC), LT(MKDWN,KC_DELETE), //right hand TD(TD_SNAGIT), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, - MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, - KC_H, KC_J, KC_K, LGUI_T(KC_L), LT(MEDIA,KC_SCOLON), ALL_T(KC_QUOTE), + MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, LGUI_T(KC_L), LT(MEDIA,KC_SCLN), ALL_T(KC_QUOTE), TD(CT_RBP), KC_N, KC_M, KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH), SCMD_T(_______), LSFT(KC_MINUS), _______, DBLE_ZER0, DBLE_ZER0, TO(BASE), L_ID_0, KC_ESCAPE, diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c index f13c4eb960..48fa117baf 100644 --- a/layouts/community/ergodox/osx_neo2/keymap.c +++ b/layouts/community/ergodox/osx_neo2/keymap.c @@ -59,7 +59,7 @@ enum custom_keycodes { #define US_OSX_SBQUO LALT(LSFT(KC_0)) // ‚ #define US_OSX_LEFT_SINGLE_QUOTE LALT(KC_RBRC) // ‘ #define US_OSX_RIGHT_SINGLE_QUOTE LALT(LSFT(KC_RBRC)) // ’ -#define US_OSX_ELLIPSIS LALT(KC_SCOLON) // … +#define US_OSX_ELLIPSIS LALT(KC_SCLN) // … #define US_OSX_UNDERSCORE LSFT(KC_MINUS) // _ #define US_OSX_LBRACKET KC_LBRC // [ #define US_OSX_RBRACKET KC_RBRC // ] @@ -70,7 +70,7 @@ enum custom_keycodes { #define US_OSX_EQUAL KC_EQUAL // = #define US_OSX_AMPERSAND LSFT(KC_7) // & #define US_OSX_SMALL_LONG_S KC_NO // ſ -#define US_OSX_BSLASH KC_BSLASH +#define US_OSX_BSLASH KC_BACKSLASH #define US_OSX_SLASH KC_SLASH // / #define US_OSX_CLBRACKET LSFT(KC_LBRC) // { #define US_OSX_CRBRACKET LSFT(KC_RBRC) // } @@ -79,17 +79,17 @@ enum custom_keycodes { #define US_OSX_LPARENTHESES LSFT(KC_9) // ( #define US_OSX_RPARENTHESES LSFT(KC_0) // ) #define US_OSX_HYPHEN_MINUS KC_MINUS // - -#define US_OSX_COLON LSFT(KC_SCOLON) // : +#define US_OSX_COLON LSFT(KC_SCLN) // : #define US_OSX_AT LSFT(KC_2) // @ #define US_OSX_HASH LSFT(KC_3) // # -#define US_OSX_PIPE LSFT(KC_BSLASH) // | +#define US_OSX_PIPE LSFT(KC_BACKSLASH) // | #define US_OSX_TILDE LSFT(KC_GRAVE) // ~ #define US_OSX_BACKTICK KC_GRAVE // ` #define US_OSX_PLUS LSFT(KC_EQUAL) // + #define US_OSX_PERCENT LSFT(KC_5) // % #define US_OSX_DOUBLE_QUOTE LSFT(KC_QUOTE) // " #define US_OSX_SINGLE_QUOTE KC_QUOTE // ' -#define US_OSX_SEMICOLON KC_SCOLON // ; +#define US_OSX_SEMICOLON KC_SCLN // ; // NEO_4 special characters #define US_OSX_FEMININE_ORDINAL LALT(KC_9) // ª @@ -135,8 +135,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand side - thumb cluster /* --- */ MO(FKEYS), KC_HOME, - /* KC_BSPACE */ /* KC_DELETE */ KC_END, - KC_BSPACE, KC_DELETE, NEO2_LMOD4, + /* KC_BSPC */ /* KC_DELETE */ KC_END, + KC_BSPC, KC_DELETE, NEO2_LMOD4, // right hand side - main TO(US_1), NEO2_6, NEO2_7, NEO2_8, NEO2_9, NEO2_0, NEO2_MINUS, @@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand side - thumb cluster KC_PGUP, MO(FKEYS), /* --- */ - KC_PGDOWN, /* --- */ /* --- */ + KC_PGDN, /* --- */ /* --- */ NEO2_RMOD4, KC_ENTER, KC_SPACE ), @@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [NEO_4] = LAYOUT_ergodox( // left hand side - main KC_NO /* NOOP */, US_OSX_FEMININE_ORDINAL, US_OSX_MASCULINE_ORDINAL, KC_NO /* NOOP */, US_OSX_MIDDLE_DOT, US_OSX_BRITISH_POUND, _______, - _______, KC_PGUP, KC_BSPACE, KC_UP, KC_DELETE, KC_PGDOWN, _______, + _______, KC_PGUP, KC_BSPC, KC_UP, KC_DELETE, KC_PGDN, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, /* --- */ _______, KC_ESCAPE, KC_TAB, KC_INSERT, KC_ENTER, KC_NO /* NOOP */, _______, _______, _______, _______, _______, _______, /* --- */ /* --- */ @@ -363,7 +363,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [US_1] = LAYOUT_ergodox( // left hand side - main KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESCAPE, - KC_BSLASH, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO /* NOOP */, + KC_BSLS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO /* NOOP */, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, /* --- */ KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO /* NOOP */, KC_LGUI, KC_GRAVE, KC_NO, KC_NO, MO(FKEYS), /* --- */ /* --- */ @@ -371,19 +371,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand side - thumb cluster /* --- */ KC_LCTRL, KC_LALT, /* --- */ /* --- */ KC_HOME, - KC_BSPACE, KC_DELETE, KC_END, + KC_BSPC, KC_DELETE, KC_END, // right hand side - main TO(NEO_1), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, - /* --- */ KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, + /* --- */ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_NO /* NOOP */, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT, /* --- */ /* --- */ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_RGUI, // right hand side - thumb cluster KC_RALT, KC_RCTRL, /* --- */ KC_PGUP, /* --- */ /* --- */ - KC_PGDOWN, KC_ENTER, KC_SPACE + KC_PGDN, KC_ENTER, KC_SPACE ), /* FKEYS: Function keys @@ -486,7 +486,7 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) { if (command) { tap_code16(S(G(KC_4))); } else { - tap_code16(S(A(KC_BSLASH))); + tap_code16(S(A(KC_BACKSLASH))); } break; case NEO2_5: @@ -494,7 +494,7 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) { tap_code16(S(G(KC_5))); } else { // left angled quote - tap_code16(A(KC_BSLASH)); + tap_code16(A(KC_BACKSLASH)); } break; case NEO2_6: diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c index 552b97ff11..920850ebee 100644 --- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c +++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c @@ -31,20 +31,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TG(1), KC_1, KC_2, KC_3, KC_4, KC_5, LALT(KC_LSHIFT), KC_TAB, KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, TG(3), KC_ESCAPE, KC_A, KC_O, KC_E, KC_U, KC_I, - KC_LSHIFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, TG(2), + KC_LSHIFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TG(2), MO(3), LCTL(KC_C), LCTL(KC_X), LCTL(KC_V), MO(2), KC_DELETE, KC_TRNS, KC_LGUI, - KC_BSPACE,CTL_T(KC_NO),KC_LALT, + KC_BSPC,CTL_T(KC_NO),KC_LALT, KC_TILD, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL, KC_TRNS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINUS, KC_TRNS, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSHIFT, - KC_LBRC, KC_RBRC, KC_BSLASH, KC_UNDO, LCTL(KC_A), + KC_LBRC, KC_RBRC, KC_BSLS, KC_UNDO, LCTL(KC_A), KC_END, KC_HOME, KC_PGUP, - KC_PGDOWN, KC_ENTER, KC_SPACE + KC_PGDN, KC_ENTER, KC_SPACE ), /* Keymap 1: Hebrew layer @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_Y, KC_U, KC_E, KC_O, KC_P, KC_TRNS, - KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_TRNS, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_TRNS, KC_TRNS, KC_N, KC_M, KC_COMMA, KC_DOT, KC_I, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c index 500dea992c..411bdf8043 100644 --- a/layouts/community/ortho_4x12/ajp10304/keymap.c +++ b/layouts/community/ortho_4x12/ajp10304/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FUNC] = LAYOUT_ortho_4x12( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, UK_TILD, KC_INSERT , - KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL, KC_BSLASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) , + KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL, KC_BSLS, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) , _______, _______, _______, _______, _______, _______, _______, MO(_MOUSE), _______, _______, _______, _______ ), @@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_ortho_4x12( - KC_GRV, XXXXXXX, M_WORD_SEL, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_PGDOWN, XXXXXXX, KC_PSCREEN , + KC_GRV, XXXXXXX, M_WORD_SEL, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_PGDN, XXXXXXX, KC_PSCR , KC_GRV, XXXXXXX, XXXXXXX, LSFT(KC_9), LSFT(KC_0), XXXXXXX, XXXXXXX, KC_HOME, KC_UP, KC_END, XXXXXXX, LCTL(LSFT(KC_EQL)) , _______, XXXXXXX, XXXXXXX, LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT), LCTL(KC_MINS) , MO(_MOUSE), _______, _______, _______, _______, KC_LALT, KC_ENT, _______, XXXXXXX, _______, _______, _______ diff --git a/layouts/community/ortho_5x12/333fred/keymap.c b/layouts/community/ortho_5x12/333fred/keymap.c index e270b40893..4eaf35c47e 100644 --- a/layouts/community/ortho_5x12/333fred/keymap.c +++ b/layouts/community/ortho_5x12/333fred/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [BASE] = LAYOUT_ortho_5x12( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \ KC_LCTL, KC_LALT, KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC, KC_ENT, KC_LOCK, KC_EQL, KC_RALT, KC_DEL \ diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json index f07b8cd196..ce01e15929 100644 --- a/layouts/community/planck_mit/guidoism/keys.json +++ b/layouts/community/planck_mit/guidoism/keys.json @@ -75,7 +75,7 @@ "KC_ENT": "\u23ce", "KC_ESCAPE": "\u238b", "KC_ESC": "\u238b", - "KC_BSPACE": "\u232b", + "KC_BACKSPACE": "\u232b", "KC_BSPC": "\u232b", "KC_TAB": "\u21e5", "KC_SPACE": "", @@ -89,8 +89,8 @@ "KC_RIGHT_BRACKET": "}", "KC_RBRC": "]", "KC_BSLS": "\\", - "KC_BSLASH": "\\", - "KC_SCOLON": ":", + "KC_BACKSLASH": "\\", + "KC_SEMICOLON": ":", "KC_SCLN": ";", "KC_QUOTE": "\"", "KC_QUOT": "'", @@ -126,7 +126,7 @@ "KC_LSCR": "Locking Scroll Lock", "KC_INT4": "JIS Henkan", "KC_INT5": "JIS Muhenkan", - "KC_PSCREEN": "Print Screen", + "KC_PRINT_SCREEN": "Print Screen", "KC_PSCR": "Print Screen", "KC_SCROLL_LOCK": "Scroll Lock", "KC_SLCK": "Scroll Lock", @@ -139,7 +139,7 @@ "KC_DELETE": "\u2326", "KC_DEL": "\u2326", "KC_END": "End", - "KC_PGDOWN": "PgDn", + "KC_PAGE_DOWN": "PgDn", "KC_PGDN": "PgDn", "KC_RIGHT": "→", "KC_RGHT": "→", -- cgit v1.2.3