Merge remote-tracking branch 'origin/master' into develop

4 files changed, 130 insertions, 0 deletions

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 0000000000..8ca676273b
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c
@@ -0,0 +1,56 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#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,    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)
+};
+
+// 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++) {
+            if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW
+                rgb_matrix_set_color(i, 0xff, 0xff, 0xff);
+            }
+        }
+    }
+    return false;
+};
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 0000000000..4f80a5b956
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md
@@ -0,0 +1 @@
+# ANSI GMMKV2 65% Layout
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 0000000000..2966fe2586
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc
@@ -0,0 +1,72 @@
+ /* 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 <http://www.gnu.org/licenses/>.
+  */
+
+RGB_MATRIX_EFFECT(SOLID_UNDERGLOW)
+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);
+
+    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);
+}
+
+// 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);
+
+    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 || i == 77) {
+                rgb_matrix_set_color(i, 0xff, 0x00, 0xee);
+            } else if (i == 68 || i == 78) {
+                rgb_matrix_set_color(i, 0xcc, 0x00, 0xff);
+            } else if (i == 69 || i == 79) {
+                rgb_matrix_set_color(i, 0x9e, 0x00, 0xff);
+            } else if (i == 70 || i == 80) {
+                rgb_matrix_set_color(i, 0x70, 0x00, 0xff);
+            } else if (i == 71 || i == 81) {
+                rgb_matrix_set_color(i, 0x52, 0x00, 0xff);
+            } else if (i == 72 || i == 82) {
+                rgb_matrix_set_color(i, 0x33, 0x00, 0xff);
+            } else if (i == 73 || i == 83) {
+                rgb_matrix_set_color(i, 0x00, 0x38, 0xff);
+            } else if (i == 74 || i == 84) {
+                rgb_matrix_set_color(i, 0x00, 0x57, 0xff);
+            } else if (i == 75 || i == 85) {
+                rgb_matrix_set_color(i, 0x00, 0x85, 0xff);
+            } else if (i == 76 || i == 86) {
+                rgb_matrix_set_color(i, 0x00, 0xb2, 0xff);
+            } else {
+                rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+            }
+        }
+    }
+    return rgb_matrix_check_finished_leds(led_max);
+}
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
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 0000000000..6245023e80
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_USER = yes