From 23c365b023e409885e6f201f12df56e5145dde47 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Mar 2023 09:53:52 +1100 Subject: Move matrix config to info.json, part 1 (#19985) --- keyboards/jels/jels60/config.h | 8 -------- keyboards/jels/jels60/info.json | 5 +++++ keyboards/jels/jels88/config.h | 10 ---------- keyboards/jels/jels88/info.json | 5 +++++ 4 files changed, 10 insertions(+), 18 deletions(-) (limited to 'keyboards/jels') diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h index b03ceffba8..d78952f261 100644 --- a/keyboards/jels/jels60/config.h +++ b/keyboards/jels/jels60/config.h @@ -16,14 +16,6 @@ #pragma once - -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS {B3, D2, F0, F4, F1} -#define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5} - -/* 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/jels/jels60/info.json b/keyboards/jels/jels60/info.json index ecca670d1d..418410c3ff 100644 --- a/keyboards/jels/jels60/info.json +++ b/keyboards/jels/jels60/info.json @@ -8,6 +8,11 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"], + "rows": ["B3", "D2", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h index b655834c02..3eec23b214 100644 --- a/keyboards/jels/jels88/config.h +++ b/keyboards/jels/jels88/config.h @@ -16,13 +16,6 @@ #pragma once - -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS \ - { B3, B2, D1, D0, E6, B0, F0, F1, B5, B4, D7, D6 } -#define MATRIX_COL_PINS \ - { C7, C6, F7, F6, F5, F4, B1, D2, D3 } - /* ws2812b RGB LEDs */ #define RGB_DI_PIN B6 @@ -43,9 +36,6 @@ #define RGBLIGHT_LIMIT_VAL 225 // keep PCB under 500mA #endif -/* 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/jels/jels88/info.json b/keyboards/jels/jels88/info.json index 6324bfb133..6542e29a08 100644 --- a/keyboards/jels/jels88/info.json +++ b/keyboards/jels/jels88/info.json @@ -8,6 +8,11 @@ "pid": "0x0088", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "B1", "D2", "D3"], + "rows": ["B3", "B2", "D1", "D0", "E6", "B0", "F0", "F1", "B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 0] }, -- cgit v1.2.3