Move matrix config to info.json, part 1 (#19985)

8 files changed, 20 insertions, 96 deletions

diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h
deleted file mode 100644
index eac213400a..0000000000
--- a/keyboards/qpockets/eggman/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Alan Lehners
- *
- * 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
-
-
-#define MATRIX_ROW_PINS { C4, C5, C2, D0, B5, B6, D6 }
-#define MATRIX_COL_PINS { B7, B4, B3, B2, D3, D2, D1 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json
index 989402411d..58d2975169 100644
--- a/keyboards/qpockets/eggman/info.json
+++ b/keyboards/qpockets/eggman/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x656D",
     	"device_version": "10.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B4", "B3", "B2", "D3", "D2", "D1"],
+        "rows": ["C4", "C5", "C2", "D0", "B5", "B6", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "C6", "pin_b": "C7"},
diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
index 22c2bc73de..3caf7fdbcb 100644
--- a/keyboards/qpockets/space_space/rev1/config.h
+++ b/keyboards/qpockets/space_space/rev1/config.h
@@ -16,14 +16,4 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { F1, F4, F5, C7 }
-#define MATRIX_COL_PINS \
-    { D4, B4, B5, B6, C6, F7, F6, F0, B0, E6, B1 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
index cd9dcb56a8..5b4806e832 100644
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ b/keyboards/qpockets/space_space/rev1/info.json
@@ -8,6 +8,11 @@
   	"pid": "0x7373",
   	"device_version": "30.0.0"
   },
+  "matrix_pins": {
+    "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"],
+    "rows": ["F1", "F4", "F5", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
   	"rotary": [
   		{"pin_a": "B3", "pin_b": "B2", "resolution": 3},
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index 26b85360c4..53e42221c9 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B1, B0, D5, B6 }
-#define MATRIX_COL_PINS \
-    { C6, F6, F1, F4, F5, E6, D6, B2, B5, D3, D2 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 
 #define RGB_DI_PIN F0
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 580ab0a4d5..aa99956be9 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -8,6 +8,11 @@
   	"pid": "0x7373",
   	"device_version": "30.0.2"
   },
+  "matrix_pins": {
+    "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"],
+    "rows": ["B1", "B0", "D5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
   	"rotary": [
   		{"pin_a": "B4", "pin_b": "D7", "resolution": 3},
diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h
deleted file mode 100644
index a811be9a74..0000000000
--- a/keyboards/qpockets/wanten/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 qpockets
-
-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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F7, B3, D5 }
-#define MATRIX_COL_PINS { F4, F1, B5, B6, C6, C7, D4, E6, D2, B1, B2, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json
index e35237a358..f9c2841a58 100644
--- a/keyboards/qpockets/wanten/info.json
+++ b/keyboards/qpockets/wanten/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x7774",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "B5", "B6", "C6", "C7", "D4", "E6", "D2", "B1", "B2", "D3"],
+        "rows": ["F0", "F7", "B3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "F5", "pin_b": "F6"},