Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch my Chrome OS media keys workaround from mouse keys to NKRO #9790

Merged
merged 3 commits into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion keyboards/crkbd/keymaps/bcat/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ enum layer {

#define KY_CSPC LCTL(KC_SPC)
#define KY_LOCK LGUI(KC_L)
#define KY_NKRO MAGIC_TOGGLE_NKRO
bcat marked this conversation as resolved.
Show resolved Hide resolved
#define KY_WINL LGUI(KC_LEFT)
#define KY_WINR LGUI(KC_RGHT)

Expand Down Expand Up @@ -44,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */
[LAYER_ADJUST] = LAYOUT(
_______, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, _______, _______, _______, _______,
_______, KY_NKRO, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, _______, _______, _______, _______,
bcat marked this conversation as resolved.
Show resolved Hide resolved
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, RGB_RMOD, RGB_VAD, RGB_VAI, RGB_MOD, RGB_SPI, _______,
_______, _______, _______, KC_MUTE, _______, _______, RGB_HUI, RGB_SAD, RGB_SAI, RGB_HUD, RGB_SPD, _______,
_______, _______, _______, RGB_TOG, _______, _______
Expand Down
2 changes: 1 addition & 1 deletion keyboards/crkbd/keymaps/bcat/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ be a better place to put them.

## Adjust layer

![Adjust layer layout](https://i.imgur.com/LEHM4DU.png)
![Adjust layer layout](https://i.imgur.com/fZouko5.png)

([KLE](http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee))

Expand Down
4 changes: 3 additions & 1 deletion keyboards/keebio/quefrency/keymaps/bcat/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ enum layer {

#define LY_FN MO(LAYER_FUNCTION)

#define KY_NKRO MAGIC_TOGGLE_NKRO

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default layer: http://www.keyboard-layout-editor.com/#/gists/60a262432bb340b37d364a4424f3037b */
[LAYER_DEFAULT] = LAYOUT_65(
Expand All @@ -20,7 +22,7 @@ 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_CAPS, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RGB_SAI,
KC_CAPS, KY_NKRO, 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_APP, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_HUD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD
Expand Down
2 changes: 1 addition & 1 deletion keyboards/keebio/quefrency/keymaps/bcat/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ ESDF cluster), and RGB controls in the function layer (on the arrow/nav keys).

## Function layer

![Function layer layout](https://i.imgur.com/Wmx1hfx.png)
![Function layer layout](https://i.imgur.com/Fzshl0F.png)

([KLE](http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d))
3 changes: 2 additions & 1 deletion keyboards/lily58/keymaps/bcat/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ enum layer {

#define KY_CSPC LCTL(KC_SPC)
#define KY_LOCK LGUI(KC_L)
#define KY_NKRO MAGIC_TOGGLE_NKRO
#define KY_WINL LGUI(KC_LEFT)
#define KY_WINR LGUI(KC_RGHT)

Expand Down Expand Up @@ -48,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */
[LAYER_ADJUST] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, _______, _______, _______, _______,
_______, KY_NKRO, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, _______, _______, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
Expand Down
2 changes: 1 addition & 1 deletion keyboards/lily58/keymaps/bcat/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ browser back/forward navigation keys.

## Adjust layer

![Adjust layer layout](https://i.imgur.com/Rv6jQtC.png)
![Adjust layer layout](https://i.imgur.com/Q3PGsiK.png)

([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7))
4 changes: 3 additions & 1 deletion layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ enum layer {
#define LY_FN1 MO(LAYER_FUNCTION_1)
#define LY_FN2 MO(LAYER_FUNCTION_2)

#define KY_NKRO MAGIC_TOGGLE_NKRO

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default layer: http://www.keyboard-layout-editor.com/#/gists/327b41b5a933b3d44bf60ca9822e85dc */
[LAYER_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift(
Expand All @@ -31,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
[LAYER_FUNCTION_2] = 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, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______,
_______, KY_NKRO, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG,
_______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
Expand Down
2 changes: 1 addition & 1 deletion layouts/community/60_ansi_split_bs_rshift/bcat/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ layout](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsa

## Function 2 layer

![Function 2 layer layout](https://i.imgur.com/WRvsEuZ.png)
![Function 2 layer layout](https://i.imgur.com/vJaCzVo.png)

([KLE](http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c))
4 changes: 3 additions & 1 deletion layouts/community/60_tsangan_hhkb/bcat/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ enum layer {
#define LY_FN1 MO(LAYER_FUNCTION_1)
#define LY_FN2 MO(LAYER_FUNCTION_2)

#define KY_NKRO MAGIC_TOGGLE_NKRO

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default layer: http://www.keyboard-layout-editor.com/#/gists/86b33d75aa6f56d8781ab3d8475f4e77 */
[LAYER_DEFAULT] = LAYOUT_60_tsangan_hhkb(
Expand All @@ -31,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */
[LAYER_FUNCTION_2] = 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, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______,
_______, KY_NKRO, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG,
_______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
_______, _______, _______, _______, _______, _______, _______
Expand Down
2 changes: 1 addition & 1 deletion layouts/community/60_tsangan_hhkb/bcat/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ and/or blockers, so there aren't switches installed in those positions.

## Function 2 layer

![Function 2 layer layout](https://i.imgur.com/37APm7c.png)
![Function 2 layer layout](https://i.imgur.com/vdNpFae.png)

([KLE](http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4))
4 changes: 3 additions & 1 deletion layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ enum layer {

#define LY_FN MO(LAYER_FUNCTION)

#define KY_NKRO MAGIC_TOGGLE_NKRO

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default layer: http://www.keyboard-layout-editor.com/#/gists/dd675b40cc4df2c7bb78847ac29f5988 */
[LAYER_DEFAULT] = LAYOUT_65_ansi_blocker_split_bs(
Expand All @@ -20,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
[LAYER_FUNCTION] = LAYOUT_65_ansi_blocker_split_bs(
_______, 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_CAPS, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
KC_CAPS, KY_NKRO, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_APP, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
Expand Down
2 changes: 1 addition & 1 deletion layouts/community/65_ansi_blocker_split_bs/bcat/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ keys, an HHKB-style (split) backspace, and media controls in the function layer

## Function layer

![Function layer layout](https://i.imgur.com/Q304GlI.png)
![Function layer layout](https://i.imgur.com/CsxfVfd.png)

([KLE](http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44))
15 changes: 10 additions & 5 deletions users/bcat/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,31 @@ SRC += bcat.c
# Enable Bootmagic Lite to consistently reset to bootloader and clear EEPROM.
BOOTMAGIC_ENABLE = lite

# Enable media keys on all keyboards. (Even though I don't use mouse keys, they
# seem to be required for media keys to register on Chrome OS.)
# Enable media keys on all keyboards.
EXTRAKEY_ENABLE = yes
MOUSEKEY_ENABLE = yes

# Enable N-key rollover on all keyboards. In addition to its intended
# functionality, as of July 2020, this is required for Chrome OS to process
# media keys. (It appears that Chrome OS filters out key events from the second
# USB endpoint's consumer and system control devices unless that endpoint also
# reports a keyboard or mouse device.)
NKRO_ENABLE = yes

# Enable link-time optimization to reduce binary size.
LINK_TIME_OPTIMIZATION_ENABLE = yes

# Disable unused build options on all keyboards.
COMMAND_ENABLE = no
CONSOLE_ENABLE = no
NKRO_ENABLE = no
MOUSEKEY_ENABLE = no
TERMINAL_ENABLE = no

# Disable unused hardware options on all keyboards.
FAUXCLICKY_ENABLE = no
MIDI_ENABLE = no
SLEEP_LED_ENABLE = no

# Disable unused other options.
# Disable other unused options on all keyboards.
API_SYSEX_ENABLE = no
AUTO_SHIFT_ENABLE = no
COMBO_ENABLE = no
Expand Down