From a5ba3860c46988e28a7c35884b20545756a9ed85 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Fri, 3 Nov 2023 09:05:56 +0900 Subject: [PATCH] Move matrix config to info.json, part 1 (qmk#19985) --- keyboards/sandy/dn0020/config.h | 5 ----- keyboards/sandy/dn0020/info.json | 5 +++++ keyboards/sandy/dn0030/config.h | 5 ----- keyboards/sandy/dn0030/info.json | 5 +++++ keyboards/sandy/v01/config.h | 5 ----- keyboards/sandy/v01/info.json | 5 +++++ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/sandy/dn0020/config.h b/keyboards/sandy/dn0020/config.h index d8ed7a49f522..0cc8196c8a9c 100644 --- a/keyboards/sandy/dn0020/config.h +++ b/keyboards/sandy/dn0020/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #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 index 359ceb94c454..11ba0d3c0a7b 100644 --- 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 index e5775f013426..27e8ce27984a 100644 --- a/keyboards/sandy/dn0030/config.h +++ b/keyboards/sandy/dn0030/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #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 index 2cfecad023e4..f1dd15e75fde 100644 --- 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 index 8ef4ba630b04..4e966cf24326 100644 --- a/keyboards/sandy/v01/config.h +++ b/keyboards/sandy/v01/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #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 index 07a204d09d68..bfbdcd273601 100644 --- 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"},