Skip to content

Commit

Permalink
[Keyboard] Keychron K4v2 fixes (#352)
Browse files Browse the repository at this point in the history 
* ISO: Fix Rgb on # key, switch to QK_Boot keycode

* ANSI: Fix build, disable rgb when suspended, enable keypress and framebuffer effects, switch to QK_boot keycode
  • Loading branch information
@ephb
ephb authored Oct 3, 2023
1 parent 02ed9f3 commit fe4356e
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 20 deletions.
10 changes: 8 additions & 2 deletions keyboards/keychron/k4/rgb/v2/ansi/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@
#define DIP_SWITCH_PINS { D5, D6 }
#define RGB_MATRIX_LED_COUNT 100

/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
*/

# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS

#define RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }

#define LED_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }

#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
14 changes: 7 additions & 7 deletions keyboards/keychron/k4/rgb/v2/ansi/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | LALT| LGUI| | | | | | | | | | |
+--------------------------------------------------------------------------+-------------------+
*/
/* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
[_FL] = { { Q_RESET, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_HUI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_SPI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, KC_NO, _______, _______, _______, KC_NO },
{ _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, RGB_SAI },
{ _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, MO(_FL), _______, _______, _______, _______, _______, _______, KC_NO }
/* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
[_FL] = { { QK_BOOT, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_HUI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_SPI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, KC_NO, _______, _______, _______, KC_NO },
{ _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, RGB_SAI },
{ _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, MO(_FL), _______, _______, _______, _______, _______, _______, KC_NO }
}

};
Expand Down
14 changes: 7 additions & 7 deletions keyboards/keychron/k4/rgb/v2/ansi/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | LALT| LGUI| | | | | | | | | | |
+--------------------------------------------------------------------------+-------------------+
*/
/* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
[_FL] = { { Q_RESET, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_HUI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_SPI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, KC_NO, _______, _______, _______, KC_NO },
{ _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, RGB_SAI },
{ _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, MO(_FL), _______, _______, _______, _______, _______, _______, KC_NO }
/* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
[_FL] = { { QK_BOOT, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_HUI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_SPI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, KC_NO, _______, _______, _______, KC_NO },
{ _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, RGB_SAI },
{ _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, MO(_FL), _______, _______, _______, _______, _______, _______, KC_NO }
}

};
Expand Down
4 changes: 2 additions & 2 deletions keyboards/keychron/k4/rgb/v2/iso/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@
{ "matrix": [ 3, 9 ], "flags": 4, "x": 121, "y": 38 },
{ "matrix": [ 3, 10 ], "flags": 4, "x": 134, "y": 38 },
{ "matrix": [ 3, 11 ], "flags": 4, "x": 146, "y": 38 },
{ "matrix": [ 3, 13 ], "flags": 4, "x": 158, "y": 38 },
{ "matrix": [ 3, 14 ], "flags": 4, "x": 173, "y": 32 },
{ "matrix": [ 3, 12 ], "flags": 4, "x": 158, "y": 38 },
{ "matrix": [ 3, 13 ], "flags": 4, "x": 173, "y": 32 },
{ "matrix": [ 3, 15 ], "flags": 4, "x": 187, "y": 38 },
{ "matrix": [ 3, 16 ], "flags": 4, "x": 199, "y": 38 },
{ "matrix": [ 3, 17 ], "flags": 4, "x": 212, "y": 38 },
Expand Down
2 changes: 1 addition & 1 deletion keyboards/keychron/k4/rgb/v2/iso/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+--------------------------------------------------------------------------+-------------------+
*/
/* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
[_FL] = { { Q_RESET, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
[_FL] = { { QK_BOOT, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_HUI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_SPI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, KC_NO },
Expand Down
2 changes: 1 addition & 1 deletion keyboards/keychron/k4/rgb/v2/iso/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+--------------------------------------------------------------------------+-------------------+
*/
/* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
[_FL] = { { Q_RESET, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
[_FL] = { { QK_BOOT, KC_SLCT, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PSCR, _______, _______, KC_SLEP, RGB_TOG },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_HUI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, RGB_SPI },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, KC_NO },
Expand Down

0 comments on commit fe4356e

Please sign in to comment.