summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Rascher <jon@bcat.name>2019-08-30 19:45:49 -0500
committerDrashna Jaelre <drashna@live.com>2019-08-30 17:45:49 -0700
commit9340b70b7e5779409bced9c30df0e4afd645f8b8 (patch)
treeeebfd2a0467d687944dbb07011655992636393bb
parent733ec614d89b42f589075a28d6041c0f756e60b4 (diff)
[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.
-rw-r--r--keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c10
-rw-r--r--keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md6
-rw-r--r--keyboards/keebio/quefrency/keymaps/bcat/config.h14
-rw-r--r--keyboards/keebio/quefrency/keymaps/bcat/keymap.c4
-rw-r--r--keyboards/keebio/quefrency/keymaps/bcat/readme.md2
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c8
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/bcat/readme.md4
-rw-r--r--layouts/community/60_tsangan_hhkb/bcat/keymap.c4
-rw-r--r--layouts/community/60_tsangan_hhkb/bcat/readme.md2
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 6cb6afaea6..4db53ab087 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 {
LAYER_FUNCTION,
};
-/* Switch to function layer when held. */
-#define LY_FUNC MO(LAYER_FUNCTION)
+/* Switch to function layer when held; send menu key when tappped. */
+#define LY_FUNC LT(LAYER_FUNCTION, KC_APP)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default layer: http://www.keyboard-layout-editor.com/#/gists/dd675b40cc4df2c7bb78847ac29f5988 */
@@ -21,9 +21,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
[LAYER_FUNCTION] = LAYOUT(
_______, 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, _______,
- _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
- KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
+ _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, KC_APP, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md b/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md
index d1779152f8..4f20c24aec 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md
@@ -1,4 +1,4 @@
-# bcat's Quefrency 65% layout
+# bcat's KBD67 hotswap layout
This is pretty much a stock 65% split keyboard layout, with an HHKB-style
(split) backspace and media keys in the function layer centered around the WASD
@@ -6,8 +6,8 @@ cluster.
## Default layer
-![Default layer layout](https://i.imgur.com/stwELz3.png)
+![Default layer layout](https://i.imgur.com/iJsG6Z8.png)
## Function layer
-![Function layer layout](https://i.imgur.com/urDnuTC.png)
+![Function layer layout](https://i.imgur.com/eRKdeph.png)
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/config.h b/keyboards/keebio/quefrency/keymaps/bcat/config.h
index c9e836597a..87eaa6a783 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bcat/config.h
@@ -1,18 +1,6 @@
#pragma once
-/*
- * I2C seems to randomly drop keystrokes. Not sure why. It seems a bit like
- * https://github.com/qmk/qmk_firmware/issues/5037, but that issue is closed,
- * and our problems happen even with underglow disabled.
- *
- * This issue occurs with multiple TRRS cables of different lengths from
- * different companies, so it's most likely not a cable issue. It may be that
- * we are running into issues with long I2C runs, in which case stronger
- * pull-up resistors might help:
- * https://hackaday.com/2017/02/08/taking-the-leap-off-board-an-introduction-to-i2c-over-long-wires/.
- * For now, just don't use I2C.
- */
-#define USE_SERIAL
+#define USE_I2C
/* Use an extra LED on the right side since it's wider on the 65% PCB. */
#undef RGBLED_NUM
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
index 9dc98f5a1d..1f3daa85e3 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] = {
/* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
[LAYER_FUNCTION] = LAYOUT_65(
_______, 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,
- _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RGB_SAI,
- KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SAD,
+ KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RGB_SAI,
+ _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SAD,
_______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_HUD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD
),
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/readme.md b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
index 793e8833a4..0149d179bd 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.
## Function layer
-![Function layer layout](https://i.imgur.com/4R1F72M.png)
+![Function layer layout](https://i.imgur.com/0mvzXHG.png)
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 780c13c2f1..0029401e81 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] = {
/* Function layer: http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915 */
[LAYER_FUNCTION] = LAYOUT_60_ansi_split_bs_rshift(
_______, 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,
- _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
- KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
+ _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
_______, _______, KC_MUTE, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
[LAYER_ADJUST] = LAYOUT_60_ansi_split_bs_rshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______,
+ _______, _______, _______, _______, _______, _______, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG,
- _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
+ _______, _______, _______, _______, _______, BL_BRTG, BL_DEC, BL_INC, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
};
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 79bff7406c..7a5dea7c4b 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.
## Function layer
-![Function layer layout](https://i.imgur.com/8dr5ktH.png)
+![Function layer layout](https://i.imgur.com/fmvSJJy.png)
## Adjust layer
-![Adjust layer layout](https://i.imgur.com/78PBNt6.png)
+![Adjust layer layout](https://i.imgur.com/KxCtI50.png)
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
index 3436941b1c..778a2ee54c 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] = {
/* Function layer: http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551 */
[LAYER_FUNCTION] = LAYOUT_60_tsangan_hhkb(
_______, 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,
- _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
- KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
+ _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
_______, _______, KC_MUTE, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),
diff --git a/layouts/community/60_tsangan_hhkb/bcat/readme.md b/layouts/community/60_tsangan_hhkb/bcat/readme.md
index bb1b59e63e..75f0dd550f 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.
## Function layer
-![Function layer layout](https://i.imgur.com/ut9PvhF.png)
+![Function layer layout](https://i.imgur.com/wZnTnvF.png)
## Adjust layer