From 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 18:39:41 +1100 Subject: Migrate `DIRECT_PINS` to data driven (#19826) --- keyboards/0xcb/1337/config.h | 10 ---------- keyboards/0xcb/1337/info.json | 7 +++++++ keyboards/0xcb/tutelpad/config.h | 21 --------------------- keyboards/0xcb/tutelpad/info.json | 6 ++++++ 4 files changed, 13 insertions(+), 31 deletions(-) (limited to 'keyboards/0xcb') diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index 17ae0d55fb..10f946592f 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -18,16 +18,6 @@ along with this program. If not, see . // clang-format off -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { D2, D4, F4 }, \ - { D7, B1, B3 }, \ - { E6, B4, B2 } \ -} #define TAP_CODE_DELAY 10 #define ENCODER_RESOLUTION 4 #define ENCODERS_PAD_A { F6 } diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index 3da716aa37..ca04777536 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "matrix_pins": { + "direct": [ + ["D2", "D4", "F4"], + ["D7", "B1", "B3"], + ["E6", "B4", "B2"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h index 21f22620ad..d4ba1d439f 100644 --- a/keyboards/0xcb/tutelpad/config.h +++ b/keyboards/0xcb/tutelpad/config.h @@ -16,27 +16,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* - * 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) - * - */ -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { E6, D7, B1, B3 }, \ - { B5, B4, B2, B6 } \ -} - #define RGB_DI_PIN D3 // LED data pin on controller #define RGBLED_NUM 4 // Number of LEDs connected diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json index 96e61924b9..25c0ca51c4 100644 --- a/keyboards/0xcb/tutelpad/info.json +++ b/keyboards/0xcb/tutelpad/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["E6", "D7", "B1", "B3"], + ["B5", "B4", "B2", "B6"] + ] + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3