diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:34:34 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 00:34:34 +1100 |
| commit | ace372d90de13dafc815df5d8049497cb351b69b (patch) | |
| tree | 0eb4793443956fbc60a1cfca5c1f1e556422ce66 /keyboards/edi/hardlight | |
| parent | 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (diff) | |
Move matrix config to info.json, part 3 (#19991)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/edi/hardlight')
| -rw-r--r-- | keyboards/edi/hardlight/mk1/config.h | 18 | ||||
| -rw-r--r-- | keyboards/edi/hardlight/mk1/info.json | 7 | ||||
| -rw-r--r-- | keyboards/edi/hardlight/mk2/config.h | 4 | ||||
| -rw-r--r-- | keyboards/edi/hardlight/mk2/info.json | 5 |
4 files changed, 11 insertions, 23 deletions
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h index 5d074c2e4a..273c65f800 100644 --- a/keyboards/edi/hardlight/mk1/config.h +++ b/keyboards/edi/hardlight/mk1/config.h @@ -17,24 +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 { B0, B1, B2, B3, D4, D6, D7, B4 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5 } - - -/* 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/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json index 7849eae7ca..ee4d27aa19 100644 --- a/keyboards/edi/hardlight/mk1/info.json +++ b/keyboards/edi/hardlight/mk1/info.json @@ -6,8 +6,13 @@ "pid": "0x2401", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"], + "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x16": { "layout": [ diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index c140a7bad5..847660514c 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B2, B6, B5, F1, F0, C15, C14, C13 } -#define MATRIX_ROW_PINS { B10, B11, A14, A15, A3, A0, A2, A1 } -#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/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json index aff84f1e32..ab2e78088a 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/info.json @@ -6,6 +6,11 @@ "pid": "0x2408", "device_version": "0.0.7" }, + "matrix_pins": { + "cols": ["B2", "B6", "B5", "F1", "F0", "C15", "C14", "C13"], + "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x16"], |