From 1022afa6c24a64c78d1c9be99a695ff5335876f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 04:59:07 +1100 Subject: Move matrix config to info.json, part 8 (#20030) --- keyboards/keebio/quefrency/rev1/config.h | 7 ------- keyboards/keebio/quefrency/rev1/info.json | 13 ++++++++++++- keyboards/keebio/quefrency/rev2/config.h | 6 ------ keyboards/keebio/quefrency/rev2/info.json | 11 +++++++++++ keyboards/keebio/quefrency/rev3/config.h | 6 ------ keyboards/keebio/quefrency/rev3/info.json | 11 +++++++++++ keyboards/keebio/quefrency/rev4/config.h | 6 ------ keyboards/keebio/quefrency/rev4/info.json | 11 +++++++++++ keyboards/keebio/quefrency/rev5/config.h | 6 ------ keyboards/keebio/quefrency/rev5/info.json | 11 +++++++++++ 10 files changed, 56 insertions(+), 32 deletions(-) (limited to 'keyboards/keebio/quefrency') diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h index 882997de51..5842393aa2 100644 --- a/keyboards/keebio/quefrency/rev1/config.h +++ b/keyboards/keebio/quefrency/rev1/config.h @@ -18,15 +18,8 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { F4, D4, D7, E6, B4, C6 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6, B5 } -#define MATRIX_ROW_PINS_RIGHT { F4, D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS_RIGHT { F5, F6, F7, B1, B3, B2, B6, C6 } #define SPLIT_HAND_PIN D2 -#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/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json index 648104baa2..a715b1040f 100644 --- a/keyboards/keebio/quefrency/rev1/info.json +++ b/keyboards/keebio/quefrency/rev1/info.json @@ -8,8 +8,19 @@ "pid": "0x1257", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], + "rows": ["F4", "D4", "D7", "E6", "B4", "C6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "C6"], + "rows": ["F4", "D4", "D7", "E6", "B4", "B5"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h index 63f1408cda..0d7e9f8a30 100644 --- a/keyboards/keebio/quefrency/rev2/config.h +++ b/keyboards/keebio/quefrency/rev2/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #pragma once -#define DIODE_DIRECTION COL2ROW -// wiring of each half -#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 } -#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 } -#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 } -#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 } #define SPLIT_HAND_PIN F7 #define CAPS_LOCK_LED_PIN B6 diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json index 508e2431b9..e9e037ea90 100644 --- a/keyboards/keebio/quefrency/rev2/info.json +++ b/keyboards/keebio/quefrency/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x2257", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"], + "rows": ["B1", "B2", "C7", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} @@ -24,6 +29,12 @@ {"pin_a": "D6", "pin_b": "D4"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"], + "rows": ["B3", "B2", "B6", "B4", "D7"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h index 63f1408cda..0d7e9f8a30 100644 --- a/keyboards/keebio/quefrency/rev3/config.h +++ b/keyboards/keebio/quefrency/rev3/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #pragma once -#define DIODE_DIRECTION COL2ROW -// wiring of each half -#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 } -#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 } -#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 } -#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 } #define SPLIT_HAND_PIN F7 #define CAPS_LOCK_LED_PIN B6 diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json index cd335a1d27..85e78eb203 100644 --- a/keyboards/keebio/quefrency/rev3/info.json +++ b/keyboards/keebio/quefrency/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x3357", "device_version": "3.1.0" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"], + "rows": ["B1", "B2", "C7", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} @@ -24,6 +29,12 @@ {"pin_a": "D6", "pin_b": "D4"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"], + "rows": ["B3", "B2", "B6", "B4", "D7"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h index 3292fbf302..e3adf83576 100644 --- a/keyboards/keebio/quefrency/rev4/config.h +++ b/keyboards/keebio/quefrency/rev4/config.h @@ -16,12 +16,6 @@ along with this program. If not, see . #pragma once -#define DIODE_DIRECTION COL2ROW -// wiring of each half -#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 } -#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 } -#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 } -#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 } #define SPLIT_HAND_PIN F7 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json index de9a383d4f..c3f2fc4041 100644 --- a/keyboards/keebio/quefrency/rev4/info.json +++ b/keyboards/keebio/quefrency/rev4/info.json @@ -8,6 +8,11 @@ "pid": "0x4357", "device_version": "4.1.0" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"], + "rows": ["B1", "B2", "C7", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} @@ -21,6 +26,12 @@ {"pin_a": "D6", "pin_b": "D4"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"], + "rows": ["B3", "B2", "B6", "B4", "D7"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h index 3292fbf302..e3adf83576 100644 --- a/keyboards/keebio/quefrency/rev5/config.h +++ b/keyboards/keebio/quefrency/rev5/config.h @@ -16,12 +16,6 @@ along with this program. If not, see . #pragma once -#define DIODE_DIRECTION COL2ROW -// wiring of each half -#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 } -#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 } -#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 } -#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 } #define SPLIT_HAND_PIN F7 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json index 422d987258..7c62abecac 100644 --- a/keyboards/keebio/quefrency/rev5/info.json +++ b/keyboards/keebio/quefrency/rev5/info.json @@ -8,6 +8,11 @@ "pid": "0x5357", "device_version": "5.1.0" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"], + "rows": ["B1", "B2", "C7", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} @@ -21,6 +26,12 @@ {"pin_a": "D6", "pin_b": "D4"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"], + "rows": ["B3", "B2", "B6", "B4", "D7"] + } } }, "processor": "atmega32u4", -- cgit v1.2.3