diff options
author | Jonathan Rascher <jon@bcat.name> | 2019-08-30 19:45:49 -0500 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-08-30 17:45:49 -0700 |
commit | 9340b70b7e5779409bced9c30df0e4afd645f8b8 (patch) | |
tree | eebfd2a0467d687944dbb07011655992636393bb | |
parent | 733ec614d89b42f589075a28d6041c0f756e60b4 (diff) | |
download | qmk_firmware-9340b70b7e5779409bced9c30df0e4afd645f8b8.tar.gz qmk_firmware-9340b70b7e5779409bced9c30df0e4afd645f8b8.zip |
[Keyboard] Assorted personal keymap/layout updates (#6621)
* Switch Quefrency back to I2C (#6161 fixes the lag)
* Update Quefrency keymap
* Add reset and EEPROM reset keybindings so these tasks can be performed
separately, rather than relying on Bootmagic Lite, which performs both
tasks at the same time.
* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.
* Update KBD67 keymap
* Add reset and EEPROM reset keybindings so these tasks can be performed
separately, rather than relying on Bootmagic Lite, which performs both
tasks at the same time.
* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.
* Move Menu to a layer tap on the Fn key since that's a more natural
location.
* Update 60% Tsangan HHKB layout
* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.
* Update 60% ANSI split backspace/right-shift layout
* Add reset and EEPROM reset keybindings so these tasks can be performed
separately, rather than relying on Bootmagic Lite, which performs both
tasks at the same time.
* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.
9 files changed, 21 insertions, 33 deletions
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c index 6cb6afaea..4db53ab08 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c | |||
@@ -5,8 +5,8 @@ enum layer { | |||
5 | LAYER_FUNCTION, | 5 | LAYER_FUNCTION, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | /* Switch to function layer when held. */ | 8 | /* Switch to function layer when held; send menu key when tappped. */ |
9 | #define LY_FUNC MO(LAYER_FUNCTION) | 9 | #define LY_FUNC LT(LAYER_FUNCTION, KC_APP) |
10 | 10 | ||
11 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 11 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
12 | /* Default layer: http://www.keyboard-layout-editor.com/#/gists/dd675b40cc4df2c7bb78847ac29f5988 */ | 12 | /* Default layer: http://www.keyboard-layout-editor.com/#/gists/dd675b40cc4df2c7bb78847ac29f5988 */ |
@@ -21,9 +21,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
21 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */ | 21 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */ |
22 | [LAYER_FUNCTION] = LAYOUT( | 22 | [LAYER_FUNCTION] = LAYOUT( |
23 | _______, 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_INS, KC_DEL, _______, | 23 | _______, 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_INS, KC_DEL, _______, |
24 | _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, | 24 | KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, |
25 | KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 25 | _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
26 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 26 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
27 | _______, _______, _______, _______, KC_APP, _______, _______, _______, _______ | 27 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
28 | ), | 28 | ), |
29 | }; | 29 | }; |
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md b/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md index d1779152f..4f20c24ae 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md | |||
@@ -1,4 +1,4 @@ | |||
1 | # bcat's Quefrency 65% layout | 1 | # bcat's KBD67 hotswap layout |
2 | 2 | ||
3 | This is pretty much a stock 65% split keyboard layout, with an HHKB-style | 3 | This is pretty much a stock 65% split keyboard layout, with an HHKB-style |
4 | (split) backspace and media keys in the function layer centered around the WASD | 4 | (split) backspace and media keys in the function layer centered around the WASD |
@@ -6,8 +6,8 @@ cluster. | |||
6 | 6 | ||
7 | ## Default layer | 7 | ## Default layer |
8 | 8 | ||
9 |  | 9 |  |
10 | 10 | ||
11 | ## Function layer | 11 | ## Function layer |
12 | 12 | ||
13 |  | 13 |  |
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/config.h b/keyboards/keebio/quefrency/keymaps/bcat/config.h index c9e836597..87eaa6a78 100644 --- a/keyboards/keebio/quefrency/keymaps/bcat/config.h +++ b/keyboards/keebio/quefrency/keymaps/bcat/config.h | |||
@@ -1,18 +1,6 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | 2 | ||
3 | /* | 3 | #define USE_I2C |
4 | * I2C seems to randomly drop keystrokes. Not sure why. It seems a bit like | ||
5 | * https://github.com/qmk/qmk_firmware/issues/5037, but that issue is closed, | ||
6 | * and our problems happen even with underglow disabled. | ||
7 | * | ||
8 | * This issue occurs with multiple TRRS cables of different lengths from | ||
9 | * different companies, so it's most likely not a cable issue. It may be that | ||
10 | * we are running into issues with long I2C runs, in which case stronger | ||
11 | * pull-up resistors might help: | ||
12 | * https://hackaday.com/2017/02/08/taking-the-leap-off-board-an-introduction-to-i2c-over-long-wires/. | ||
13 | * For now, just don't use I2C. | ||
14 | */ | ||
15 | #define USE_SERIAL | ||
16 | 4 | ||
17 | /* Use an extra LED on the right side since it's wider on the 65% PCB. */ | 5 | /* Use an extra LED on the right side since it's wider on the 65% PCB. */ |
18 | #undef RGBLED_NUM | 6 | #undef RGBLED_NUM |
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c index 9dc98f5a1..1f3daa85e 100644 --- a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c +++ b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c | |||
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
21 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */ | 21 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */ |
22 | [LAYER_FUNCTION] = LAYOUT_65( | 22 | [LAYER_FUNCTION] = LAYOUT_65( |
23 | _______, 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_INS, KC_DEL, RGB_HUI, | 23 | _______, 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_INS, KC_DEL, RGB_HUI, |
24 | _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RGB_SAI, | 24 | KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RGB_SAI, |
25 | KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SAD, | 25 | _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SAD, |
26 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_HUD, | 26 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_HUD, |
27 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD | 27 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD |
28 | ), | 28 | ), |
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/readme.md b/keyboards/keebio/quefrency/keymaps/bcat/readme.md index 793e8833a..0149d179b 100644 --- a/keyboards/keebio/quefrency/keymaps/bcat/readme.md +++ b/keyboards/keebio/quefrency/keymaps/bcat/readme.md | |||
@@ -10,4 +10,4 @@ cluster, and RGB controls in the function layer on the arrow/nav keys. | |||
10 | 10 | ||
11 | ## Function layer | 11 | ## Function layer |
12 | 12 | ||
13 |  | 13 |  |
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c index 780c13c2f..0029401e8 100644 --- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c | |||
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
25 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915 */ | 25 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915 */ |
26 | [LAYER_FUNCTION] = LAYOUT_60_ansi_split_bs_rshift( | 26 | [LAYER_FUNCTION] = LAYOUT_60_ansi_split_bs_rshift( |
27 | _______, 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_INS, KC_DEL, | 27 | _______, 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_INS, KC_DEL, |
28 | _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, | 28 | KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, |
29 | KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, | 29 | _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, |
30 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, | 30 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, |
31 | _______, _______, _______, _______, _______, _______, _______, _______ | 31 | _______, _______, _______, _______, _______, _______, _______, _______ |
32 | ), | 32 | ), |
@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
34 | /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */ | 34 | /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */ |
35 | [LAYER_ADJUST] = LAYOUT_60_ansi_split_bs_rshift( | 35 | [LAYER_ADJUST] = LAYOUT_60_ansi_split_bs_rshift( |
36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, | 37 | _______, _______, _______, _______, _______, _______, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______, |
38 | _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG, |
39 | _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, | 39 | _______, _______, _______, _______, _______, BL_BRTG, BL_DEC, BL_INC, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, |
40 | _______, _______, _______, _______, _______, _______, _______, _______ | 40 | _______, _______, _______, _______, _______, _______, _______, _______ |
41 | ), | 41 | ), |
42 | }; | 42 | }; |
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md b/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md index 79bff7406..7a5dea7c4 100644 --- a/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md +++ b/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md | |||
@@ -13,8 +13,8 @@ key on the bottom row activates an adjust layer to control RGB underglow. | |||
13 | 13 | ||
14 | ## Function layer | 14 | ## Function layer |
15 | 15 | ||
16 |  | 16 |  |
17 | 17 | ||
18 | ## Adjust layer | 18 | ## Adjust layer |
19 | 19 | ||
20 |  | 20 |  |
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c index 3436941b1..778a2ee54 100644 --- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c +++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c | |||
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
25 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551 */ | 25 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551 */ |
26 | [LAYER_FUNCTION] = LAYOUT_60_tsangan_hhkb( | 26 | [LAYER_FUNCTION] = LAYOUT_60_tsangan_hhkb( |
27 | _______, 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_INS, KC_DEL, | 27 | _______, 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_INS, KC_DEL, |
28 | _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, | 28 | KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, |
29 | KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, | 29 | _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, |
30 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, | 30 | _______, _______, KC_MUTE, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, |
31 | _______, _______, _______, _______, _______, _______, _______ | 31 | _______, _______, _______, _______, _______, _______, _______ |
32 | ), | 32 | ), |
diff --git a/layouts/community/60_tsangan_hhkb/bcat/readme.md b/layouts/community/60_tsangan_hhkb/bcat/readme.md index bb1b59e63..75f0dd550 100644 --- a/layouts/community/60_tsangan_hhkb/bcat/readme.md +++ b/layouts/community/60_tsangan_hhkb/bcat/readme.md | |||
@@ -11,7 +11,7 @@ key on the bottom row actives an adjust layer to control RGB underglow. | |||
11 | 11 | ||
12 | ## Function layer | 12 | ## Function layer |
13 | 13 | ||
14 |  | 14 |  |
15 | 15 | ||
16 | ## Adjust layer | 16 | ## Adjust layer |
17 | 17 | ||