diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:32:05 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 00:32:05 +1100 |
| commit | 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (patch) | |
| tree | f25535b5a7d7d489b5bb77b5c8c57b24ba78a849 /keyboards/canary | |
| parent | 9e64300e67720a5468c2585391250ca5579b311b (diff) | |
Move matrix config to info.json, part 6 (#20019)
Diffstat (limited to 'keyboards/canary')
| -rw-r--r-- | keyboards/canary/canary60rgb/info.json | 5 | ||||
| -rw-r--r-- | keyboards/canary/canary60rgb/v1/config.h | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index 069d812665..55e0ea0c56 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x0621", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h index 757db92403..999ec9f108 100644 --- a/keyboards/canary/canary60rgb/v1/config.h +++ b/keyboards/canary/canary60rgb/v1/config.h @@ -15,22 +15,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 { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B6 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING |