From e86162a05c7e46955ac1488211c459ece9133af5 Mon Sep 17 00:00:00 2001 From: enricorov Date: Sat, 31 Jul 2021 14:07:20 +0100 Subject: [PATCH 1/7] Fixed K2 media keys. Added RGB hue/sat to fn layer --- keyboards/keychron/k2/keymaps/default/keymap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/keychron/k2/keymaps/default/keymap.c b/keyboards/keychron/k2/keymaps/default/keymap.c index 006c3754c88c..a9f5c6f0a35e 100644 --- a/keyboards/keychron/k2/keymaps/default/keymap.c +++ b/keyboards/keychron/k2/keymaps/default/keymap.c @@ -43,11 +43,11 @@ 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 */ - [_BASE] = { { KC_ESC, 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_PSCR, KC_DEL, RGB_MOD }, + [_BASE] = { { KC_ESC, 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_PSCR, RGB_MOD, KC_DEL }, { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_PGUP }, { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_NO, KC_PGDN }, { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_NO, KC_HOME }, - { KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_UP, KC_END }, + { KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, KC_UP, KC_END }, { KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT } }, @@ -66,12 +66,12 @@ 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] = { { _______, KC_SLCK, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC__MUTE, KC__VOLDOWN, KC__VOLUP, _______, KC_SLEP, RGB_TOG }, + [_FL] = { { _______, KC_SLCK, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_RMOD, 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 } + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, RGB_HUD }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, KC_NO, RGB_SAI }, + { _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, RGB_SPI, RGB_SAD }, + { _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, MO(_FL), _______, _______, RGB_SPD, KC_NO } } }; From 383c93c784d4b5b4e99e98d29f5c255c2077c853 Mon Sep 17 00:00:00 2001 From: enricorov Date: Sun, 1 Aug 2021 08:30:53 +0100 Subject: [PATCH 2/7] Restored stock RGB/del mapping --- keyboards/keychron/k2/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k2/keymaps/default/keymap.c b/keyboards/keychron/k2/keymaps/default/keymap.c index a9f5c6f0a35e..3d02aa568300 100644 --- a/keyboards/keychron/k2/keymaps/default/keymap.c +++ b/keyboards/keychron/k2/keymaps/default/keymap.c @@ -43,7 +43,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 */ - [_BASE] = { { KC_ESC, 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_PSCR, RGB_MOD, KC_DEL }, + [_BASE] = { { KC_ESC, 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_PSCR, KC_DEL, RGB_MOD }, { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_PGUP }, { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_NO, KC_PGDN }, { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_NO, KC_HOME }, From 2e0b6283a6830230e2b1850ff70a73cf3d69859c Mon Sep 17 00:00:00 2001 From: enricorov Date: Mon, 4 Oct 2021 17:41:28 +0100 Subject: [PATCH 3/7] Added macros --- keyboards/keychron/k2/keymaps/default/keymap.c | 6 +++--- keyboards/keychron/k2/rules.mk | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/keyboards/keychron/k2/keymaps/default/keymap.c b/keyboards/keychron/k2/keymaps/default/keymap.c index 3d02aa568300..31a9d51530a2 100644 --- a/keyboards/keychron/k2/keymaps/default/keymap.c +++ b/keyboards/keychron/k2/keymaps/default/keymap.c @@ -66,9 +66,9 @@ 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] = { { _______, KC_SLCK, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_RMOD, RGB_TOG }, - { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, RGB_HUI }, - { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, RGB_HUD }, + [_FL] = { { DM_RSTP, KC_SLCK, KC_PAUS, KC_APP, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_RMOD, RGB_TOG }, + { _______, DM_PLY1, DM_PLY2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, RGB_HUI }, + { _______, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, RGB_HUD }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, KC_NO, RGB_SAI }, { _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, RGB_SPI, RGB_SAD }, { _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, MO(_FL), _______, _______, RGB_SPD, KC_NO } diff --git a/keyboards/keychron/k2/rules.mk b/keyboards/keychron/k2/rules.mk index c15a743808de..a8c71be6b3d2 100644 --- a/keyboards/keychron/k2/rules.mk +++ b/keyboards/keychron/k2/rules.mk @@ -61,3 +61,6 @@ DIP_SWITCH_ENABLE = yes # Custom RGB matrix handling RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = custom + +# Dynamic macros +DYNAMIC_MACRO_ENABLE = yes \ No newline at end of file From ad86f5e4aee551c5d97ba0f897822464aeaa9b37 Mon Sep 17 00:00:00 2001 From: enricorov Date: Mon, 4 Oct 2021 17:41:42 +0100 Subject: [PATCH 4/7] Add context menu on fn tap --- keyboards/keychron/k2/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k2/keymaps/default/keymap.c b/keyboards/keychron/k2/keymaps/default/keymap.c index 31a9d51530a2..edd1c830d90a 100644 --- a/keyboards/keychron/k2/keymaps/default/keymap.c +++ b/keyboards/keychron/k2/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { { _______, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, RGB_HUD }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, KC_NO, RGB_SAI }, { _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, RGB_SPI, RGB_SAD }, - { _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, MO(_FL), _______, _______, RGB_SPD, KC_NO } + { _______, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, _______, _______, _______, _______, RGB_SPD, KC_NO } } }; From e7ae91065d84fe4af7bdd6ae7863d5fcb546d047 Mon Sep 17 00:00:00 2001 From: enricorov Date: Mon, 4 Oct 2021 18:03:58 +0100 Subject: [PATCH 5/7] Swapped print key and rgb key --- keyboards/keychron/k2/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k2/keymaps/default/keymap.c b/keyboards/keychron/k2/keymaps/default/keymap.c index edd1c830d90a..88b45c163dfb 100644 --- a/keyboards/keychron/k2/keymaps/default/keymap.c +++ b/keyboards/keychron/k2/keymaps/default/keymap.c @@ -43,7 +43,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 */ - [_BASE] = { { KC_ESC, 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_PSCR, KC_DEL, RGB_MOD }, + [_BASE] = { { KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_MOD, KC_PSCR, KC_DEL }, { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_PGUP }, { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_NO, KC_PGDN }, { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_NO, KC_HOME }, From c87be5f168c2a24adc511250d4a917a26664fae0 Mon Sep 17 00:00:00 2001 From: enricorov Date: Mon, 4 Oct 2021 18:05:45 +0100 Subject: [PATCH 6/7] Context menu on FN --- keyboards/keychron/k2/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keychron/k2/keymaps/default/keymap.c b/keyboards/keychron/k2/keymaps/default/keymap.c index 88b45c163dfb..0dfac1e85099 100644 --- a/keyboards/keychron/k2/keymaps/default/keymap.c +++ b/keyboards/keychron/k2/keymaps/default/keymap.c @@ -47,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_PGUP }, { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_NO, KC_PGDN }, { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_NO, KC_HOME }, - { KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, KC_UP, KC_END }, - { KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT } + { KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_UP, KC_END }, + { KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_RALT, LT(_FL, KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT } }, /* +--------------------------------------------------------------------------+-------------------+ From f4d686a024d7dad254e743c4ef488842b852a801 Mon Sep 17 00:00:00 2001 From: enricorov Date: Sun, 7 Nov 2021 19:49:37 +0000 Subject: [PATCH 7/7] Disable sleep breathing effect --- keyboards/keychron/k2/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k2/rules.mk b/keyboards/keychron/k2/rules.mk index a8c71be6b3d2..5a4405b93fe5 100644 --- a/keyboards/keychron/k2/rules.mk +++ b/keyboards/keychron/k2/rules.mk @@ -49,7 +49,7 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover AUDIO_ENABLE = no RGBLIGHT_ENABLE = no