From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/rate/pistachio/rev1/config.h | 16 ---------------- keyboards/rate/pistachio/rev1/info.json | 7 +++++++ keyboards/rate/pistachio/rev2/config.h | 16 ---------------- keyboards/rate/pistachio/rev2/info.json | 7 +++++++ keyboards/rate/pistachio_mp/config.h | 16 ---------------- keyboards/rate/pistachio_mp/info.json | 5 +++++ 6 files changed, 19 insertions(+), 48 deletions(-) create mode 100644 keyboards/rate/pistachio/rev1/info.json create mode 100644 keyboards/rate/pistachio/rev2/info.json (limited to 'keyboards/rate') diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h index cd6121de45..e1f218f682 100644 --- a/keyboards/rate/pistachio/rev1/config.h +++ b/keyboards/rate/pistachio/rev1/config.h @@ -17,24 +17,8 @@ along with this program. If not, see . #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 { D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D3} - #define USE_I2C -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D2 #define RGBLIGHT_SPLIT diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json new file mode 100644 index 0000000000..0ecbe691df --- /dev/null +++ b/keyboards/rate/pistachio/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h index 5a7c35a936..20e6f23c67 100644 --- a/keyboards/rate/pistachio/rev2/config.h +++ b/keyboards/rate/pistachio/rev2/config.h @@ -17,24 +17,8 @@ along with this program. If not, see . #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 { B5, B4, E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3} - #define USE_I2C -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Split hand configration */ #define SPLIT_HAND_MATRIX_GRID D4,D3 diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json new file mode 100644 index 0000000000..992a866125 --- /dev/null +++ b/keyboards/rate/pistachio/rev2/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h index 948c87264a..934872a0c6 100644 --- a/keyboards/rate/pistachio_mp/config.h +++ b/keyboards/rate/pistachio_mp/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #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 { B4, E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B3, B1, F7, F6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN D2 #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 10 diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index cab8ef68b4..e35c7432bc 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -8,6 +8,11 @@ "pid": "0xE212", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6"], + "rows": ["B4", "E6", "D7", "C6", "D4"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} -- cgit v1.2.3