diff options
| author | Konstantin Đorđević <vomindoraan@gmail.com> | 2019-01-03 17:13:55 +0100 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-01-03 08:13:55 -0800 |
| commit | e76bf17d36c3e23d4c780ab7dd0a10b5883889a2 (patch) | |
| tree | 86220261daa80f6d1fd8b3bf4605132052eccfa8 /layouts/community/ergodox | |
| parent | 6cb2d7ba6dc19fe579fac856fbce36be0f8384f6 (diff) | |
| download | qmk_firmware-e76bf17d36c3e23d4c780ab7dd0a10b5883889a2.tar.gz qmk_firmware-e76bf17d36c3e23d4c780ab7dd0a10b5883889a2.zip | |
Remove redundant, language-specific aliases for KC_ALGR (#4720)
* Use standard KC_ALGR, remove language-specific redefinitions
* Use ALGR instead of ALTGR in BÉPO and Canadian multilingual keymaps
* Remove BE_LALT, BE_LGUI aliases
Diffstat (limited to 'layouts/community/ergodox')
| -rw-r--r-- | layouts/community/ergodox/bepo/keymap.c | 2 | ||||
| -rw-r--r-- | layouts/community/ergodox/bepo_csa/keymap.c | 12 | ||||
| -rw-r--r-- | layouts/community/ergodox/dvorak_svorak_a5/keymap.c | 2 | ||||
| -rw-r--r-- | layouts/community/ergodox/swedish-lindhe/keymap.c | 2 | ||||
| -rw-r--r-- | layouts/community/ergodox/swedish/keymap.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/layouts/community/ergodox/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c index c33c3c255..6ea8cba68 100644 --- a/layouts/community/ergodox/bepo/keymap.c +++ b/layouts/community/ergodox/bepo/keymap.c | |||
| @@ -50,7 +50,7 @@ KC_ESC, KC_INS, KC_LGUI, KC_LCTL, KC_LALT, | |||
| 50 | KC_CAPSLOCK, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, | 50 | KC_CAPSLOCK, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, |
| 51 | BP_C, BP_T, BP_S, BP_R, BP_N, BP_M, | 51 | BP_C, BP_T, BP_S, BP_R, BP_N, BP_M, |
| 52 | KC_NUMLOCK, BP_APOS, BP_Q, BP_G, BP_H, BP_F, BP_CCED, | 52 | KC_NUMLOCK, BP_APOS, BP_Q, BP_G, BP_H, BP_F, BP_CCED, |
| 53 | BP_ALGR, KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE, | 53 | KC_ALGR, KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE, |
| 54 | DF(AZ_B), DF(BEPO), | 54 | DF(AZ_B), DF(BEPO), |
| 55 | MO(NUMK), | 55 | MO(NUMK), |
| 56 | MO(FNAV), KC_RSHIFT, KC_ENTER), | 56 | MO(FNAV), KC_RSHIFT, KC_ENTER), |
diff --git a/layouts/community/ergodox/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c index 9526ea3f7..125301d44 100644 --- a/layouts/community/ergodox/bepo_csa/keymap.c +++ b/layouts/community/ergodox/bepo_csa/keymap.c | |||
| @@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 105 | KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, | 105 | KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z, |
| 106 | BP_C, BP_T, BP_S, BP_R, BP_N, BP_M, | 106 | BP_C, BP_T, BP_S, BP_R, BP_N, BP_M, |
| 107 | KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, KC_RSFT, | 107 | KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, KC_RSFT, |
| 108 | BP_ALGR, BP_PERC, KC_APP, BP_CCED, KC_RCTL, | 108 | KC_ALGR, BP_PERC, KC_APP, BP_CCED, KC_RCTL, |
| 109 | 109 | ||
| 110 | KC_LEFT, KC_RGHT, | 110 | KC_LEFT, KC_RGHT, |
| 111 | KC_UP, | 111 | KC_UP, |
| @@ -449,14 +449,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 449 | register_code(KC_1 + (id - M_1)); | 449 | register_code(KC_1 + (id - M_1)); |
| 450 | break; | 450 | break; |
| 451 | case M_DEGR: | 451 | case M_DEGR: |
| 452 | return MACRO(DOWN(CSA_ALTGR), D(SCLN), END); | 452 | return MACRO(DOWN(KC_ALGR), D(SCLN), END); |
| 453 | case M_SCLN: | 453 | case M_SCLN: |
| 454 | return MACRO(D(SCLN), END); | 454 | return MACRO(D(SCLN), END); |
| 455 | case M_GRV: | 455 | case M_GRV: |
| 456 | return MACRO(I(75), DOWN(CSA_ALTGR), TYPE(CSA_DCRC), UP(CSA_ALTGR), T(SPACE), END); | 456 | return MACRO(I(75), DOWN(KC_ALGR), TYPE(CSA_DCRC), UP(KC_ALGR), T(SPACE), END); |
| 457 | case M_NBSP: | 457 | case M_NBSP: |
| 458 | // use weak mod such that pressing another key will not be affected | 458 | // use weak mod such that pressing another key will not be affected |
| 459 | add_weak_mods(MOD_BIT(CSA_ALTGR)); | 459 | add_weak_mods(MOD_BIT(KC_ALGR)); |
| 460 | return MACRO(D(SPACE), END); | 460 | return MACRO(D(SPACE), END); |
| 461 | } | 461 | } |
| 462 | } else { | 462 | } else { |
| @@ -466,11 +466,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 466 | unregister_code(KC_1 + (id - M_1)); | 466 | unregister_code(KC_1 + (id - M_1)); |
| 467 | break; | 467 | break; |
| 468 | case M_DEGR: | 468 | case M_DEGR: |
| 469 | return MACRO(UP(CSA_ALTGR), U(SCLN), END); | 469 | return MACRO(UP(KC_ALGR), U(SCLN), END); |
| 470 | case M_SCLN: | 470 | case M_SCLN: |
| 471 | return MACRO(U(SCLN), END); | 471 | return MACRO(U(SCLN), END); |
| 472 | case M_NBSP: | 472 | case M_NBSP: |
| 473 | del_weak_mods(MOD_BIT(CSA_ALTGR)); | 473 | del_weak_mods(MOD_BIT(KC_ALGR)); |
| 474 | return MACRO(U(SPACE), END); | 474 | return MACRO(U(SPACE), END); |
| 475 | } | 475 | } |
| 476 | } | 476 | } |
diff --git a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c index 2668fce86..98df73289 100644 --- a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c +++ b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c | |||
| @@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 171 | KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, | 171 | KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, |
| 172 | KC_H, KC_J, KC_K, KC_L, NO_OSLH, NO_AE, | 172 | KC_H, KC_J, KC_K, KC_L, NO_OSLH, NO_AE, |
| 173 | KC_DELT, KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSFT, | 173 | KC_DELT, KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSFT, |
| 174 | NO_ALGR, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, | 174 | KC_ALGR, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, |
| 175 | KC_HOME, KC_END, | 175 | KC_HOME, KC_END, |
| 176 | KC_PGUP, | 176 | KC_PGUP, |
| 177 | KC_PGDN, KC_ENT, KC_SPACE | 177 | KC_PGDN, KC_ENT, KC_SPACE |
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c index e977ab994..a46408793 100644 --- a/layouts/community/ergodox/swedish-lindhe/keymap.c +++ b/layouts/community/ergodox/swedish-lindhe/keymap.c | |||
| @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 63 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, | 63 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, |
| 64 | KC_H, KC_J, KC_K, KC_L, NO_OSLH, NO_AE, | 64 | KC_H, KC_J, KC_K, KC_L, NO_OSLH, NO_AE, |
| 65 | KC_DELT, KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSFT, | 65 | KC_DELT, KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSFT, |
| 66 | NO_ALGR, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, | 66 | KC_ALGR, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, |
| 67 | KC_HOME, KC_END, | 67 | KC_HOME, KC_END, |
| 68 | KC_PGUP, | 68 | KC_PGUP, |
| 69 | KC_PGDN, KC_TAB, LT(MDIA, KC_ENT) | 69 | KC_PGDN, KC_TAB, LT(MDIA, KC_ENT) |
diff --git a/layouts/community/ergodox/swedish/keymap.c b/layouts/community/ergodox/swedish/keymap.c index d2b9b40d1..0cda8511f 100644 --- a/layouts/community/ergodox/swedish/keymap.c +++ b/layouts/community/ergodox/swedish/keymap.c | |||
| @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 76 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), GUI_T(NO_AE), | 76 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), GUI_T(NO_AE), |
| 77 | MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, | 77 | MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, |
| 78 | KC_UP, KC_DOWN, NO_CIRC, NO_ASTR, KC_FN1, | 78 | KC_UP, KC_DOWN, NO_CIRC, NO_ASTR, KC_FN1, |
| 79 | NO_ALGR, CTL_T(KC_ESC), | 79 | KC_ALGR, CTL_T(KC_ESC), |
| 80 | KC_PGUP, | 80 | KC_PGUP, |
| 81 | KC_PGDN,KC_TAB, KC_ENT | 81 | KC_PGDN,KC_TAB, KC_ENT |
| 82 | ), | 82 | ), |
