diff options
Diffstat (limited to 'keyboards/gmmk')
55 files changed, 853 insertions, 1371 deletions
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c index 28033da538..2ed8874491 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.h b/keyboards/gmmk/gmmk2/p65/ansi/ansi.h deleted file mode 100644 index 2c25a72bef..0000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -// ESC 1 2 3 4 5 6 7 8 9 0 - = BS Del -// Tab Q W E R T Y U I O P [ ] \ PgUp -// Caps A S D F G H J K L ; ' Enter PgDn -// Sh_L Z X C V B N M , . / Sh_R Up END -// Ct_L Win_L Alt_L SPACE Alt_R FN Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, k71, k25,\ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k76, k26,\ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k84, k65,\ - k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k07, k35, k01,\ - k06, k15, k23, k31, k36, k33, k03, k73, k05 \ -)\ -{\ - { k00, k01, ___, k03, ___, k05, k06, k07},\ - { k10, k11, k12, k13, k14, k15, ___, k17},\ - { k20, k21, k22, k23, k24, k25, k26, k27},\ - { k30, k31, k32, k33, k34, k35, k36, k37},\ - { k40, k41, k42, k43, k44, k45, k46, k47},\ - { k50, k51, k52, k53, k54, k55, k56, k57},\ - { k60, k61, k62, ___, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, ___, k76, k77},\ - { k80, k81, k82, k83, k84, k85, k86, k87} \ -} diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json index 76e6e89925..c22fe89f58 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x5045", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 3] }, @@ -16,79 +24,78 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "`", "x": 0, "y": 0 }, - { "label": "1", "x": 1, "y": 0 }, - { "label": "2", "x": 2, "y": 0 }, - { "label": "3", "x": 3, "y": 0 }, - { "label": "4", "x": 4, "y": 0 }, - { "label": "5", "x": 5, "y": 0 }, - { "label": "6", "x": 6, "y": 0 }, - { "label": "7", "x": 7, "y": 0 }, - { "label": "8", "x": 8, "y": 0 }, - { "label": "9", "x": 9, "y": 0 }, - { "label": "0", "x": 10, "y": 0 }, - { "label": "-", "x": 11, "y": 0 }, - { "label": "=", "x": 12, "y": 0 }, - { "label": "Backspace", "x": 13, "y": 0, "w": 2.25}, - { "label": "PgUp", "x": 15.25, "y": 0 }, - + {"matrix": [1, 3], "x": 0, "y": 0}, + {"matrix": [1, 7], "x": 1, "y": 0}, + {"matrix": [2, 7], "x": 2, "y": 0}, + {"matrix": [3, 7], "x": 3, "y": 0}, + {"matrix": [4, 7], "x": 4, "y": 0}, + {"matrix": [4, 6], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [6, 7], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [8, 7], "x": 10, "y": 0}, + {"matrix": [8, 6], "x": 11, "y": 0}, + {"matrix": [6, 6], "x": 12, "y": 0}, + {"matrix": [7, 1], "x": 13, "y": 0, "w": 2.25}, + {"matrix": [2, 5], "x": 15.25, "y": 0}, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "[", "x": 11.5, "y": 1 }, - { "label": "]", "x": 12.5, "y": 1 }, - { "label": "\\", "x": 13.5, "y": 1 , "w": 1.75}, - { "label": "PgDn", "x": 15.25, "y": 1 }, + {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [3, 0], "x": 3.5, "y": 1}, + {"matrix": [4, 0], "x": 4.5, "y": 1}, + {"matrix": [4, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 1], "x": 6.5, "y": 1}, + {"matrix": [5, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 0], "x": 8.5, "y": 1}, + {"matrix": [7, 0], "x": 9.5, "y": 1}, + {"matrix": [8, 0], "x": 10.5, "y": 1}, + {"matrix": [8, 1], "x": 11.5, "y": 1}, + {"matrix": [6, 1], "x": 12.5, "y": 1}, + {"matrix": [7, 6], "x": 13.5, "y": 1, "w": 1.75}, + {"matrix": [2, 6], "x": 15.25, "y": 1}, - { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ";", "x": 10.75, "y": 2 }, - { "label": "'", "x": 11.75, "y": 2 }, - { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "HOME", "x": 15.25, "y": 2 }, + {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 2], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [4, 3], "x": 5.75, "y": 2}, + {"matrix": [5, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 2], "x": 7.75, "y": 2}, + {"matrix": [6, 2], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [8, 2], "x": 10.75, "y": 2}, + {"matrix": [8, 3], "x": 11.75, "y": 2}, + {"matrix": [8, 4], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 5], "x": 15.25, "y": 2}, + {"matrix": [0, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 4], "x": 2.25, "y": 3}, + {"matrix": [2, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [4, 4], "x": 5.25, "y": 3}, + {"matrix": [4, 5], "x": 6.25, "y": 3}, + {"matrix": [5, 5], "x": 7.25, "y": 3}, + {"matrix": [5, 4], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 5], "x": 11.25, "y": 3}, + {"matrix": [0, 7], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 14.25, "y": 3}, + {"matrix": [0, 1], "x": 15.25, "y": 3}, - { "label": "Shift", "x": 0, "y": 3, "w": 2.25}, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": ",", "x": 9.25, "y": 3 }, - { "label": ".", "x": 10.25, "y": 3 }, - { "label": "/", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 3 }, - { "label": "END", "x": 15.25, "y": 3 }, + {"matrix": [0, 6], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [3, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [3, 3], "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 4, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 4, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 4, "w": 1.25}, - { "label": "FN", "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Left", "x": 13.25, "y": 4 }, - { "label": "Down", "x": 14.25, "y": 4 }, - { "label": "Right", "x": 15.25, "y": 4 } + {"matrix": [0, 3], "x": 13.25, "y": 4}, + {"matrix": [7, 3], "x": 14.25, "y": 4}, + {"matrix": [0, 5], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk index ed301944f4..1b4692a621 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk +++ b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. 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. EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h index c2483d675f..64febeb948 100644 --- a/keyboards/gmmk/gmmk2/p65/config.h +++ b/keyboards/gmmk/gmmk2/p65/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json index 5d5aba914e..de078864ce 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/info.json +++ b/keyboards/gmmk/gmmk2/p65/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x504A", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 3] }, @@ -16,80 +24,79 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "`", "x": 0, "y": 0 }, - { "label": "1", "x": 1, "y": 0 }, - { "label": "2", "x": 2, "y": 0 }, - { "label": "3", "x": 3, "y": 0 }, - { "label": "4", "x": 4, "y": 0 }, - { "label": "5", "x": 5, "y": 0 }, - { "label": "6", "x": 6, "y": 0 }, - { "label": "7", "x": 7, "y": 0 }, - { "label": "8", "x": 8, "y": 0 }, - { "label": "9", "x": 9, "y": 0 }, - { "label": "0", "x": 10, "y": 0 }, - { "label": "-", "x": 11, "y": 0 }, - { "label": "=", "x": 12, "y": 0 }, - { "label": "Backspace", "x": 13, "y": 0, "w": 2.25}, - { "label": "PgUp", "x": 15.25, "y": 0 }, - + {"matrix": [1, 3], "x": 0, "y": 0}, + {"matrix": [1, 7], "x": 1, "y": 0}, + {"matrix": [2, 7], "x": 2, "y": 0}, + {"matrix": [3, 7], "x": 3, "y": 0}, + {"matrix": [4, 7], "x": 4, "y": 0}, + {"matrix": [4, 6], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [6, 7], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [8, 7], "x": 10, "y": 0}, + {"matrix": [8, 6], "x": 11, "y": 0}, + {"matrix": [6, 6], "x": 12, "y": 0}, + {"matrix": [7, 1], "x": 13, "y": 0, "w": 2.25}, + {"matrix": [2, 5], "x": 15.25, "y": 0}, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "[", "x": 11.5, "y": 1 }, - { "label": "]", "x": 12.5, "y": 1 }, - { "label": "Enter", "x": 13.5, "y": 1 ,"h":2, "w": 1.75}, - { "label": "PgDn", "x": 15.25, "y": 1 }, + {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [3, 0], "x": 3.5, "y": 1}, + {"matrix": [4, 0], "x": 4.5, "y": 1}, + {"matrix": [4, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 1], "x": 6.5, "y": 1}, + {"matrix": [5, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 0], "x": 8.5, "y": 1}, + {"matrix": [7, 0], "x": 9.5, "y": 1}, + {"matrix": [8, 0], "x": 10.5, "y": 1}, + {"matrix": [8, 1], "x": 11.5, "y": 1}, + {"matrix": [6, 1], "x": 12.5, "y": 1}, + {"matrix": [8, 4], "x": 13.5, "y": 1, "w": 1.75, "h": 2}, + {"matrix": [2, 6], "x": 15.25, "y": 1}, - { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ";", "x": 10.75, "y": 2 }, - { "label": "'", "x": 11.75, "y": 2 }, - { "label": "#", "x": 12.75, "y": 2 }, - { "label": "HOME", "x": 15.25, "y": 2 }, + {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 2], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [4, 3], "x": 5.75, "y": 2}, + {"matrix": [5, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 2], "x": 7.75, "y": 2}, + {"matrix": [6, 2], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [8, 2], "x": 10.75, "y": 2}, + {"matrix": [8, 3], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 15.25, "y": 2}, + {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 2], "x": 1.25, "y": 3}, + {"matrix": [1, 4], "x": 2.25, "y": 3}, + {"matrix": [2, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [4, 4], "x": 5.25, "y": 3}, + {"matrix": [4, 5], "x": 6.25, "y": 3}, + {"matrix": [5, 5], "x": 7.25, "y": 3}, + {"matrix": [5, 4], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 5], "x": 11.25, "y": 3}, + {"matrix": [0, 7], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 14.25, "y": 3}, + {"matrix": [0, 1], "x": 15.25, "y": 3}, - { "label": "Shift", "x": 0, "y": 3, "w": 1.25}, - { "label": "\\", "x": 1.25, "y": 3 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": ",", "x": 9.25, "y": 3 }, - { "label": ".", "x": 10.25, "y": 3 }, - { "label": "/", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 3 }, - { "label": "END", "x": 15.25, "y": 3 }, + {"matrix": [0, 6], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [3, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [3, 3], "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 4, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 4, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 4, "w": 1.25}, - { "label": "FN", "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Left", "x": 13.25, "y": 4 }, - { "label": "Down", "x": 14.25, "y": 4 }, - { "label": "Right", "x": 15.25, "y": 4 } + {"matrix": [0, 3], "x": 13.25, "y": 4}, + {"matrix": [7, 3], "x": 14.25, "y": 4}, + {"matrix": [0, 5], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c index 1a70353829..a296844f44 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/iso.c +++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.h b/keyboards/gmmk/gmmk2/p65/iso/iso.h deleted file mode 100644 index 206647cf79..0000000000 --- a/keyboards/gmmk/gmmk2/p65/iso/iso.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -// ESC 1 2 3 4 5 6 7 8 9 0 - = BS PgUp -// Tab Q W E R T Y U I O P [ ] Enter PgUp -// Caps A S D F G H J K L ; ' \ Enter HOME -// Sh_L \ Z X C V B N M , . / Sh_R Up END -// Ct_L Win_L Alt_L SPACE Alt_R FN Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, k71, k25,\ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k84, k26,\ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k75, k65,\ - k00, k02, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k07, k35, k01,\ - k06, k15, k23, k31, k36, k33, k03, k73, k05 \ -)\ -{\ - { k00, k01, k02, k03, ___, k05, k06, k07},\ - { k10, k11, k12, k13, k14, k15, ___, k17},\ - { k20, k21, k22, k23, k24, k25, k26, k27},\ - { k30, k31, k32, k33, k34, k35, k36, k37},\ - { k40, k41, k42, k43, k44, k45, k46, k47},\ - { k50, k51, k52, k53, k54, k55, k56, k57},\ - { k60, k61, k62, ___, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, k75, ___, k77},\ - { k80, k81, k82, k83, k84, k85, k86, k87} \ -} diff --git a/keyboards/gmmk/gmmk2/p65/iso/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/rules.mk index ed301944f4..1b4692a621 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/rules.mk +++ b/keyboards/gmmk/gmmk2/p65/iso/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. 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. EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/gmmk/gmmk2/p65/p65.c b/keyboards/gmmk/gmmk2/p65/p65.c deleted file mode 100644 index d7e06f6488..0000000000 --- a/keyboards/gmmk/gmmk2/p65/p65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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 "p65.h" diff --git a/keyboards/gmmk/gmmk2/p65/p65.h b/keyboards/gmmk/gmmk2/p65/p65.h deleted file mode 100644 index 7a6339c2e0..0000000000 --- a/keyboards/gmmk/gmmk2/p65/p65.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_gmmk_gmmk2_p65_ansi) -# include "ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_gmmk2_p65_iso) -# include "iso/iso.h" -#endif // GMMK V2 revisions diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c index 808b175555..467765e435 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c +++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.h b/keyboards/gmmk/gmmk2/p96/ansi/ansi.h deleted file mode 100644 index d449a198df..0000000000 --- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Del Ins PgUp PgDn -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Num / * - -// Tab Q W E R T Y U I O P [ ] \\ 7 8 9 + -// Caps A S D F G H J K L ; ' Enter 4 5 6 + -// Sh_L Z X C V B N M , . / Sh_R Up 1 2 3 Enter -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right 0 . Enter - -// clang-format off -#define LAYOUT( \ - k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, k06, k16, k26, k36,\ - k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, k46, k56, k66, k76,\ - k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, k86, k96, ka6, kb6,\ - k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kd3, ka7, kb7, kc7, \ - k04, k24, k34, k44, k54, k64, k74, k84, k94, ka4, kb4, kd4, k17, k67, k77, k87, k97,\ - k05, k15, k25, k65, k95, ka5, kc5, k07, k27, k37, k47, k57 \ -)\ -{\ - { k00, k01, k02, k03, k04, k05, k06, k07},\ - { k10, k11, k12, k13, ___, k15, k16, k17},\ - { k20, k21, k22, k23, k24, k25, k26, k27},\ - { k30, k31, k32, k33, k34, ___, k36, k37},\ - { k40, k41, k42, k43, k44, ___, k46, k47},\ - { k50, k51, k52, k53, k54, ___, k56, k57},\ - { k60, k61, k62, k63, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, ___, k76, k77},\ - { k80, k81, k82, k83, k84, ___, k86, k87},\ - { k90, k91, k92, k93, k94, k95, k96, k97},\ - { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7},\ - { kb0, kb1, kb2, kb3, kb4, ___, kb6, kb7},\ - { kc0, kc1, kc2, ___, ___, kc5, ___, kc7},\ - { kd0, kd1, kd2, kd3, kd4, ___, ___, ___} \ -} diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index f5b05748c7..482e52f504 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -8,119 +8,135 @@ "pid": "0x504B", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ - { "label": "ESC", "x": 0, "y": 0 }, - - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - - { "label": "Printscreen", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.5, "y": 0 }, - { "label": "Insert", "x": 16.5, "y": 0 }, - { "label": "Page Up", "x": 17.5, "y": 0 }, - { "label": "Page Down", "x": 18.5, "y": 0 }, - - { "label": "`", "x": 0, "y": 1 }, - { "label": "1", "x": 1, "y": 1 }, - { "label": "2", "x": 2, "y": 1 }, - { "label": "3", "x": 3, "y": 1 }, - { "label": "4", "x": 4, "y": 1 }, - { "label": "5", "x": 5, "y": 1 }, - { "label": "6", "x": 6, "y": 1 }, - { "label": "7", "x": 7, "y": 1 }, - { "label": "8", "x": 8, "y": 1 }, - { "label": "9", "x": 9, "y": 1 }, - { "label": "0", "x": 10, "y": 1 }, - { "label": "-", "x": 11, "y": 1 }, - { "label": "=", "x": 12, "y": 1 }, - { "label": "Backspace", "x": 13, "y": 1, "w": 2}, - { "label": "Num Lock", "x": 15.5, "y": 1 }, - { "label": "/", "x": 16.5, "y": 1 }, - { "label": "*", "x": 17.5, "y": 1 }, - { "label": "-", "x": 18.5, "y": 1 }, - - { "label": "Tab", "x": 0, "y": 2, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 2 }, - { "label": "W", "x": 2.5, "y": 2 }, - { "label": "E", "x": 3.5, "y": 2 }, - { "label": "R", "x": 4.5, "y": 2 }, - { "label": "T", "x": 5.5, "y": 2 }, - { "label": "Y", "x": 6.5, "y": 2 }, - { "label": "U", "x": 7.5, "y": 2 }, - { "label": "I", "x": 8.5, "y": 2 }, - { "label": "O", "x": 9.5, "y": 2 }, - { "label": "P", "x": 10.5, "y": 2 }, - { "label": "[", "x": 11.5, "y": 2 }, - { "label": "]", "x": 12.5, "y": 2 }, - { "label": "\\", "x": 13.5, "y": 2 , "w": 1.25}, - { "label": "7", "x": 15.5, "y": 2 }, - { "label": "8", "x": 16.5, "y": 2 }, - { "label": "9", "x": 17.5, "y": 2, "w": 1.5}, - { "label": "+", "x": 18.5, "y": 2 ,"h":2}, - - { "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 3 }, - { "label": "S", "x": 2.75, "y": 3 }, - { "label": "D", "x": 3.75, "y": 3 }, - { "label": "F", "x": 4.75, "y": 3 }, - { "label": "G", "x": 5.75, "y": 3 }, - { "label": "H", "x": 6.75, "y": 3 }, - { "label": "J", "x": 7.75, "y": 3 }, - { "label": "K", "x": 8.75, "y": 3 }, - { "label": "L", "x": 9.75, "y": 3 }, - { "label": ";", "x": 10.75, "y": 3 }, - { "label": "'", "x": 11.75, "y": 3 }, - { "label": "Enter", "x": 12.75, "y": 3, "w": 2.25 }, - { "label": "4", "x": 15.5, "y": 3 }, - { "label": "5", "x": 16.5, "y": 3 }, - { "label": "6", "x": 17.5, "y": 3 }, - - { "label": "Shift", "x": 0, "y": 4, "w": 2.25}, - { "label": "Z", "x": 2.25, "y": 4 }, - { "label": "X", "x": 3.25, "y": 4 }, - { "label": "C", "x": 4.25, "y": 4 }, - { "label": "V", "x": 5.25, "y": 4 }, - { "label": "B", "x": 6.25, "y": 4 }, - { "label": "N", "x": 7.25, "y": 4 }, - { "label": "M", "x": 8.25, "y": 4 }, - { "label": ",", "x": 9.25, "y": 4 }, - { "label": ".", "x": 10.25, "y": 4 }, - { "label": "/", "x": 11.25, "y": 4 }, - { "label": "Shift", "x": 12.25, "y": 4, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 4 }, - { "label": "1", "x": 15.5, "y": 4 }, - { "label": "2", "x": 16.5, "y": 4 }, - { "label": "3", "x": 17.5, "y": 4 }, - { "label": "Enter", "x": 18.5, "y": 4 ,"h":2}, - - { "label": "Ctrl", "x": 0, "y": 5, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 5, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 5, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 5, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 5 }, - { "label": "FN", "x": 11, "y": 5 }, - { "label": "Ctrl", "x": 12, "y": 5 }, - { "label": "Left", "x": 13.25, "y": 5 }, - { "label": "Down", "x": 14.25, "y": 5 }, - { "label": "Right", "x": 15.25, "y": 5 }, - { "label": "0", "x": 16.5, "y": 5 }, - { "label": ".", "x": 17.5, "y": 5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [2, 0], "x": 2.25, "y": 0}, + {"matrix": [3, 0], "x": 3.25, "y": 0}, + {"matrix": [4, 0], "x": 4.25, "y": 0}, + + {"matrix": [5, 0], "x": 5.5, "y": 0}, + {"matrix": [6, 0], "x": 6.5, "y": 0}, + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [8, 0], "x": 8.5, "y": 0}, + + {"matrix": [9, 0], "x": 9.75, "y": 0}, + {"matrix": [10, 0], "x": 10.75, "y": 0}, + {"matrix": [11, 0], "x": 11.75, "y": 0}, + {"matrix": [12, 0], "x": 12.75, "y": 0}, + + {"matrix": [13, 0], "x": 14, "y": 0}, + + {"matrix": [0, 6], "x": 15.5, "y": 0}, + {"matrix": [1, 6], "x": 16.5, "y": 0}, + {"matrix": [2, 6], "x": 17.5, "y": 0}, + {"matrix": [3, 6], "x": 18.5, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [4, 1], "x": 4, "y": 1}, + {"matrix": [5, 1], "x": 5, "y": 1}, + {"matrix": [6, 1], "x": 6, "y": 1}, + {"matrix": [7, 1], "x": 7, "y": 1}, + {"matrix": [8, 1], "x": 8, "y": 1}, + {"matrix": [9, 1], "x": 9, "y": 1}, + {"matrix": [10, 1], "x": 10, "y": 1}, + {"matrix": [11, 1], "x": 11, "y": 1}, + {"matrix": [12, 1], "x": 12, "y": 1}, + {"matrix": [13, 1], "x": 13, "y": 1, "w": 2}, + + {"matrix": [4, 6], "x": 15.5, "y": 1}, + {"matrix": [5, 6], "x": 16.5, "y": 1}, + {"matrix": [6, 6], "x": 17.5, "y": 1}, + {"matrix": [7, 6], "x": 18.5, "y": 1}, + + {"matrix": [0, 2], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 2], "x": 3.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2}, + {"matrix": [5, 2], "x": 5.5, "y": 2}, + {"matrix": [6, 2], "x": 6.5, "y": 2}, + {"matrix": [7, 2], "x": 7.5, "y": 2}, + {"matrix": [8, 2], "x": 8.5, "y": 2}, + {"matrix": [9, 2], "x": 9.5, "y": 2}, + {"matrix": [10, 2], "x": 10.5, "y": 2}, + {"matrix": [11, 2], "x": 11.5, "y": 2}, + {"matrix": [12, 2], "x": 12.5, "y": 2}, + {"matrix": [13, 2], "x": 13.5, "y": 2, "w": 1.25}, + + {"matrix": [8, 6], "x": 15.5, "y": 2}, + {"matrix": [9, 6], "x": 16.5, "y": 2}, + {"matrix": [10, 6], "x": 17.5, "y": 2, "w": 1.5}, + {"matrix": [11, 6], "x": 18.5, "y": 2, "h": 2}, + + {"matrix": [0, 3], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [1, 3], "x": 1.75, "y": 3}, + {"matrix": [2, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [4, 3], "x": 4.75, "y": 3}, + {"matrix": [5, 3], "x": 5.75, "y": 3}, + {"matrix": [6, 3], "x": 6.75, "y": 3}, + {"matrix": [7, 3], "x": 7.75, "y": 3}, + {"matrix": [8, 3], "x": 8.75, "y": 3}, + {"matrix": [9, 3], "x": 9.75, "y": 3}, + {"matrix": [10, 3], "x": 10.75, "y": 3}, + {"matrix": [11, 3], "x": 11.75, "y": 3}, + {"matrix": [13, 3], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [10, 7], "x": 15.5, "y": 3}, + {"matrix": [11, 7], "x": 16.5, "y": 3}, + {"matrix": [12, 7], "x": 17.5, "y": 3}, + + {"matrix": [0, 4], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [2, 4], "x": 2.25, "y": 4}, + {"matrix": [3, 4], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 4], "x": 5.25, "y": 4}, + {"matrix": [6, 4], "x": 6.25, "y": 4}, + {"matrix": [7, 4], "x": 7.25, "y": 4}, + {"matrix": [8, 4], "x": 8.25, "y": 4}, + {"matrix": [9, 4], "x": 9.25, "y": 4}, + {"matrix": [10, 4], "x": 10.25, "y": 4}, + {"matrix": [11, 4], "x": 11.25, "y": 4}, + {"matrix": [13, 4], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [1, 7], "x": 14.25, "y": 4}, + + {"matrix": [6, 7], "x": 15.5, "y": 4}, + {"matrix": [7, 7], "x": 16.5, "y": 4}, + {"matrix": [8, 7], "x": 17.5, "y": 4}, + {"matrix": [9, 7], "x": 18.5, "y": 4, "h": 2}, + + {"matrix": [0, 5], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5}, + {"matrix": [10, 5], "x": 11, "y": 5}, + {"matrix": [12, 5], "x": 12, "y": 5}, + + {"matrix": [0, 7], "x": 13.25, "y": 5}, + {"matrix": [2, 7], "x": 14.25, "y": 5}, + {"matrix": [3, 7], "x": 15.25, "y": 5}, + + {"matrix": [4, 7], "x": 16.5, "y": 5}, + {"matrix": [5, 7], "x": 17.5, "y": 5} ] } } diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk index 4230665e7c..a076e01916 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk +++ b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. 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. EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h index 19cab78423..16aae9b330 100644 --- a/keyboards/gmmk/gmmk2/p96/config.h +++ b/keyboards/gmmk/gmmk2/p96/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index a2f377615b..de9eb07edc 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -8,120 +8,136 @@ "pid": "0x505A", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ - { "label": "ESC", "x": 0, "y": 0 }, - - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - - { "label": "Printscreen", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.5, "y": 0 }, - { "label": "Insert", "x": 16.5, "y": 0 }, - { "label": "Page Up", "x": 17.5, "y": 0 }, - { "label": "Page Down", "x": 18.5, "y": 0 }, - - { "label": "`", "x": 0, "y": 1 }, - { "label": "1", "x": 1, "y": 1 }, - { "label": "2", "x": 2, "y": 1 }, - { "label": "3", "x": 3, "y": 1 }, - { "label": "4", "x": 4, "y": 1 }, - { "label": "5", "x": 5, "y": 1 }, - { "label": "6", "x": 6, "y": 1 }, - { "label": "7", "x": 7, "y": 1 }, - { "label": "8", "x": 8, "y": 1 }, - { "label": "9", "x": 9, "y": 1 }, - { "label": "0", "x": 10, "y": 1 }, - { "label": "-", "x": 11, "y": 1 }, - { "label": "=", "x": 12, "y": 1 }, - { "label": "Backspace", "x": 13, "y": 1, "w": 2}, - { "label": "Num Lock", "x": 15.5, "y": 1 }, - { "label": "/", "x": 16.5, "y": 1 }, - { "label": "*", "x": 17.5, "y": 1 }, - { "label": "-", "x": 18.5, "y": 1 }, - - { "label": "Tab", "x": 0, "y": 2, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 2 }, - { "label": "W", "x": 2.5, "y": 2 }, - { "label": "E", "x": 3.5, "y": 2 }, - { "label": "R", "x": 4.5, "y": 2 }, - { "label": "T", "x": 5.5, "y": 2 }, - { "label": "Y", "x": 6.5, "y": 2 }, - { "label": "U", "x": 7.5, "y": 2 }, - { "label": "I", "x": 8.5, "y": 2 }, - { "label": "O", "x": 9.5, "y": 2 }, - { "label": "P", "x": 10.5, "y": 2 }, - { "label": "[", "x": 11.5, "y": 2 }, - { "label": "]", "x": 12.5, "y": 2 }, - { "label": "Enter", "x": 13.5, "y": 2 ,"h":2, "w": 1.25}, - { "label": "7", "x": 15.5, "y": 2 }, - { "label": "8", "x": 16.5, "y": 2 }, - { "label": "9", "x": 17.5, "y": 2, "w": 1.5}, - { "label": "+", "x": 18.5, "y": 2 ,"h":2}, - - { "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 3 }, - { "label": "S", "x": 2.75, "y": 3 }, - { "label": "D", "x": 3.75, "y": 3 }, - { "label": "F", "x": 4.75, "y": 3 }, - { "label": "G", "x": 5.75, "y": 3 }, - { "label": "H", "x": 6.75, "y": 3 }, - { "label": "J", "x": 7.75, "y": 3 }, - { "label": "K", "x": 8.75, "y": 3 }, - { "label": "L", "x": 9.75, "y": 3 }, - { "label": ";", "x": 10.75, "y": 3 }, - { "label": "'", "x": 11.75, "y": 3 }, - { "label": "#", "x": 12.75, "y": 3 }, - { "label": "4", "x": 15.5, "y": 3 }, - { "label": "5", "x": 16.5, "y": 3 }, - { "label": "6", "x": 17.5, "y": 3 }, - - { "label": "Shift", "x": 0, "y": 4, "w": 1.25}, - { "label": "\\", "x": 1.25, "y": 4 }, - { "label": "Z", "x": 2.25, "y": 4 }, - { "label": "X", "x": 3.25, "y": 4 }, - { "label": "C", "x": 4.25, "y": 4 }, - { "label": "V", "x": 5.25, "y": 4 }, - { "label": "B", "x": 6.25, "y": 4 }, - { "label": "N", "x": 7.25, "y": 4 }, - { "label": "M", "x": 8.25, "y": 4 }, - { "label": ",", "x": 9.25, "y": 4 }, - { "label": ".", "x": 10.25, "y": 4 }, - { "label": "/", "x": 11.25, "y": 4 }, - { "label": "Shift", "x": 12.25, "y": 4, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 4 }, - { "label": "1", "x": 15.5, "y": 4 }, - { "label": "2", "x": 16.5, "y": 4 }, - { "label": "3", "x": 17.5, "y": 4 }, - { "label": "Enter", "x": 18.5, "y": 4 ,"h":2}, - - { "label": "Ctrl", "x": 0, "y": 5, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 5, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 5, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 5, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 5 }, - { "label": "FN", "x": 11, "y": 5 }, - { "label": "Ctrl", "x": 12, "y": 5 }, - { "label": "Left", "x": 13.25, "y": 5 }, - { "label": "Down", "x": 14.25, "y": 5 }, - { "label": "Right", "x": 15.25, "y": 5 }, - { "label": "0", "x": 16.5, "y": 5 }, - { "label": ".", "x": 17.5, "y": 5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [2, 0], "x": 2.25, "y": 0}, + {"matrix": [3, 0], "x": 3.25, "y": 0}, + {"matrix": [4, 0], "x": 4.25, "y": 0}, + + {"matrix": [5, 0], "x": 5.5, "y": 0}, + {"matrix": [6, 0], "x": 6.5, "y": 0}, + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [8, 0], "x": 8.5, "y": 0}, + + {"matrix": [9, 0], "x": 9.75, "y": 0}, + {"matrix": [10, 0], "x": 10.75, "y": 0}, + {"matrix": [11, 0], "x": 11.75, "y": 0}, + {"matrix": [12, 0], "x": 12.75, "y": 0}, + + {"matrix": [13, 0], "x": 14, "y": 0}, + + {"matrix": [0, 6], "x": 15.5, "y": 0}, + {"matrix": [1, 6], "x": 16.5, "y": 0}, + {"matrix": [2, 6], "x": 17.5, "y": 0}, + {"matrix": [3, 6], "x": 18.5, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [4, 1], "x": 4, "y": 1}, + {"matrix": [5, 1], "x": 5, "y": 1}, + {"matrix": [6, 1], "x": 6, "y": 1}, + {"matrix": [7, 1], "x": 7, "y": 1}, + {"matrix": [8, 1], "x": 8, "y": 1}, + {"matrix": [9, 1], "x": 9, "y": 1}, + {"matrix": [10, 1], "x": 10, "y": 1}, + {"matrix": [11, 1], "x": 11, "y": 1}, + {"matrix": [12, 1], "x": 12, "y": 1}, + {"matrix": [13, 1], "x": 13, "y": 1, "w": 2}, + + {"matrix": [4, 6], "x": 15.5, "y": 1}, + {"matrix": [5, 6], "x": 16.5, "y": 1}, + {"matrix": [6, 6], "x": 17.5, "y": 1}, + {"matrix": [7, 6], "x": 18.5, "y": 1}, + + {"matrix": [0, 2], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 2], "x": 3.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2}, + {"matrix": [5, 2], "x": 5.5, "y": 2}, + {"matrix": [6, 2], "x": 6.5, "y": 2}, + {"matrix": [7, 2], "x": 7.5, "y": 2}, + {"matrix": [8, 2], "x": 8.5, "y": 2}, + {"matrix": [9, 2], "x": 9.5, "y": 2}, + {"matrix": [10, 2], "x": 10.5, "y": 2}, + {"matrix": [11, 2], "x": 11.5, "y": 2}, + {"matrix": [12, 2], "x": 12.5, "y": 2}, + {"matrix": [13, 3], "x": 13.5, "y": 2, "w": 1.25, "h": 2}, + + {"matrix": [8, 6], "x": 15.5, "y": 2}, + {"matrix": [9, 6], "x": 16.5, "y": 2}, + {"matrix": [10, 6], "x": 17.5, "y": 2, "w": 1.5}, + {"matrix": [11, 6], "x": 18.5, "y": 2, "h": 2}, + + {"matrix": [0, 3], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [1, 3], "x": 1.75, "y": 3}, + {"matrix": [2, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [4, 3], "x": 4.75, "y": 3}, + {"matrix": [5, 3], "x": 5.75, "y": 3}, + {"matrix": [6, 3], "x": 6.75, "y": 3}, + {"matrix": [7, 3], "x": 7.75, "y": 3}, + {"matrix": [8, 3], "x": 8.75, "y": 3}, + {"matrix": [9, 3], "x": 9.75, "y": 3}, + {"matrix": [10, 3], "x": 10.75, "y": 3}, + {"matrix": [11, 3], "x": 11.75, "y": 3}, + {"matrix": [12, 3], "x": 12.75, "y": 3}, + + {"matrix": [10, 7], "x": 15.5, "y": 3}, + {"matrix": [11, 7], "x": 16.5, "y": 3}, + {"matrix": [12, 7], "x": 17.5, "y": 3}, + + {"matrix": [0, 4], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 4], "x": 1.25, "y": 4}, + {"matrix": [2, 4], "x": 2.25, "y": 4}, + {"matrix": [3, 4], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 4], "x": 5.25, "y": 4}, + {"matrix": [6, 4], "x": 6.25, "y": 4}, + {"matrix": [7, 4], "x": 7.25, "y": 4}, + {"matrix": [8, 4], "x": 8.25, "y": 4}, + {"matrix": [9, 4], "x": 9.25, "y": 4}, + {"matrix": [10, 4], "x": 10.25, "y": 4}, + {"matrix": [11, 4], "x": 11.25, "y": 4}, + {"matrix": [13, 4], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [1, 7], "x": 14.25, "y": 4}, + + {"matrix": [6, 7], "x": 15.5, "y": 4}, + {"matrix": [7, 7], "x": 16.5, "y": 4}, + {"matrix": [8, 7], "x": 17.5, "y": 4}, + {"matrix": [9, 7], "x": 18.5, "y": 4, "h": 2}, + + {"matrix": [0, 5], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5}, + {"matrix": [10, 5], "x": 11, "y": 5}, + {"matrix": [12, 5], "x": 12, "y": 5}, + + {"matrix": [0, 7], "x": 13.25, "y": 5}, + {"matrix": [2, 7], "x": 14.25, "y": 5}, + {"matrix": [3, 7], "x": 15.25, "y": 5}, + + {"matrix": [4, 7], "x": 16.5, "y": 5}, + {"matrix": [5, 7], "x": 17.5, "y": 5} ] } } diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c index dc9f7be682..40d28818b0 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/iso.c +++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.h b/keyboards/gmmk/gmmk2/p96/iso/iso.h deleted file mode 100644 index f575befdc1..0000000000 --- a/keyboards/gmmk/gmmk2/p96/iso/iso.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Del Ins PgUp PgDn -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Num / * - -// Tab Q W E R T Y U I O P [ ] Enter 7 8 9 + -// Caps A S D F G H J K L ; ' # Enter 4 5 6 + -// Sh_L \ Z X C V B N M , . / Sh_R Up 1 2 3 Enter -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right 0 . Enter - -// clang-format off -#define LAYOUT( \ - k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, k06, k16, k26, k36,\ - k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, k46, k56, k66, k76,\ - k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd3, k86, k96, ka6, kb6,\ - k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, ka7, kb7, kc7, \ - k04, k14, k24, k34, k44, k54, k64, k74, k84, k94, ka4, kb4, kd4, k17, k67, k77, k87, k97,\ - k05, k15, k25, k65, k95, ka5, kc5, k07, k27, k37, k47, k57 \ -)\ -{\ - { k00, k01, k02, k03, k04, k05, k06, k07},\ - { k10, k11, k12, k13, k14, k15, k16, k17},\ - { k20, k21, k22, k23, k24, k25, k26, k27},\ - { k30, k31, k32, k33, k34, ___, k36, k37},\ - { k40, k41, k42, k43, k44, ___, k46, k47},\ - { k50, k51, k52, k53, k54, ___, k56, k57},\ - { k60, k61, k62, k63, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, ___, k76, k77},\ - { k80, k81, k82, k83, k84, ___, k86, k87},\ - { k90, k91, k92, k93, k94, k95, k96, k97},\ - { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7},\ - { kb0, kb1, kb2, kb3, kb4, ___, kb6, kb7},\ - { kc0, kc1, kc2, kc3, ___, kc5, ___, kc7},\ - { kd0, kd1, ___, kd3, kd4, ___, ___, ___} \ -} diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk index 4230665e7c..a076e01916 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/rules.mk +++ b/keyboards/gmmk/gmmk2/p96/iso/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. 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. EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash diff --git a/keyboards/gmmk/gmmk2/p96/p96.c b/keyboards/gmmk/gmmk2/p96/p96.c deleted file mode 100644 index 47edcfe1ad..0000000000 --- a/keyboards/gmmk/gmmk2/p96/p96.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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 "p96.h" diff --git a/keyboards/gmmk/gmmk2/p96/p96.h b/keyboards/gmmk/gmmk2/p96/p96.h deleted file mode 100644 index e7b37d6816..0000000000 --- a/keyboards/gmmk/gmmk2/p96/p96.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_gmmk_gmmk2_p96_ansi) -# include "ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_gmmk2_p96_iso) -# include "iso/iso.h" -#endif // GMMK V2 revisions diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json index d5ea534b67..4df94d45ee 100644 --- a/keyboards/gmmk/numpad/info.json +++ b/keyboards/gmmk/numpad/info.json @@ -13,6 +13,9 @@ {"pin_a": "A2", "pin_b": "A1"} ] }, + "rgb_matrix": { + "driver": "AW20216" + }, "processor": "WB32F3G71", "bootloader": "wb32-dfu", "diode_direction": "ROW2COL", @@ -27,7 +30,7 @@ {"label": "/", "matrix": [0, 1], "x": 1, "y": 0}, {"label": "*", "matrix": [0, 2], "x": 2, "y": 0}, {"label": "-", "matrix": [0, 3], "x": 3, "y": 0}, - + {"label": "7", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "8", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "9", "matrix": [1, 2], "x": 2, "y": 1}, diff --git a/keyboards/gmmk/numpad/keymaps/via/keymap.c b/keyboards/gmmk/numpad/keymaps/via/keymap.c index aa7730acdd..12f124894d 100644 --- a/keyboards/gmmk/numpad/keymaps/via/keymap.c +++ b/keyboards/gmmk/numpad/keymaps/via/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c index ed4fed2667..f1a46170fd 100644 --- a/keyboards/gmmk/numpad/numpad.c +++ b/keyboards/gmmk/numpad/numpad.c @@ -120,17 +120,3 @@ void keyboard_pre_init_user(void) { # endif #endif - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - return true; -} -#endif diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk index 4d23ffbfaf..5a0d3e34f8 100644 --- a/keyboards/gmmk/numpad/rules.mk +++ b/keyboards/gmmk/numpad/rules.mk @@ -15,7 +15,6 @@ KEYBOARD_SHARED_EP = yes MIDI_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = AW20216 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index c633d722a0..8188418469 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/pro/pro.c b/keyboards/gmmk/pro/pro.c deleted file mode 100644 index 6aed1d6e18..0000000000 --- a/keyboards/gmmk/pro/pro.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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 "pro.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - return false; -} -#endif diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h deleted file mode 100644 index c83d6c99c5..0000000000 --- a/keyboards/gmmk/pro/pro.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - -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/>. -*/ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_gmmk_pro_rev1_ansi) -# include "rev1/ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_pro_rev1_iso) -# include "rev1/iso/iso.h" -#elif defined(KEYBOARD_gmmk_pro_rev2_ansi) -# include "rev2/ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_pro_rev2_iso) -# include "rev2/iso/iso.h" -#endif // GMMK Pro revisions diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c index 3fc45d61d0..9cd6a3739c 100644 --- a/keyboards/gmmk/pro/rev1/ansi/ansi.c +++ b/keyboards/gmmk/pro/rev1/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h deleted file mode 100644 index ab08d66592..0000000000 --- a/keyboards/gmmk/pro/rev1/ansi/ansi.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Gigahawk - * - * 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/>. - */ - -#pragma once - -#include "pro.h" - -#define ___ KC_NO - -// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute) -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Del -// Tab Q W E R T Y U I O P [ ] \ PgUp -// Caps A S D F G H J K L ; ' Enter PgDn -// Sh_L Z X C V B N M , . / Sh_R Up End -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97, k01, \ - k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1, k65, \ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, ka2, k15, \ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, ka4, k25, \ - k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k91, k35, k75, \ - k06, k90, k93, k94, k95, k92, k04, k03, k73, k05 \ -) \ -{ \ - { k00, k01, ___, k03, k04, k05, k06, k07}, \ - { k10, k11, k12, k13, k14, k15, k16, k17}, \ - { k20, k21, k22, ___, k24, k25, k26, k27}, \ - { k30, k31, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, k42, k43, k44, k45, k46, k47}, \ - { k50, k51, k52, k53, k54, k55, k56, k57}, \ - { k60, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, k76, k77}, \ - { k80, k81, k82, k83, ___, k85, k86, k87}, \ - { k90, k91, k92, k93, k94, k95, ___, k97}, \ - { ___, ka1, ka2, ka3, ka4, ka5, ka6, ka7} \ -} -// clang-format on diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json index b8a7e94a82..7a1532424b 100644 --- a/keyboards/gmmk/pro/rev1/ansi/info.json +++ b/keyboards/gmmk/pro/rev1/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} @@ -21,104 +29,105 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - - {"x":14, "y":0}, - {"x":15.5, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - - {"x":15.5, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - - {"x":15.5, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":15.5, "y":3.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":1.75}, - - {"x":14.25, "y":4.5}, - - {"x":15.5, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25}, - {"x":11, "y":5.25}, - {"x":12, "y":5.25}, - - {"x":13.25, "y":5.5}, - {"x":14.25, "y":5.5}, - {"x":15.25, "y":5.5} + {"matrix": [1, 3], "x": 0, "y": 0}, + + {"matrix": [2, 6], "x": 1.25, "y": 0}, + {"matrix": [3, 6], "x": 2.25, "y": 0}, + {"matrix": [3, 1], "x": 3.25, "y": 0}, + {"matrix": [3, 3], "x": 4.25, "y": 0}, + + {"matrix": [0, 7], "x": 5.5, "y": 0}, + {"matrix": [6, 3], "x": 6.5, "y": 0}, + {"matrix": [7, 1], "x": 7.5, "y": 0}, + {"matrix": [7, 6], "x": 8.5, "y": 0}, + + {"matrix": [10, 6], "x": 9.75, "y": 0}, + {"matrix": [10, 7], "x": 10.75, "y": 0}, + {"matrix": [10, 3], "x": 11.75, "y": 0}, + {"matrix": [10, 5], "x": 12.75, "y": 0}, + + {"matrix": [9, 7], "x": 14, "y": 0}, + + {"matrix": [0, 1], "x": 15.5, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.25}, + {"matrix": [1, 7], "x": 1, "y": 1.25}, + {"matrix": [2, 7], "x": 2, "y": 1.25}, + {"matrix": [3, 7], "x": 3, "y": 1.25}, + {"matrix": [4, 7], "x": 4, "y": 1.25}, + {"matrix": [4, 6], "x": 5, "y": 1.25}, + {"matrix": [5, 6], "x": 6, "y": 1.25}, + {"matrix": [5, 7], "x": 7, "y": 1.25}, + {"matrix": [6, 7], "x": 8, "y": 1.25}, + {"matrix": [7, 7], "x": 9, "y": 1.25}, + {"matrix": [8, 7], "x": 10, "y": 1.25}, + {"matrix": [8, 6], "x": 11, "y": 1.25}, + {"matrix": [6, 6], "x": 12, "y": 1.25}, + {"matrix": [10, 1], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [6, 5], "x": 15.5, "y": 1.25}, + + {"matrix": [1, 1], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 2.25}, + {"matrix": [2, 0], "x": 2.5, "y": 2.25}, + {"matrix": [3, 0], "x": 3.5, "y": 2.25}, + {"matrix": [4, 0], "x": 4.5, "y": 2.25}, + {"matrix": [4, 1], "x": 5.5, "y": 2.25}, + {"matrix": [5, 1], "x": 6.5, "y": 2.25}, + {"matrix": [5, 0], "x": 7.5, "y": 2.25}, + {"matrix": [6, 0], "x": 8.5, "y": 2.25}, + {"matrix": [7, 0], "x": 9.5, "y": 2.25}, + {"matrix": [8, 0], "x": 10.5, "y": 2.25}, + {"matrix": [8, 1], "x": 11.5, "y": 2.25}, + {"matrix": [6, 1], "x": 12.5, "y": 2.25}, + {"matrix": [10, 2], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [1, 5], "x": 15.5, "y": 2.25}, + + {"matrix": [2, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"matrix": [4, 3], "x": 5.75, "y": 3.25}, + {"matrix": [5, 3], "x": 6.75, "y": 3.25}, + {"matrix": [5, 2], "x": 7.75, "y": 3.25}, + {"matrix": [6, 2], "x": 8.75, "y": 3.25}, + {"matrix": [7, 2], "x": 9.75, "y": 3.25}, + {"matrix": [8, 2], "x": 10.75, "y": 3.25}, + {"matrix": [8, 3], "x": 11.75, "y": 3.25}, + {"matrix": [10, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [2, 5], "x": 15.5, "y": 3.25}, + + {"matrix": [0, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [1, 4], "x": 2.25, "y": 4.25}, + {"matrix": [2, 4], "x": 3.25, "y": 4.25}, + {"matrix": [3, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [5, 5], "x": 7.25, "y": 4.25}, + {"matrix": [5, 4], "x": 8.25, "y": 4.25}, + {"matrix": [6, 4], "x": 9.25, "y": 4.25}, + {"matrix": [7, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [9, 1], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [3, 5], "x": 14.25, "y": 4.5}, + + {"matrix": [7, 5], "x": 15.5, "y": 4.25}, + + {"matrix": [0, 6], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [9, 3], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [9, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5.25}, + {"matrix": [9, 2], "x": 11, "y": 5.25}, + {"matrix": [0, 4], "x": 12, "y": 5.25}, + + {"matrix": [0, 3], "x": 13.25, "y": 5.5}, + {"matrix": [7, 3], "x": 14.25, "y": 5.5}, + {"matrix": [0, 5], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c index 1294d64fe8..d3c00ad364 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c index b595c1b843..ceddf81a77 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c @@ -113,7 +113,7 @@ bool rgb_matrix_indicators_user(void) { // Called on start -void dynamic_macro_record_start_user(void) { +void dynamic_macro_record_start_user(int8_t direction) { dprint("-- Recording Started\n"); layer_on(_UTILITY); } diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c index 303861c676..7daa154826 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP) }, [2] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }, diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c index 73e56752b7..663c827439 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c @@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/gmmk/pro/rev1/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk index 43949aa054..6d23fe350a 100644 --- a/keyboards/gmmk/pro/rev1/ansi/rules.mk +++ b/keyboards/gmmk/pro/rev1/ansi/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = AW20216 diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json index 48181ec488..7b78ca5716 100644 --- a/keyboards/gmmk/pro/rev1/iso/info.json +++ b/keyboards/gmmk/pro/rev1/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} @@ -21,105 +29,106 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - - {"label":"Printscreen", "x":14, "y":0}, - {"label":"Rotary", "x":15.5, "y":0}, - - {"label":"`", "x":0, "y":1.25}, - {"label":"1", "x":1, "y":1.25}, - {"label":"2", "x":2, "y":1.25}, - {"label":"3", "x":3, "y":1.25}, - {"label":"4", "x":4, "y":1.25}, - {"label":"5", "x":5, "y":1.25}, - {"label":"6", "x":6, "y":1.25}, - {"label":"7", "x":7, "y":1.25}, - {"label":"8", "x":8, "y":1.25}, - {"label":"9", "x":9, "y":1.25}, - {"label":"0", "x":10, "y":1.25}, - {"label":"-", "x":11, "y":1.25}, - {"label":"=", "x":12, "y":1.25}, - {"label":"Backspace", "x":13, "y":1.25, "w":2}, - - {"label":"Delete", "x":15.5, "y":1.25}, - - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":6.5, "y":2.25}, - {"label":"U", "x":7.5, "y":2.25}, - {"label":"I", "x":8.5, "y":2.25}, - {"label":"O", "x":9.5, "y":2.25}, - {"label":"P", "x":10.5, "y":2.25}, - {"label":"[", "x":11.5, "y":2.25}, - {"label":"]", "x":12.5, "y":2.25}, - - {"label":"Page Up", "x":15.5, "y":2.25}, - - {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":6.75, "y":3.25}, - {"label":"J", "x":7.75, "y":3.25}, - {"label":"K", "x":8.75, "y":3.25}, - {"label":"L", "x":9.75, "y":3.25}, - {"label":";", "x":10.75, "y":3.25}, - {"label":"'", "x":11.75, "y":3.25}, - {"label":"Iso #", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, - - {"label":"Page Down", "x":15.5, "y":3.25}, - - {"label":"Shift", "x":0, "y":4.25, "w":1.25}, - {"label":"Iso \\", "x":1.25, "y":4.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":7.25, "y":4.25}, - {"label":"M", "x":8.25, "y":4.25}, - {"label":",", "x":9.25, "y":4.25}, - {"label":".", "x":10.25, "y":4.25}, - {"label":"/", "x":11.25, "y":4.25}, - {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, - - {"label":"Up", "x":14.25, "y":4.5}, - - {"label":"End", "x":15.5, "y":4.25}, - - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.25, "w":6.25}, - {"label":"Alt", "x":10, "y":5.25}, - {"label":"Fn", "x":11, "y":5.25}, - {"label":"Ctrl", "x":12, "y":5.25}, - - {"label":"Left", "x":13.25, "y":5.5}, - {"label":"Down", "x":14.25, "y":5.5}, - {"label":"Right", "x":15.25, "y":5.5} + {"matrix": [1, 3], "x": 0, "y": 0}, + + {"matrix": [2, 6], "x": 1.25, "y": 0}, + {"matrix": [3, 6], "x": 2.25, "y": 0}, + {"matrix": [3, 1], "x": 3.25, "y": 0}, + {"matrix": [3, 3], "x": 4.25, "y": 0}, + + {"matrix": [0, 7], "x": 5.5, "y": 0}, + {"matrix": [6, 3], "x": 6.5, "y": 0}, + {"matrix": [7, 1], "x": 7.5, "y": 0}, + {"matrix": [7, 6], "x": 8.5, "y": 0}, + + {"matrix": [10, 6], "x": 9.75, "y": 0}, + {"matrix": [10, 7], "x": 10.75, "y": 0}, + {"matrix": [10, 3], "x": 11.75, "y": 0}, + {"matrix": [10, 5], "x": 12.75, "y": 0}, + + {"matrix": [9, 7], "x": 14, "y": 0}, + + {"matrix": [0, 1], "x": 15.5, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.25}, + {"matrix": [1, 7], "x": 1, "y": 1.25}, + {"matrix": [2, 7], "x": 2, "y": 1.25}, + {"matrix": [3, 7], "x": 3, "y": 1.25}, + {"matrix": [4, 7], "x": 4, "y": 1.25}, + {"matrix": [4, 6], "x": 5, "y": 1.25}, + {"matrix": [5, 6], "x": 6, "y": 1.25}, + {"matrix": [5, 7], "x": 7, "y": 1.25}, + {"matrix": [6, 7], "x": 8, "y": 1.25}, + {"matrix": [7, 7], "x": 9, "y": 1.25}, + {"matrix": [8, 7], "x": 10, "y": 1.25}, + {"matrix": [8, 6], "x": 11, "y": 1.25}, + {"matrix": [6, 6], "x": 12, "y": 1.25}, + {"matrix": [10, 1], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [6, 5], "x": 15.5, "y": 1.25}, + + {"matrix": [1, 1], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 2.25}, + {"matrix": [2, 0], "x": 2.5, "y": 2.25}, + {"matrix": [3, 0], "x": 3.5, "y": 2.25}, + {"matrix": [4, 0], "x": 4.5, "y": 2.25}, + {"matrix": [4, 1], "x": 5.5, "y": 2.25}, + {"matrix": [5, 1], "x": 6.5, "y": 2.25}, + {"matrix": [5, 0], "x": 7.5, "y": 2.25}, + {"matrix": [6, 0], "x": 8.5, "y": 2.25}, + {"matrix": [7, 0], "x": 9.5, "y": 2.25}, + {"matrix": [8, 0], "x": 10.5, "y": 2.25}, + {"matrix": [8, 1], "x": 11.5, "y": 2.25}, + {"matrix": [6, 1], "x": 12.5, "y": 2.25}, + + {"matrix": [1, 5], "x": 15.5, "y": 2.25}, + + {"matrix": [2, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"matrix": [4, 3], "x": 5.75, "y": 3.25}, + {"matrix": [5, 3], "x": 6.75, "y": 3.25}, + {"matrix": [5, 2], "x": 7.75, "y": 3.25}, + {"matrix": [6, 2], "x": 8.75, "y": 3.25}, + {"matrix": [7, 2], "x": 9.75, "y": 3.25}, + {"matrix": [8, 2], "x": 10.75, "y": 3.25}, + {"matrix": [8, 3], "x": 11.75, "y": 3.25}, + {"matrix": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [10, 4], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"matrix": [2, 5], "x": 15.5, "y": 3.25}, + + {"matrix": [0, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [2, 3], "x": 1.25, "y": 4.25}, + {"matrix": [1, 4], "x": 2.25, "y": 4.25}, + {"matrix": [2, 4], "x": 3.25, "y": 4.25}, + {"matrix": [3, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [5, 5], "x": 7.25, "y": 4.25}, + {"matrix": [5, 4], "x": 8.25, "y": 4.25}, + {"matrix": [6, 4], "x": 9.25, "y": 4.25}, + {"matrix": [7, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [9, 1], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [3, 5], "x": 14.25, "y": 4.5}, + + {"matrix": [7, 5], "x": 15.5, "y": 4.25}, + + {"matrix": [0, 6], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [9, 3], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [9, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5.25}, + {"matrix": [9, 2], "x": 11, "y": 5.25}, + {"matrix": [0, 4], "x": 12, "y": 5.25}, + + {"matrix": [0, 3], "x": 13.25, "y": 5.5}, + {"matrix": [7, 3], "x": 14.25, "y": 5.5}, + {"matrix": [0, 5], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/gmmk/pro/rev1/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c index babb6bd6c7..0ded23162f 100644 --- a/keyboards/gmmk/pro/rev1/iso/iso.c +++ b/keyboards/gmmk/pro/rev1/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/gmmk/pro/rev1/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h deleted file mode 100644 index 353bcbe875..0000000000 --- a/keyboards/gmmk/pro/rev1/iso/iso.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Gigahawk - * - * 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/>. - */ - -#pragma once - -#include "pro.h" - -#define ___ KC_NO - -// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute) -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Del -// Tab Q W E R T Y U I O P [ ] PgUp -// Caps A S D F G H J K L ; ' # Enter PgDn -// Sh_L \ Z X C V B N M , . / Sh_R Up End -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97, k01, \ - k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1, k65, \ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k15, \ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k84, ka4, k25, \ - k00, k23, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k91, k35, k75, \ - k06, k90, k93, k94, k95, k92, k04, k03, k73, k05 \ -) \ -{ \ - { k00, k01, ___, k03, k04, k05, k06, k07}, \ - { k10, k11, k12, k13, k14, k15, k16, k17}, \ - { k20, k21, k22, k23, k24, k25, k26, k27}, \ - { k30, k31, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, k42, k43, k44, k45, k46, k47}, \ - { k50, k51, k52, k53, k54, k55, k56, k57}, \ - { k60, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, k76, k77}, \ - { k80, k81, k82, k83, k84, k85, k86, k87}, \ - { k90, k91, k92, k93, k94, k95, ___, k97}, \ - { ___, ka1, ___, ka3, ka4, ka5, ka6, ka7} \ -} -// clang-format on diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c index af0366d20d..cd0861309a 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c index 9a37242a4e..bc2134e3de 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/gmmk/pro/rev1/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk index 43949aa054..6d23fe350a 100644 --- a/keyboards/gmmk/pro/rev1/iso/rules.mk +++ b/keyboards/gmmk/pro/rev1/iso/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = AW20216 diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c index c22fbc796d..ccdcd42726 100644 --- a/keyboards/gmmk/pro/rev2/ansi/ansi.c +++ b/keyboards/gmmk/pro/rev2/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.h b/keyboards/gmmk/pro/rev2/ansi/ansi.h deleted file mode 100644 index 2f8a28b940..0000000000 --- a/keyboards/gmmk/pro/rev2/ansi/ansi.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "pro.h" - -#define ___ KC_NO - -// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute) -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Del -// Tab Q W E R T Y U I O P [ ] \ PgUp -// Caps A S D F G H J K L ; ' Enter PgDn -// Sh_L Z X C V B N M , . / Sh_R Up End -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97, k01, \ - k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1, k65, \ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, ka2, k15, \ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, ka4, k25, \ - k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k91, k35, k75, \ - k06, k90, k93, k94, k95, k92, k04, k03, k73, k05 \ -) \ -{ \ - { k00, k01, ___, k03, k04, k05, k06, k07}, \ - { k10, k11, k12, k13, k14, k15, k16, k17}, \ - { k20, k21, k22, ___, k24, k25, k26, k27}, \ - { k30, k31, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, k42, k43, k44, k45, k46, k47}, \ - { k50, k51, k52, k53, k54, k55, k56, k57}, \ - { k60, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, k76, k77}, \ - { k80, k81, k82, k83, ___, k85, k86, k87}, \ - { k90, k91, k92, k93, k94, k95, ___, k97}, \ - { ___, ka1, ka2, ka3, ka4, ka5, ka6, ka7} \ -} -// clang-format on diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index a8a25f8547..ff693e3573 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} @@ -21,104 +29,105 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - - {"x":14, "y":0}, - {"x":15.5, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - - {"x":15.5, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - - {"x":15.5, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":15.5, "y":3.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":1.75}, - - {"x":14.25, "y":4.5}, - - {"x":15.5, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25}, - {"x":11, "y":5.25}, - {"x":12, "y":5.25}, - - {"x":13.25, "y":5.5}, - {"x":14.25, "y":5.5}, - {"x":15.25, "y":5.5} + {"matrix": [1, 3], "x": 0, "y": 0}, + + {"matrix": [2, 6], "x": 1.25, "y": 0}, + {"matrix": [3, 6], "x": 2.25, "y": 0}, + {"matrix": [3, 1], "x": 3.25, "y": 0}, + {"matrix": [3, 3], "x": 4.25, "y": 0}, + + {"matrix": [0, 7], "x": 5.5, "y": 0}, + {"matrix": [6, 3], "x": 6.5, "y": 0}, + {"matrix": [7, 1], "x": 7.5, "y": 0}, + {"matrix": [7, 6], "x": 8.5, "y": 0}, + + {"matrix": [10, 6], "x": 9.75, "y": 0}, + {"matrix": [10, 7], "x": 10.75, "y": 0}, + {"matrix": [10, 3], "x": 11.75, "y": 0}, + {"matrix": [10, 5], "x": 12.75, "y": 0}, + + {"matrix": [9, 7], "x": 14, "y": 0}, + + {"matrix": [0, 1], "x": 15.5, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.25}, + {"matrix": [1, 7], "x": 1, "y": 1.25}, + {"matrix": [2, 7], "x": 2, "y": 1.25}, + {"matrix": [3, 7], "x": 3, "y": 1.25}, + {"matrix": [4, 7], "x": 4, "y": 1.25}, + {"matrix": [4, 6], "x": 5, "y": 1.25}, + {"matrix": [5, 6], "x": 6, "y": 1.25}, + {"matrix": [5, 7], "x": 7, "y": 1.25}, + {"matrix": [6, 7], "x": 8, "y": 1.25}, + {"matrix": [7, 7], "x": 9, "y": 1.25}, + {"matrix": [8, 7], "x": 10, "y": 1.25}, + {"matrix": [8, 6], "x": 11, "y": 1.25}, + {"matrix": [6, 6], "x": 12, "y": 1.25}, + {"matrix": [10, 1], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [6, 5], "x": 15.5, "y": 1.25}, + + {"matrix": [1, 1], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 2.25}, + {"matrix": [2, 0], "x": 2.5, "y": 2.25}, + {"matrix": [3, 0], "x": 3.5, "y": 2.25}, + {"matrix": [4, 0], "x": 4.5, "y": 2.25}, + {"matrix": [4, 1], "x": 5.5, "y": 2.25}, + {"matrix": [5, 1], "x": 6.5, "y": 2.25}, + {"matrix": [5, 0], "x": 7.5, "y": 2.25}, + {"matrix": [6, 0], "x": 8.5, "y": 2.25}, + {"matrix": [7, 0], "x": 9.5, "y": 2.25}, + {"matrix": [8, 0], "x": 10.5, "y": 2.25}, + {"matrix": [8, 1], "x": 11.5, "y": 2.25}, + {"matrix": [6, 1], "x": 12.5, "y": 2.25}, + {"matrix": [10, 2], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [1, 5], "x": 15.5, "y": 2.25}, + + {"matrix": [2, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"matrix": [4, 3], "x": 5.75, "y": 3.25}, + {"matrix": [5, 3], "x": 6.75, "y": 3.25}, + {"matrix": [5, 2], "x": 7.75, "y": 3.25}, + {"matrix": [6, 2], "x": 8.75, "y": 3.25}, + {"matrix": [7, 2], "x": 9.75, "y": 3.25}, + {"matrix": [8, 2], "x": 10.75, "y": 3.25}, + {"matrix": [8, 3], "x": 11.75, "y": 3.25}, + {"matrix": [10, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [2, 5], "x": 15.5, "y": 3.25}, + + {"matrix": [0, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [1, 4], "x": 2.25, "y": 4.25}, + {"matrix": [2, 4], "x": 3.25, "y": 4.25}, + {"matrix": [3, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [5, 5], "x": 7.25, "y": 4.25}, + {"matrix": [5, 4], "x": 8.25, "y": 4.25}, + {"matrix": [6, 4], "x": 9.25, "y": 4.25}, + {"matrix": [7, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [9, 1], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [3, 5], "x": 14.25, "y": 4.5}, + + {"matrix": [7, 5], "x": 15.5, "y": 4.25}, + + {"matrix": [0, 6], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [9, 3], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [9, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5.25}, + {"matrix": [9, 2], "x": 11, "y": 5.25}, + {"matrix": [0, 4], "x": 12, "y": 5.25}, + + {"matrix": [0, 3], "x": 13.25, "y": 5.5}, + {"matrix": [7, 3], "x": 14.25, "y": 5.5}, + {"matrix": [0, 5], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c index 30fd283d7d..cbea58716e 100644 --- a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } }; diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c index d1c42ca26f..d577f15462 100644 --- a/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c +++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* encoder; start */ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk index 1672a47804..2f50d82c82 100644 --- a/keyboards/gmmk/pro/rev2/ansi/rules.mk +++ b/keyboards/gmmk/pro/rev2/ansi/rules.mk @@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = AW20216 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index c37ccd53df..972551ec41 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "AW20216" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} @@ -21,105 +29,106 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - - {"label":"Printscreen", "x":14, "y":0}, - {"label":"Rotary", "x":15.5, "y":0}, - - {"label":"`", "x":0, "y":1.25}, - {"label":"1", "x":1, "y":1.25}, - {"label":"2", "x":2, "y":1.25}, - {"label":"3", "x":3, "y":1.25}, - {"label":"4", "x":4, "y":1.25}, - {"label":"5", "x":5, "y":1.25}, - {"label":"6", "x":6, "y":1.25}, - {"label":"7", "x":7, "y":1.25}, - {"label":"8", "x":8, "y":1.25}, - {"label":"9", "x":9, "y":1.25}, - {"label":"0", "x":10, "y":1.25}, - {"label":"-", "x":11, "y":1.25}, - {"label":"=", "x":12, "y":1.25}, - {"label":"Backspace", "x":13, "y":1.25, "w":2}, - - {"label":"Delete", "x":15.5, "y":1.25}, - - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":6.5, "y":2.25}, - {"label":"U", "x":7.5, "y":2.25}, - {"label":"I", "x":8.5, "y":2.25}, - {"label":"O", "x":9.5, "y":2.25}, - {"label":"P", "x":10.5, "y":2.25}, - {"label":"[", "x":11.5, "y":2.25}, - {"label":"]", "x":12.5, "y":2.25}, - - {"label":"Page Up", "x":15.5, "y":2.25}, - - {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":6.75, "y":3.25}, - {"label":"J", "x":7.75, "y":3.25}, - {"label":"K", "x":8.75, "y":3.25}, - {"label":"L", "x":9.75, "y":3.25}, - {"label":";", "x":10.75, "y":3.25}, - {"label":"'", "x":11.75, "y":3.25}, - {"label":"Iso #", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, - - {"label":"Page Down", "x":15.5, "y":3.25}, - - {"label":"Shift", "x":0, "y":4.25, "w":1.25}, - {"label":"Iso \\", "x":1.25, "y":4.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":7.25, "y":4.25}, - {"label":"M", "x":8.25, "y":4.25}, - {"label":",", "x":9.25, "y":4.25}, - {"label":".", "x":10.25, "y":4.25}, - {"label":"/", "x":11.25, "y":4.25}, - {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, - - {"label":"Up", "x":14.25, "y":4.5}, - - {"label":"End", "x":15.5, "y":4.25}, - - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.25, "w":6.25}, - {"label":"Alt", "x":10, "y":5.25}, - {"label":"Fn", "x":11, "y":5.25}, - {"label":"Ctrl", "x":12, "y":5.25}, - - {"label":"Left", "x":13.25, "y":5.5}, - {"label":"Down", "x":14.25, "y":5.5}, - {"label":"Right", "x":15.25, "y":5.5} + {"matrix": [1, 3], "x": 0, "y": 0}, + + {"matrix": [2, 6], "x": 1.25, "y": 0}, + {"matrix": [3, 6], "x": 2.25, "y": 0}, + {"matrix": [3, 1], "x": 3.25, "y": 0}, + {"matrix": [3, 3], "x": 4.25, "y": 0}, + + {"matrix": [0, 7], "x": 5.5, "y": 0}, + {"matrix": [6, 3], "x": 6.5, "y": 0}, + {"matrix": [7, 1], "x": 7.5, "y": 0}, + {"matrix": [7, 6], "x": 8.5, "y": 0}, + + {"matrix": [10, 6], "x": 9.75, "y": 0}, + {"matrix": [10, 7], "x": 10.75, "y": 0}, + {"matrix": [10, 3], "x": 11.75, "y": 0}, + {"matrix": [10, 5], "x": 12.75, "y": 0}, + + {"matrix": [9, 7], "x": 14, "y": 0}, + + {"matrix": [0, 1], "x": 15.5, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.25}, + {"matrix": [1, 7], "x": 1, "y": 1.25}, + {"matrix": [2, 7], "x": 2, "y": 1.25}, + {"matrix": [3, 7], "x": 3, "y": 1.25}, + {"matrix": [4, 7], "x": 4, "y": 1.25}, + {"matrix": [4, 6], "x": 5, "y": 1.25}, + {"matrix": [5, 6], "x": 6, "y": 1.25}, + {"matrix": [5, 7], "x": 7, "y": 1.25}, + {"matrix": [6, 7], "x": 8, "y": 1.25}, + {"matrix": [7, 7], "x": 9, "y": 1.25}, + {"matrix": [8, 7], "x": 10, "y": 1.25}, + {"matrix": [8, 6], "x": 11, "y": 1.25}, + {"matrix": [6, 6], "x": 12, "y": 1.25}, + {"matrix": [10, 1], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [6, 5], "x": 15.5, "y": 1.25}, + + {"matrix": [1, 1], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 2.25}, + {"matrix": [2, 0], "x": 2.5, "y": 2.25}, + {"matrix": [3, 0], "x": 3.5, "y": 2.25}, + {"matrix": [4, 0], "x": 4.5, "y": 2.25}, + {"matrix": [4, 1], "x": 5.5, "y": 2.25}, + {"matrix": [5, 1], "x": 6.5, "y": 2.25}, + {"matrix": [5, 0], "x": 7.5, "y": 2.25}, + {"matrix": [6, 0], "x": 8.5, "y": 2.25}, + {"matrix": [7, 0], "x": 9.5, "y": 2.25}, + {"matrix": [8, 0], "x": 10.5, "y": 2.25}, + {"matrix": [8, 1], "x": 11.5, "y": 2.25}, + {"matrix": [6, 1], "x": 12.5, "y": 2.25}, + + {"matrix": [1, 5], "x": 15.5, "y": 2.25}, + + {"matrix": [2, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"matrix": [4, 3], "x": 5.75, "y": 3.25}, + {"matrix": [5, 3], "x": 6.75, "y": 3.25}, + {"matrix": [5, 2], "x": 7.75, "y": 3.25}, + {"matrix": [6, 2], "x": 8.75, "y": 3.25}, + {"matrix": [7, 2], "x": 9.75, "y": 3.25}, + {"matrix": [8, 2], "x": 10.75, "y": 3.25}, + {"matrix": [8, 3], "x": 11.75, "y": 3.25}, + {"matrix": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [10, 4], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"matrix": [2, 5], "x": 15.5, "y": 3.25}, + + {"matrix": [0, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [2, 3], "x": 1.25, "y": 4.25}, + {"matrix": [1, 4], "x": 2.25, "y": 4.25}, + {"matrix": [2, 4], "x": 3.25, "y": 4.25}, + {"matrix": [3, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [5, 5], "x": 7.25, "y": 4.25}, + {"matrix": [5, 4], "x": 8.25, "y": 4.25}, + {"matrix": [6, 4], "x": 9.25, "y": 4.25}, + {"matrix": [7, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [9, 1], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [3, 5], "x": 14.25, "y": 4.5}, + + {"matrix": [7, 5], "x": 15.5, "y": 4.25}, + + {"matrix": [0, 6], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [9, 3], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [9, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5.25}, + {"matrix": [9, 2], "x": 11, "y": 5.25}, + {"matrix": [0, 4], "x": 12, "y": 5.25}, + + {"matrix": [0, 3], "x": 13.25, "y": 5.5}, + {"matrix": [7, 3], "x": 14.25, "y": 5.5}, + {"matrix": [0, 5], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/gmmk/pro/rev2/iso/iso.c b/keyboards/gmmk/pro/rev2/iso/iso.c index 20626ff9c5..e056ff6c12 100644 --- a/keyboards/gmmk/pro/rev2/iso/iso.c +++ b/keyboards/gmmk/pro/rev2/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/gmmk/pro/rev2/iso/iso.h b/keyboards/gmmk/pro/rev2/iso/iso.h deleted file mode 100644 index a5844e10eb..0000000000 --- a/keyboards/gmmk/pro/rev2/iso/iso.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com> - * - * 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/>. - */ - -#pragma once - -#include "pro.h" - -#define ___ KC_NO - -// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute) -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Del -// Tab Q W E R T Y U I O P [ ] PgUp -// Caps A S D F G H J K L ; ' # Enter PgDn -// Sh_L \ Z X C V B N M , . / Sh_R Up End -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97, k01, \ - k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1, k65, \ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k15, \ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k84, ka4, k25, \ - k00, k23, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k91, k35, k75, \ - k06, k90, k93, k94, k95, k92, k04, k03, k73, k05 \ -) \ -{ \ - { k00, k01, ___, k03, k04, k05, k06, k07}, \ - { k10, k11, k12, k13, k14, k15, k16, k17}, \ - { k20, k21, k22, k23, k24, k25, k26, k27}, \ - { k30, k31, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, k42, k43, k44, k45, k46, k47}, \ - { k50, k51, k52, k53, k54, k55, k56, k57}, \ - { k60, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, k76, k77}, \ - { k80, k81, k82, k83, k84, k85, k86, k87}, \ - { k90, k91, k92, k93, k94, k95, ___, k97}, \ - { ___, ka1, ___, ka3, ka4, ka5, ka6, ka7} \ -} -// clang-format on diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c index 9da9bb2490..e22e616505 100644 --- a/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c index acd41ebec1..0f8859c98f 100644 --- a/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c +++ b/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* encoder; start */ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk index 7f154b74c1..db00e4c84c 100644 --- a/keyboards/gmmk/pro/rev2/iso/rules.mk +++ b/keyboards/gmmk/pro/rev2/iso/rules.mk @@ -15,6 +15,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = AW20216 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash |