diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-10 22:16:56 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-10 22:16:56 +1100 |
| commit | dd086a51d82a574a55eb3b89e8943301d72296f3 (patch) | |
| tree | db49e94d90e9f3a8a6cf72a9da0d5549dd2a9bcb /keyboards/ffkeebs | |
| parent | 80661e5f1981af4d50a32d41e136e9586d5f5a43 (diff) | |
Move matrix config to info.json, part 2 (#19987)
Diffstat (limited to 'keyboards/ffkeebs')
| -rw-r--r-- | keyboards/ffkeebs/puca/config.h | 7 | ||||
| -rw-r--r-- | keyboards/ffkeebs/puca/info.json | 5 | ||||
| -rw-r--r-- | keyboards/ffkeebs/siris/config.h | 27 | ||||
| -rw-r--r-- | keyboards/ffkeebs/siris/info.json | 5 |
4 files changed, 10 insertions, 34 deletions
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h index 6f88b36fe7..d87c5bfac9 100644 --- a/keyboards/ffkeebs/puca/config.h +++ b/keyboards/ffkeebs/puca/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - - // 0 , 1 , 2 , 3 , 4 , 5 -#define MATRIX_ROW_PINS { B4, E6, D7, B5, C6, F6} -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6} - -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN D4 diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json index 1cf9fd94eb..6abad1adb7 100644 --- a/keyboards/ffkeebs/puca/info.json +++ b/keyboards/ffkeebs/puca/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["B4", "E6", "D7", "B5", "C6", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} diff --git a/keyboards/ffkeebs/siris/config.h b/keyboards/ffkeebs/siris/config.h deleted file mode 100644 index 3e03a4020e..0000000000 --- a/keyboards/ffkeebs/siris/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { D2, D1, D0, B7, B3, B2, F0, F1, F4, F5, F6, F7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/info.json index 5da5369b7c..c5449eab0b 100644 --- a/keyboards/ffkeebs/siris/info.json +++ b/keyboards/ffkeebs/siris/info.json @@ -8,6 +8,11 @@ "pid": "0xE96C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "B7", "B3", "B2", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["B5", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D5"}, |