From 52e8585daab0c89693aa15e62b58c57895903cd5 Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Thu, 22 Dec 2022 20:15:01 +0800 Subject: [PATCH 01/12] Added new keymap --- .../p65/ansi/keymaps/achrovisual/keymap.c | 34 +++++++++++++++++++ .../p65/ansi/keymaps/achrovisual/readme.md | 1 + 2 files changed, 35 insertions(+) create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c new file mode 100644 index 000000000000..bfe28c175d90 --- /dev/null +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2021 Glorious, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +enum custom_layers { + _BL, + _FL, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap _BL: Base Layer (Default Layer) + */ + [_BL] = LAYOUT(QK_GESC, 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_HOME, 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_END, 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_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), + + /* Keymap _FL: Function Layer + */ + [_FL] = LAYOUT(KC_GRV, 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_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) +}; diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md new file mode 100644 index 000000000000..4f80a5b95663 --- /dev/null +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md @@ -0,0 +1 @@ +# ANSI GMMKV2 65% Layout From 0169026213341bd9b965d3af4b1f9c4c3688ef4b Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Thu, 22 Dec 2022 20:21:18 +0800 Subject: [PATCH 02/12] Added caps lock and layer indicators using side LEDs --- .../gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c index bfe28c175d90..72241bb83bc3 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -32,3 +32,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT(KC_GRV, 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_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) }; + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + if (host_keyboard_led_state().caps_lock || get_highest_layer(layer_state | default_layer_state)) { + for (uint8_t i = led_min; i < led_max; i++) { + if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW + rgb_matrix_set_color(i, 0xff, 0xff, 0xff); + } + } + } + return false; +}; From 74ee90b7d4dd4bccf42ca5573b536bc16f39a63e Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Thu, 22 Dec 2022 20:21:41 +0800 Subject: [PATCH 03/12] Added custom RGB matrix effect using side LEDs only --- .../keymaps/achrovisual/rgb_matrix_user.inc | 54 +++++++++++++++++++ keyboards/gmmk/gmmk2/p65/ansi/rules.mk | 1 + 2 files changed, 55 insertions(+) create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc new file mode 100644 index 000000000000..498755cd082a --- /dev/null +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc @@ -0,0 +1,54 @@ +RGB_MATRIX_EFFECT(SOLID_UNDERGLOW) +RGB_MATRIX_EFFECT(HOLOGRAPHICS_UNDERGLOW) + +#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS + +static bool SOLID_UNDERGLOW(effect_params_t* params) { + RGB_MATRIX_USE_LIMITS(led_min, led_max); + + RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv); + for (uint8_t i = led_min; i < led_max; i++) { + if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW + rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); + } else { + rgb_matrix_set_color(i, 0x00, 0x00, 0x00); + } + } + return rgb_matrix_check_finished_leds(led_max); +} + +static bool HOLOGRAPHICS_UNDERGLOW(effect_params_t* params) { + RGB_MATRIX_USE_LIMITS(led_min, led_max); + + for (uint8_t i = led_min; i < led_max; i++) { + if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW + // RIGHT-HAND SIDE LEDS || LEFT-HAND SIDE LEDS + if (i == 67) { + rgb_matrix_set_color(i, 0xff, 0x00, 0xee); + } else if (i == 68 || i == 77) { + rgb_matrix_set_color(i, 0xcc, 0x00, 0xff); + } else if (i == 69 || i == 78) { + rgb_matrix_set_color(i, 0x9e, 0x00, 0xff); + } else if (i == 70 || i == 79) { + rgb_matrix_set_color(i, 0x70, 0x00, 0xff); + } else if (i == 71 || i == 80) { + rgb_matrix_set_color(i, 0x52, 0x00, 0xff); + } else if (i == 72 || i == 81) { + rgb_matrix_set_color(i, 0x33, 0x00, 0xff); + } else if (i == 73 || i == 82) { + rgb_matrix_set_color(i, 0x00, 0x38, 0xff); + } else if (i == 74 || i == 83) { + rgb_matrix_set_color(i, 0x00, 0x57, 0xff); + } else if (i == 75 || i == 84) { + rgb_matrix_set_color(i, 0x00, 0x85, 0xff); + } else if (i == 76 || i == 85) { + rgb_matrix_set_color(i, 0x00, 0xb2, 0xff); + } else { + rgb_matrix_set_color(i, 0x00, 0xb2, 0xff); + } + } + } + return rgb_matrix_check_finished_leds(led_max); +} + +#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk index 1cf9d7a7094c..c10485ba2c8f 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk +++ b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk @@ -18,5 +18,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. AUDIO_ENABLE = no # Audio output. RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. RGB_MATRIX_DRIVER = AW20216 # Enable RGB matrix effects. +RGB_MATRIX_CUSTOM_USER = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash From 0977fadb345dd0e0bf624061064637fa758297a4 Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Fri, 23 Dec 2022 03:48:47 +0800 Subject: [PATCH 04/12] Updated holographics underglow LED configuration --- .../keymaps/achrovisual/rgb_matrix_user.inc | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc index 498755cd082a..61ee7e90e24e 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc @@ -23,28 +23,28 @@ static bool HOLOGRAPHICS_UNDERGLOW(effect_params_t* params) { for (uint8_t i = led_min; i < led_max; i++) { if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW // RIGHT-HAND SIDE LEDS || LEFT-HAND SIDE LEDS - if (i == 67) { + if (i == 67 || i == 77) { rgb_matrix_set_color(i, 0xff, 0x00, 0xee); - } else if (i == 68 || i == 77) { + } else if (i == 68 || i == 78) { rgb_matrix_set_color(i, 0xcc, 0x00, 0xff); - } else if (i == 69 || i == 78) { + } else if (i == 69 || i == 79) { rgb_matrix_set_color(i, 0x9e, 0x00, 0xff); - } else if (i == 70 || i == 79) { + } else if (i == 70 || i == 80) { rgb_matrix_set_color(i, 0x70, 0x00, 0xff); - } else if (i == 71 || i == 80) { + } else if (i == 71 || i == 81) { rgb_matrix_set_color(i, 0x52, 0x00, 0xff); - } else if (i == 72 || i == 81) { + } else if (i == 72 || i == 82) { rgb_matrix_set_color(i, 0x33, 0x00, 0xff); - } else if (i == 73 || i == 82) { + } else if (i == 73 || i == 83) { rgb_matrix_set_color(i, 0x00, 0x38, 0xff); - } else if (i == 74 || i == 83) { + } else if (i == 74 || i == 84) { rgb_matrix_set_color(i, 0x00, 0x57, 0xff); - } else if (i == 75 || i == 84) { + } else if (i == 75 || i == 85) { rgb_matrix_set_color(i, 0x00, 0x85, 0xff); - } else if (i == 76 || i == 85) { + } else if (i == 76 || i == 86) { rgb_matrix_set_color(i, 0x00, 0xb2, 0xff); } else { - rgb_matrix_set_color(i, 0x00, 0xb2, 0xff); + rgb_matrix_set_color(i, 0x00, 0x00, 0x00); } } } From 08f7da29d1a80ccbd5906b05b32c2e05c4395737 Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Sat, 24 Dec 2022 13:54:57 +0800 Subject: [PATCH 05/12] Added clear EEPROM key in layer 1 --- keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c index 72241bb83bc3..c8d71858cf82 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _FL: Function Layer */ - [_FL] = LAYOUT(KC_GRV, 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_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) + [_FL] = LAYOUT(KC_GRV, 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_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, EE_CLR, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) }; bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { From ef8e2bf8c9d445c6a609e7a8347abb2781182679 Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Sat, 24 Dec 2022 13:55:35 +0800 Subject: [PATCH 06/12] Added delete key in layer 1 --- keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c index c8d71858cf82..4728f961d1a3 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _FL: Function Layer */ - [_FL] = LAYOUT(KC_GRV, 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_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, EE_CLR, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) + [_FL] = LAYOUT(KC_GRV, 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_DEL, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, EE_CLR, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) }; bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { From 7d2ee34488496222f9dacd6b4b4cfc014259018f Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Tue, 27 Dec 2022 22:03:41 +0800 Subject: [PATCH 07/12] Added GPL2+ compatible license header --- .../gmmk2/p65/ansi/keymaps/achrovisual/keymap.c | 2 +- .../ansi/keymaps/achrovisual/rgb_matrix_user.inc | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c index 4728f961d1a3..d42c145732de 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 Glorious, LLC +/* Copyright 2022 Eugenio Pastoral * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc index 61ee7e90e24e..fc3c00fbd9e4 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc @@ -1,3 +1,19 @@ + /* Copyright 2022 Eugenio Pastoral + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + RGB_MATRIX_EFFECT(SOLID_UNDERGLOW) RGB_MATRIX_EFFECT(HOLOGRAPHICS_UNDERGLOW) From 78051c668508e44204db16af07eef3cc9d0fc1de Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Tue, 27 Dec 2022 22:19:36 +0800 Subject: [PATCH 08/12] Fixed keymap alignment --- .../p65/ansi/keymaps/achrovisual/keymap.c | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c index d42c145732de..521b4f0c55fc 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -24,13 +24,23 @@ enum custom_layers { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Keymap _BL: Base Layer (Default Layer) - */ - [_BL] = LAYOUT(QK_GESC, 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_HOME, 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_END, 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_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), + /* Keymap _BL: Base Layer (Default Layer) + */ +[_BL] = LAYOUT( + QK_GESC, 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_HOME, + 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_END, + 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_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), - /* Keymap _FL: Function Layer - */ - [_FL] = LAYOUT(KC_GRV, 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_DEL, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, EE_CLR, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) + /* Keymap _FL: Function Layer + */ +[_FL] = LAYOUT( + KC_GRV, 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_TOG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, + EE_CLR, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) }; bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { From d792b5feaac3661c9544ca50eccd7e61eaf79d49 Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Tue, 27 Dec 2022 22:32:05 +0800 Subject: [PATCH 09/12] Added comments --- keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c | 1 + .../gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c index 521b4f0c55fc..cba0cd81c9b1 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -43,6 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { EE_CLR, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) }; +// Turns side LEDs to white for caps lock and layer indicators. bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { if (host_keyboard_led_state().caps_lock || get_highest_layer(layer_state | default_layer_state)) { for (uint8_t i = led_min; i < led_max; i++) { diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc index fc3c00fbd9e4..2966fe25862a 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc @@ -19,6 +19,7 @@ RGB_MATRIX_EFFECT(HOLOGRAPHICS_UNDERGLOW) #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS +// This is a side lights only configuration where the solid color is following the current HSV setting. static bool SOLID_UNDERGLOW(effect_params_t* params) { RGB_MATRIX_USE_LIMITS(led_min, led_max); @@ -33,6 +34,7 @@ static bool SOLID_UNDERGLOW(effect_params_t* params) { return rgb_matrix_check_finished_leds(led_max); } +// This is a side lights only configuration where the color is set to a static gradient. static bool HOLOGRAPHICS_UNDERGLOW(effect_params_t* params) { RGB_MATRIX_USE_LIMITS(led_min, led_max); From e246c67f2efb20008d056f1c62c92959430d5e94 Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral <46639608+achrovisual@users.noreply.github.com> Date: Tue, 27 Dec 2022 23:25:10 +0800 Subject: [PATCH 10/12] Revert changes to rules.mk Co-authored-by: Joel Challis --- keyboards/gmmk/gmmk2/p65/ansi/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk index c10485ba2c8f..1cf9d7a7094c 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk +++ b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk @@ -18,6 +18,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. AUDIO_ENABLE = no # Audio output. RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. RGB_MATRIX_DRIVER = AW20216 # Enable RGB matrix effects. -RGB_MATRIX_CUSTOM_USER = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash From d631d0d4e696d2270633bbb9cda3a3dbc93e0f8b Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Tue, 27 Dec 2022 23:33:40 +0800 Subject: [PATCH 11/12] Enabled custom RGB Matrix effects at keymap level --- keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk new file mode 100644 index 000000000000..6245023e803f --- /dev/null +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk @@ -0,0 +1 @@ +RGB_MATRIX_CUSTOM_USER = yes From c8a5cbb3293e9719a9940e2339ba0b5358259358 Mon Sep 17 00:00:00 2001 From: Eugenio Pastoral Date: Sat, 31 Dec 2022 00:58:29 +0800 Subject: [PATCH 12/12] Added delete key in layer 1 --- keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c index cba0cd81c9b1..8ca676273bee 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _FL: Function Layer */ [_FL] = LAYOUT( - KC_GRV, 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_TOG, + KC_GRV, 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_DEL, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______,