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/takashiski/hecomi/alpha/config.h | 17 ----------------- keyboards/takashiski/hecomi/alpha/info.json | 5 +++++ keyboards/takashiski/namecard2x4/rev1/config.h | 17 ----------------- keyboards/takashiski/namecard2x4/rev1/info.json | 7 +++++++ keyboards/takashiski/namecard2x4/rev2/config.h | 17 ----------------- keyboards/takashiski/namecard2x4/rev2/info.json | 7 +++++++ keyboards/takashiski/otaku_split/rev0/config.h | 17 ----------------- keyboards/takashiski/otaku_split/rev0/info.json | 5 +++++ keyboards/takashiski/otaku_split/rev1/config.h | 19 ------------------- keyboards/takashiski/otaku_split/rev1/info.json | 13 ++++++++++++- 10 files changed, 36 insertions(+), 88 deletions(-) create mode 100644 keyboards/takashiski/namecard2x4/rev1/info.json create mode 100644 keyboards/takashiski/namecard2x4/rev2/info.json (limited to 'keyboards/takashiski') diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h index ff769451d2..82e2bd70d6 100644 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ b/keyboards/takashiski/hecomi/alpha/config.h @@ -17,25 +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 { C6,D7,E6,B4,B5 } -#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 } - //#define USE_I2C -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D4 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json index 040e26dcd0..4ef1c2c554 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h index 39b488c42a..3505ff3cc1 100644 --- a/keyboards/takashiski/namecard2x4/rev1/config.h +++ b/keyboards/takashiski/namecard2x4/rev1/config.h @@ -17,23 +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,B5 } -#define MATRIX_COL_PINS { E6,D7,C6,D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json new file mode 100644 index 0000000000..e5c68e101d --- /dev/null +++ b/keyboards/takashiski/namecard2x4/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["E6", "D7", "C6", "D4"], + "rows": ["B4", "B5"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h index e6897e7311..99560988d8 100644 --- a/keyboards/takashiski/namecard2x4/rev2/config.h +++ b/keyboards/takashiski/namecard2x4/rev2/config.h @@ -17,23 +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 { B2,B6 } -#define MATRIX_COL_PINS { D7,E6,B4,B5 } - -/* COL2ROW, ROW2COL */ -//#define DIODE_DIRECTION COL2ROW -#define DIODE_DIRECTION ROW2COL #define RGB_DI_PIN D4 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json new file mode 100644 index 0000000000..24ae3ff5f0 --- /dev/null +++ b/keyboards/takashiski/namecard2x4/rev2/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["B2", "B6"] + }, + "diode_direction": "ROW2COL" +} diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h index 2919d7f0cc..b43d9c74c8 100644 --- a/keyboards/takashiski/otaku_split/rev0/config.h +++ b/keyboards/takashiski/otaku_split/rev0/config.h @@ -17,23 +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 { B5,B4,E6,D7,C6 } -#define MATRIX_COL_PINS { B6,B2,B3,B1,F7,F6,F5,F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json index 825cf08d2a..438cddcf30 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h index 63658aa6d4..6a81e8ddcb 100644 --- a/keyboards/takashiski/otaku_split/rev1/config.h +++ b/keyboards/takashiski/otaku_split/rev1/config.h @@ -17,25 +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 { C6,D7,E6,B4,B5 } -#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 } -#define MATRIX_ROW_PINS_RIGHT { B5,B4,E6,D7,C6 } -#define MATRIX_COL_PINS_RIGHT { B6,B2,B3,B1,F7,F6,F5,F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D2 //fix pin. HIGH is left, LOW is right /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json index 42c66376ec..5bdf4048a7 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/info.json @@ -8,8 +8,19 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", -- cgit v1.2.3