summaryrefslogtreecommitdiffstats
path: root/keyboards/gmmk/pro/rev1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gmmk/pro/rev1')
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/ansi.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/ansi.h52
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/info.json205
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/rules.mk1
-rw-r--r--keyboards/gmmk/pro/rev1/iso/info.json207
-rw-r--r--keyboards/gmmk/pro/rev1/iso/iso.c2
-rw-r--r--keyboards/gmmk/pro/rev1/iso/iso.h52
-rw-r--r--keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/iso/rules.mk1
15 files changed, 224 insertions, 312 deletions
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/keymaps/vnmm/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c
index ad8416dc0f..e6627959c4 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[WIN_FN] = { 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 14:17:06 +0000