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/nullbitsco/scramble/v1/config.h | 7 ------- keyboards/nullbitsco/scramble/v1/info.json | 8 +++++++- keyboards/nullbitsco/scramble/v2/config.h | 6 ------ keyboards/nullbitsco/scramble/v2/info.json | 8 +++++++- 4 files changed, 14 insertions(+), 15 deletions(-) (limited to 'keyboards/nullbitsco') diff --git a/keyboards/nullbitsco/scramble/v1/config.h b/keyboards/nullbitsco/scramble/v1/config.h index 6f512db4c5..6a7742ce87 100644 --- a/keyboards/nullbitsco/scramble/v1/config.h +++ b/keyboards/nullbitsco/scramble/v1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -#define DIRECT_PINS {{D4,D5,B1}, {C3,C2,C1}} - /* Optional encoder pins */ #define ENCODERS_PAD_A { D6 } #define ENCODERS_PAD_B { D7 } diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/info.json index 11307eba89..0acb699373 100644 --- a/keyboards/nullbitsco/scramble/v1/info.json +++ b/keyboards/nullbitsco/scramble/v1/info.json @@ -1,4 +1,10 @@ { "processor": "atmega328p", - "bootloader": "usbasploader" + "bootloader": "usbasploader", + "matrix_pins": { + "direct": [ + ["D4", "D5", "B1"], + ["C3", "C2", "C1"] + ] + } } diff --git a/keyboards/nullbitsco/scramble/v2/config.h b/keyboards/nullbitsco/scramble/v2/config.h index b4d7820aad..dd2ae62749 100644 --- a/keyboards/nullbitsco/scramble/v2/config.h +++ b/keyboards/nullbitsco/scramble/v2/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -#define DIRECT_PINS {{GP6,GP8,GP10}, {GP29,GP28,GP22}} - /* Optional encoder pins */ #define ENCODERS_PAD_A { GP24 } #define ENCODERS_PAD_B { GP25 } diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json index 87b7fcf7ec..ba27823b36 100644 --- a/keyboards/nullbitsco/scramble/v2/info.json +++ b/keyboards/nullbitsco/scramble/v2/info.json @@ -1,4 +1,10 @@ { "processor": "RP2040", - "bootloader": "rp2040" + "bootloader": "rp2040", + "matrix_pins": { + "direct": [ + ["GP6", "GP8", "GP10"], + ["GP29", "GP28", "GP22"] + ] + } } -- cgit v1.2.3