diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 04:59:07 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 04:59:07 +1100 |
| commit | 1022afa6c24a64c78d1c9be99a695ff5335876f7 (patch) | |
| tree | d5891c76ad09f9c0177ef11753796e31f6cfbc19 /keyboards/keychron/s1 | |
| parent | 4b1f0e8daa8cfacbbc3cdc22653e2bc1458cea96 (diff) | |
Move matrix config to info.json, part 8 (#20030)
Diffstat (limited to 'keyboards/keychron/s1')
| -rw-r--r-- | keyboards/keychron/s1/ansi/rgb/info.json | 5 | ||||
| -rw-r--r-- | keyboards/keychron/s1/ansi/white/info.json | 5 | ||||
| -rw-r--r-- | keyboards/keychron/s1/config.h | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json index 02ea4d4c90..2aabe622d4 100644 --- a/keyboards/keychron/s1/ansi/rgb/info.json +++ b/keyboards/keychron/s1/ansi/rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x0410", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json index a64f5eb0a9..e6c0e4f3d1 100644 --- a/keyboards/keychron/s1/ansi/white/info.json +++ b/keyboards/keychron/s1/ansi/white/info.json @@ -8,6 +8,11 @@ "pid": "0x0411", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/keychron/s1/config.h b/keyboards/keychron/s1/config.h index e12cc0479c..8c98389522 100644 --- a/keyboards/keychron/s1/config.h +++ b/keyboards/keychron/s1/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B5, B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Disable DIP switch in matrix data */ #define MATRIX_MASKED |