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/ft | |
| parent | 80661e5f1981af4d50a32d41e136e9586d5f5a43 (diff) | |
Move matrix config to info.json, part 2 (#19987)
Diffstat (limited to 'keyboards/ft')
| -rw-r--r-- | keyboards/ft/mars65/config.h | 16 | ||||
| -rw-r--r-- | keyboards/ft/mars65/info.json | 5 | ||||
| -rw-r--r-- | keyboards/ft/mars80/config.h | 6 | ||||
| -rw-r--r-- | keyboards/ft/mars80/info.json | 5 |
4 files changed, 10 insertions, 22 deletions
diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h index 53f33428df..abc2e5cea2 100644 --- a/keyboards/ft/mars65/config.h +++ b/keyboards/ft/mars65/config.h @@ -3,22 +3,6 @@ #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 { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { C6, C7, D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6, F7 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 24 diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json index 1d1dd840d9..2820016fda 100644 --- a/keyboards/ft/mars65/info.json +++ b/keyboards/ft/mars65/info.json @@ -8,6 +8,11 @@ "pid": "0x422F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h index 727718e396..116c09d6ac 100644 --- a/keyboards/ft/mars80/config.h +++ b/keyboards/ft/mars80/config.h @@ -20,12 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLED_NUM 20 -// 0 1 2 3 4 5 6 7 8 9 A B C D -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index ff451d8bcf..e5fb19a64d 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"], + "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, |