summaryrefslogtreecommitdiff
path: root/keyboards/gmmk
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-06 09:53:52 +1100
committerGitHub <noreply@github.com>2023-03-05 22:53:52 +0000
commit23c365b023e409885e6f201f12df56e5145dde47 (patch)
tree062e72be726939d5f6ddda944facb423bbf386cf /keyboards/gmmk
parentb34d51d08d7083fc790db2562a4d39890f34886f (diff)
Move matrix config to info.json, part 1 (#19985)
Diffstat (limited to 'keyboards/gmmk')
-rw-r--r--keyboards/gmmk/gmmk2/p65/ansi/info.json5
-rw-r--r--keyboards/gmmk/gmmk2/p65/config.h9
-rw-r--r--keyboards/gmmk/gmmk2/p65/iso/info.json5
-rw-r--r--keyboards/gmmk/gmmk2/p96/ansi/info.json5
-rw-r--r--keyboards/gmmk/gmmk2/p96/config.h9
-rw-r--r--keyboards/gmmk/gmmk2/p96/iso/info.json5
-rw-r--r--keyboards/gmmk/pro/config.h9
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/info.json5
-rw-r--r--keyboards/gmmk/pro/rev1/iso/info.json5
-rw-r--r--keyboards/gmmk/pro/rev2/ansi/info.json5
-rw-r--r--keyboards/gmmk/pro/rev2/iso/info.json5
11 files changed, 40 insertions, 27 deletions
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
index 76e6e89925..0ece27735d 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json
@@ -8,6 +8,11 @@
"pid": "0x5045",
"device_version": "0.0.1"
},
+ "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]
},
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..af52b203dc 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p65/iso/info.json
@@ -8,6 +8,11 @@
"pid": "0x504A",
"device_version": "0.0.1"
},
+ "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]
},
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
index f5b05748c7..5a67f0b74c 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -8,6 +8,11 @@
"pid": "0x504B",
"device_version": "0.0.1"
},
+ "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": {
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..22678f64a1 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -8,6 +8,11 @@
"pid": "0x505A",
"device_version": "0.0.1"
},
+ "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": {
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/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index b8a7e94a82..7e66ad5043 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -8,6 +8,11 @@
"pid": "0x5044",
"device_version": "0.0.1"
},
+ "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"}
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 48181ec488..082f28a774 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -8,6 +8,11 @@
"pid": "0x5044",
"device_version": "0.0.1"
},
+ "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"}
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index a8a25f8547..0a20c97d2e 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -8,6 +8,11 @@
"pid": "0x5044",
"device_version": "0.0.2"
},
+ "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"}
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index c37ccd53df..e3cb707c48 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -8,6 +8,11 @@
"pid": "0x5044",
"device_version": "0.0.2"
},
+ "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"}