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

jpskenn · Nov 3, 2023 · a5ba386 · a5ba386
1 parent 148c5e0
commit a5ba386
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/keyboards/sandy/dn0020/config.h b/keyboards/sandy/dn0020/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// "10row * 8col" represents "5row * 16col" matrix.
-#define MATRIX_ROW_PINS { D6, F7, E6, C7, F5, D7, B4, F0, C6, F6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D3, D4 }
-#define DIODE_DIRECTION COL2ROW
-
 // Encoder triggers specific key matrix position,
 // when turn knob clockwise or counterclockwise.
 // This is handy to assign key codes by VIA.

diff --git a/keyboards/sandy/dn0020/info.json b/keyboards/sandy/dn0020/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3344",
         "device_version": "0.2.0"
     },
+    "matrix_pins": {
+            "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D3", "D4"],
+            "rows": ["D6", "F7", "E6", "C7", "F5", "D7", "B4", "F0", "C6", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F4"},

diff --git a/keyboards/sandy/dn0030/config.h b/keyboards/sandy/dn0030/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// "10row * 8col" represents "5row * 16col" matrix.
-#define MATRIX_ROW_PINS { D6, F7, E6, C7, F5, D7, B4, F0, C6, F6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D3, D4 }
-#define DIODE_DIRECTION COL2ROW
-
 // Encoder triggers specific key matrix position,
 // when turn knob clockwise or counterclockwise.
 // This is handy to assign key codes by VIA.

diff --git a/keyboards/sandy/dn0030/info.json b/keyboards/sandy/dn0030/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3344",
         "device_version": "0.3.0"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D3", "D4"],
+        "rows": ["D6", "F7", "E6", "C7", "F5", "D7", "B4", "F0", "C6", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F4"},

diff --git a/keyboards/sandy/v01/config.h b/keyboards/sandy/v01/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// "10row * 8col" represents "5row * 16col" matrix.
-#define MATRIX_ROW_PINS { D6, F7, E6, C7, F5, D7, B4, F0, C6, F6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D3, D4 }
-#define DIODE_DIRECTION COL2ROW
-
 // Encoder triggers specific key matrix position,
 // when turn knob clockwise or counterclockwise.
 // This is handy to assign key codes by VIA.

diff --git a/keyboards/sandy/v01/info.json b/keyboards/sandy/v01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3344",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D3", "D4"],
+        "rows": ["D6", "F7", "E6", "C7", "F5", "D7", "B4", "F0", "C6", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F4"},