From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/system76/launch_1/config.h | 16 ---------------- keyboards/system76/launch_1/info.json | 5 +++++ 2 files changed, 5 insertions(+), 16 deletions(-) (limited to 'keyboards/system76') diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h index 886b5e2b78..10b1036c72 100644 --- a/keyboards/system76/launch_1/config.h +++ b/keyboards/system76/launch_1/config.h @@ -17,22 +17,6 @@ #pragma once - -/* - * Key matrix pins - * ROWS: AVR pins used for rows, top to bottom - * COLS: AVR pins used for columns, left to right - */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D7, C7, C6, B6, B5, B4, D6, D4, E6, D5, D3, D2, B7, B0 } - -/* - * Diode Direction - * COL2ROW = COL => Anode (+), ROW => Cathode (-) - * ROW2COL = ROW => Anode (+), COL => Cathode (-) - */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DI_PIN E2 # define RGB_MATRIX_LED_COUNT 84 diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json index e61caec07c..e6c8743541 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/info.json @@ -7,6 +7,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3