From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: Move matrix config to info.json, part 4 (#20001) --- keyboards/percent/booster/config.h | 6 ------ keyboards/percent/booster/info.json | 5 +++++ keyboards/percent/canoe/config.h | 5 ----- keyboards/percent/canoe/info.json | 5 +++++ keyboards/percent/canoe_gen2/config.h | 9 --------- keyboards/percent/canoe_gen2/info.json | 5 +++++ keyboards/percent/skog/config.h | 4 ---- keyboards/percent/skog/info.json | 5 +++++ keyboards/percent/skog_lite/config.h | 6 ------ keyboards/percent/skog_lite/info.json | 5 +++++ 10 files changed, 25 insertions(+), 30 deletions(-) (limited to 'keyboards/percent') diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h index b452a0dcb6..35a7541060 100644 --- a/keyboards/percent/booster/config.h +++ b/keyboards/percent/booster/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D1, D6, D7, B4, B5 } -#define MATRIX_COL_PINS { C7, D4, D2, D0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json index f92476c9f6..89b0744ee0 100644 --- a/keyboards/percent/booster/info.json +++ b/keyboards/percent/booster/info.json @@ -8,6 +8,11 @@ "pid": "0x4253", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D4", "D2", "D0"], + "rows": ["D1", "D6", "D7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h index 69f53905fc..b7aa6ca2e9 100644 --- a/keyboards/percent/canoe/config.h +++ b/keyboards/percent/canoe/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 2 -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json index 951e55ec64..2933386c5f 100644 --- a/keyboards/percent/canoe/info.json +++ b/keyboards/percent/canoe/info.json @@ -8,6 +8,11 @@ "pid": "0x434E", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h index 7138fe3939..f5bfd30028 100644 --- a/keyboards/percent/canoe_gen2/config.h +++ b/keyboards/percent/canoe_gen2/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B3,B2,F5,F4} -#define MATRIX_COL_PINS {B0,D0,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,F6,F7} - -/* 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/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json index e84a835991..9426dd27b9 100644 --- a/keyboards/percent/canoe_gen2/info.json +++ b/keyboards/percent/canoe_gen2/info.json @@ -8,6 +8,11 @@ "pid": "0x89F0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"], + "rows": ["B1", "B3", "B2", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"], diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h index 274d30df72..6907429c39 100644 --- a/keyboards/percent/skog/config.h +++ b/keyboards/percent/skog/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#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 RGBLED_NUM 2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json index 80c7d832c4..5dc22d2874 100644 --- a/keyboards/percent/skog/info.json +++ b/keyboards/percent/skog/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "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", "levels": 5 diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h index b00a612cd7..75b78de22d 100644 --- a/keyboards/percent/skog_lite/config.h +++ b/keyboards/percent/skog_lite/config.h @@ -20,12 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 18 -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B5 } -#define MATRIX_COL_PINS { C4, C2, D7, C7, C6, A0, A1, A2, A3, A7, A6, A4, A5, C5, C3} - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json index 74abc67bdc..c6151dfba9 100644 --- a/keyboards/percent/skog_lite/info.json +++ b/keyboards/percent/skog_lite/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C4", "C2", "D7", "C7", "C6", "A0", "A1", "A2", "A3", "A7", "A6", "A4", "A5", "C5", "C3"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, -- cgit v1.2.3