diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:34:34 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 00:34:34 +1100 |
| commit | ace372d90de13dafc815df5d8049497cb351b69b (patch) | |
| tree | 0eb4793443956fbc60a1cfca5c1f1e556422ce66 /keyboards/redox | |
| parent | 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (diff) | |
Move matrix config to info.json, part 3 (#19991)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/redox')
| -rw-r--r-- | keyboards/redox/rev1/base/info.json | 5 | ||||
| -rw-r--r-- | keyboards/redox/rev1/config.h | 9 | ||||
| -rw-r--r-- | keyboards/redox/rev1/proton_c/config.h | 7 | ||||
| -rw-r--r-- | keyboards/redox/rev1/proton_c/info.json | 5 |
4 files changed, 10 insertions, 16 deletions
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json index d65f0e2b1b..1c251361f0 100644 --- a/keyboards/redox/rev1/base/info.json +++ b/keyboards/redox/rev1/base/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index b768d2f19f..8b05acd7ed 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order - -/* COL2ROW or 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/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index 71d3470569..c32700fda9 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -3,13 +3,6 @@ #pragma once - -// wiring of each half -#undef MATRIX_ROW_PINS -#define MATRIX_ROW_PINS { B5, B3, B2, B1, B0 } -#undef MATRIX_COL_PINS -#define MATRIX_COL_PINS { A1, A0, B8, B13, B14, B15, B9 } - // //we are using hardware serial, so lets undef the softserial used otherwise /* serial.c configuration for split keyboard */ diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index 4f6bae6891..5d5358adb0 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["A1", "A0", "B8", "B13", "B14", "B15", "B9"], + "rows": ["B5", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" |