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/chlx/merro60 | |
| parent | 9e64300e67720a5468c2585391250ca5579b311b (diff) | |
Move matrix config to info.json, part 6 (#20019)
Diffstat (limited to 'keyboards/chlx/merro60')
| -rw-r--r-- | keyboards/chlx/merro60/config.h | 16 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/info.json | 5 |
2 files changed, 5 insertions, 16 deletions
diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h index f9f0068b16..18198a8bce 100644 --- a/keyboards/chlx/merro60/config.h +++ b/keyboards/chlx/merro60/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 { D4, D5, D3, B5, F4 } -#define MATRIX_COL_PINS { B7, D1, D0, B0, B1, E6, B2, B3, D2, D7, B4, B6, C6, C7, D6 } - -/* COL2ROW, 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/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json index bbb3124868..99308fecde 100644 --- a/keyboards/chlx/merro60/info.json +++ b/keyboards/chlx/merro60/info.json @@ -8,6 +8,11 @@ "pid": "0x0601", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"], + "rows": ["D4", "D5", "D3", "B5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { |