summaryrefslogtreecommitdiff
path: root/keyboards/gmmk/gmmk2/p65
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gmmk/gmmk2/p65')
-rw-r--r--keyboards/gmmk/gmmk2/p65/ansi/ansi.c2
-rw-r--r--keyboards/gmmk/gmmk2/p65/ansi/ansi.h47
-rw-r--r--keyboards/gmmk/gmmk2/p65/ansi/info.json143
-rw-r--r--keyboards/gmmk/gmmk2/p65/ansi/rules.mk1
-rw-r--r--keyboards/gmmk/gmmk2/p65/config.h9
-rw-r--r--keyboards/gmmk/gmmk2/p65/iso/info.json145
-rw-r--r--keyboards/gmmk/gmmk2/p65/iso/iso.c2
-rw-r--r--keyboards/gmmk/gmmk2/p65/iso/iso.h47
-rw-r--r--keyboards/gmmk/gmmk2/p65/iso/rules.mk1
-rw-r--r--keyboards/gmmk/gmmk2/p65/p65.c17
-rw-r--r--keyboards/gmmk/gmmk2/p65/p65.h25
11 files changed, 153 insertions, 286 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 15:13:57 +0000