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 +++ keyboards/1k/config.h | 12 ------ keyboards/1k/info.json | 5 +++ keyboards/25keys/cassette42/config.h | 7 ---- keyboards/25keys/cassette42/info.json | 5 +++ keyboards/40percentclub/4pack/config.h | 24 ------------ keyboards/40percentclub/4pack/info.json | 5 +++ keyboards/40percentclub/nano/config.h | 23 ----------- keyboards/40percentclub/nano/info.json | 6 +++ keyboards/40percentclub/nein/config.h | 12 ------ keyboards/40percentclub/nein/info.json | 7 ++++ keyboards/40percentclub/sixpack/config.h | 23 ----------- keyboards/40percentclub/sixpack/info.json | 6 +++ keyboards/8pack/config.h | 12 ------ keyboards/8pack/info.json | 6 +++ keyboards/a_dux/config.h | 30 --------------- keyboards/a_dux/info.json | 20 ++++++++++ keyboards/adafruit/macropad/config.h | 16 -------- keyboards/adafruit/macropad/info.json | 9 +++++ keyboards/anavi/knob1/config.h | 11 ------ keyboards/anavi/knob1/info.json | 5 +++ keyboards/anavi/macropad8/config.h | 21 ---------- keyboards/anavi/macropad8/info.json | 6 +++ keyboards/arrayperipherals/1x4p1/config.h | 10 ----- keyboards/arrayperipherals/1x4p1/info.json | 5 +++ keyboards/beekeeb/piantor/config.h | 18 --------- keyboards/beekeeb/piantor/info.json | 20 +++++++++- keyboards/botanicalkeyboards/fm2u/config.h | 45 ---------------------- keyboards/botanicalkeyboards/fm2u/info.json | 5 +++ keyboards/bpiphany/sixshooter/config.h | 28 -------------- keyboards/bpiphany/sixshooter/info.json | 6 +++ keyboards/cantor/config.h | 14 ------- keyboards/cantor/info.json | 20 ++++++++++ keyboards/crypt_macro/config.h | 9 ----- keyboards/crypt_macro/info.json | 6 +++ keyboards/dailycraft/owl8/config.h | 22 ----------- keyboards/dailycraft/owl8/info.json | 5 +++ keyboards/dailycraft/stickey4/config.h | 22 ----------- keyboards/dailycraft/stickey4/info.json | 5 +++ keyboards/dekunukem/duckypad/config.h | 6 --- keyboards/dekunukem/duckypad/info.json | 5 +++ keyboards/ferris/sweep/config.h | 19 --------- keyboards/ferris/sweep/info.json | 22 ++++++++++- keyboards/geekboards/macropad_v2/config.h | 6 --- keyboards/geekboards/macropad_v2/info.json | 6 +++ keyboards/handwired/aball/config.h | 7 ---- keyboards/handwired/aball/info.json | 5 +++ keyboards/handwired/bdn9_ble/config.h | 12 ------ keyboards/handwired/bdn9_ble/info.json | 7 ++++ keyboards/handwired/bento/rev1/config.h | 11 ------ keyboards/handwired/bento/rev1/info.json | 6 +++ keyboards/handwired/dc/mc/001/config.h | 13 ------- keyboards/handwired/dc/mc/001/info.json | 5 +++ keyboards/handwired/lemonpad/config.h | 21 ---------- keyboards/handwired/lemonpad/info.json | 6 +++ keyboards/handwired/stream_cheap/2x3/config.h | 8 ---- keyboards/handwired/stream_cheap/2x3/info.json | 6 +++ keyboards/handwired/stream_cheap/2x4/config.h | 11 ------ keyboards/handwired/stream_cheap/2x4/info.json | 6 +++ keyboards/handwired/stream_cheap/2x5/config.h | 8 ---- keyboards/handwired/stream_cheap/2x5/info.json | 6 +++ keyboards/ianklug/grooveboard/config.h | 24 ------------ keyboards/ianklug/grooveboard/info.json | 5 +++ keyboards/kb_elmo/isolation/config.h | 8 ---- keyboards/kb_elmo/isolation/info.json | 5 +++ keyboards/keebio/bamfk1/config.h | 13 ------- keyboards/keebio/bamfk1/info.json | 6 +++ keyboards/keebio/bdn9/rev1/config.h | 12 ------ keyboards/keebio/bdn9/rev1/info.json | 9 ++++- keyboards/keebio/bdn9/rev2/config.h | 12 ------ keyboards/keebio/bdn9/rev2/info.json | 9 ++++- keyboards/keebio/choconum/config.h | 15 -------- keyboards/keebio/choconum/info.json | 9 +++++ keyboards/keebio/stick/config.h | 13 ------- keyboards/keebio/stick/info.json | 5 +++ keyboards/keebio/tukey/config.h | 11 ------ keyboards/keebio/tukey/info.json | 5 +++ keyboards/keyhive/uno/rev1/config.h | 9 ----- keyboards/keyhive/uno/rev1/info.json | 7 +++- keyboards/keyhive/uno/rev2/config.h | 9 ----- keyboards/keyhive/uno/rev2/info.json | 7 +++- keyboards/ktec/staryu/config.h | 11 ------ keyboards/ktec/staryu/info.json | 6 +++ keyboards/leafcutterlabs/bigknob/config.h | 22 ----------- keyboards/leafcutterlabs/bigknob/info.json | 5 +++ keyboards/littlealby/mute/config.h | 13 ------- keyboards/littlealby/mute/info.json | 5 +++ keyboards/macro3/config.h | 10 ----- keyboards/macro3/info.json | 6 +++ keyboards/makeymakey/config.h | 12 ------ keyboards/makeymakey/info.json | 7 ++++ keyboards/miniaxe/config.h | 28 -------------- keyboards/miniaxe/info.json | 8 ++++ keyboards/minimacro5/config.h | 21 ---------- keyboards/minimacro5/info.json | 5 +++ keyboards/mixi/config.h | 12 ------ keyboards/mixi/info.json | 7 ++++ keyboards/novelkeys/nk1/config.h | 10 ----- keyboards/novelkeys/nk1/info.json | 5 +++ 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 +++- keyboards/obosob/steal_this_keyboard/config.h | 30 --------------- keyboards/obosob/steal_this_keyboard/info.json | 20 ++++++++++ keyboards/peranekofactory/tone/rev1/config.h | 23 ----------- keyboards/peranekofactory/tone/rev1/info.json | 5 +++ keyboards/peranekofactory/tone/rev2/config.h | 23 ----------- keyboards/peranekofactory/tone/rev2/info.json | 5 +++ keyboards/ploopyco/mouse/config.h | 20 ---------- keyboards/ploopyco/mouse/info.json | 5 +++ keyboards/ploopyco/trackball/rev1/config.h | 15 -------- keyboards/ploopyco/trackball/rev1/info.json | 7 +++- keyboards/ploopyco/trackball/rev1_005/config.h | 15 -------- keyboards/ploopyco/trackball/rev1_005/info.json | 7 +++- .../ploopyco/trackball_mini/rev1_001/config.h | 15 -------- .../ploopyco/trackball_mini/rev1_001/info.json | 7 ++++ .../ploopyco/trackball_mini/rev1_002/config.h | 15 -------- .../ploopyco/trackball_mini/rev1_002/info.json | 7 ++++ .../ploopyco/trackball_nano/rev1_001/config.h | 12 ------ .../ploopyco/trackball_nano/rev1_001/info.json | 7 ++++ keyboards/ryanbaekr/rb1/config.h | 10 ----- keyboards/ryanbaekr/rb1/info.json | 5 +++ keyboards/sendyyeah/pix/config.h | 10 ----- keyboards/sendyyeah/pix/info.json | 5 +++ keyboards/sergiopoverony/creator_pro/config.h | 10 ----- keyboards/sergiopoverony/creator_pro/info.json | 5 +++ keyboards/spaceman/2_milk/config.h | 10 ----- keyboards/spaceman/2_milk/info.json | 6 +++ keyboards/splitkb/zima/config.h | 15 -------- keyboards/splitkb/zima/info.json | 8 ++++ keyboards/tominabox1/bigboy/config.h | 8 ---- keyboards/tominabox1/bigboy/info.json | 6 +++ keyboards/ungodly/nines/config.h | 12 ------ keyboards/ungodly/nines/info.json | 7 ++++ keyboards/winkeys/mini_winni/config.h | 8 ---- keyboards/winkeys/mini_winni/info.json | 6 +++ keyboards/winry/winry315/config.h | 12 ------ keyboards/winry/winry315/info.json | 5 +++ keyboards/xiudi/xd002/config.h | 12 ------ keyboards/xiudi/xd002/info.json | 5 +++ keyboards/xiudi/xd004/info.json | 5 +++ keyboards/xiudi/xd004/v1/config.h | 18 --------- keyboards/yatara/drink_me/config.h | 27 ------------- keyboards/yatara/drink_me/info.json | 5 +++ keyboards/yeehaw/config.h | 10 ----- keyboards/yeehaw/info.json | 5 +++ keyboards/yushakobo/quick7/config.h | 27 ------------- keyboards/yushakobo/quick7/info.json | 7 ++++ keyboards/yynmt/acperience12/rev1/config.h | 6 --- keyboards/yynmt/acperience12/rev1/info.json | 10 +++++ keyboards/z12/config.h | 13 ------- keyboards/z12/info.json | 8 ++++ keyboards/z34/config.h | 21 ---------- keyboards/z34/info.json | 20 ++++++++++ 158 files changed, 560 insertions(+), 1197 deletions(-) delete mode 100644 keyboards/botanicalkeyboards/fm2u/config.h delete mode 100644 keyboards/bpiphany/sixshooter/config.h create mode 100644 keyboards/ploopyco/trackball_mini/rev1_001/info.json create mode 100644 keyboards/ploopyco/trackball_mini/rev1_002/info.json create mode 100644 keyboards/ploopyco/trackball_nano/rev1_001/info.json delete mode 100644 keyboards/yatara/drink_me/config.h (limited to 'keyboards') 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": [ diff --git a/keyboards/1k/config.h b/keyboards/1k/config.h index f5d74426ef..1e970661c0 100644 --- a/keyboards/1k/config.h +++ b/keyboards/1k/config.h @@ -15,18 +15,6 @@ */ #pragma once - -/* matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* - * Keyboard Matrix Assignments - * - * On this board we have direct connection: no diodes. - */ -#define DIRECT_PINS {{ B0 }} - #define RGBLED_NUM 1 #define RGB_DI_PIN B2 diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json index 0c2de31808..8a27d94862 100644 --- a/keyboards/1k/info.json +++ b/keyboards/1k/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "direct": [ + ["B0"] + ] + }, "layouts": { "LAYOUT_ortho_1x1": { "layout": [ diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h index fe43496227..c57f66da5d 100644 --- a/keyboards/25keys/cassette42/config.h +++ b/keyboards/25keys/cassette42/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 6 - -#define DIRECT_PINS {{ B4, F6, F5, F4, B5, F7 }} - #define ENCODERS_PAD_A { B6, B3 } #define ENCODERS_PAD_B { B2, B1 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json index 5150c28422..546e02ab63 100644 --- a/keyboards/25keys/cassette42/info.json +++ b/keyboards/25keys/cassette42/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["B4", "F6", "F5", "F4", "B5", "F7"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}] diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h index 3a8a54d4fa..d289f893ec 100644 --- a/keyboards/40percentclub/4pack/config.h +++ b/keyboards/40percentclub/4pack/config.h @@ -17,30 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#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) - * - */ -// #define MATRIX_ROW_PINS { B0 } // B0 equivalents the ground pin -// #define MATRIX_COL_PINS { E6, D7, C6, D4 } -#define DIRECT_PINS { \ - { E6, D7, C6, D4 } \ -} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_LED_COUNT 2 #undef BACKLIGHT_PIN #define BACKLIGHT_PINS { F6, F7 } diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json index 91c6171dff..1665c7b35b 100644 --- a/keyboards/40percentclub/4pack/info.json +++ b/keyboards/40percentclub/4pack/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["E6", "D7", "C6", "D4"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}] diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h index 7d3c140923..39aa83e067 100644 --- a/keyboards/40percentclub/nano/config.h +++ b/keyboards/40percentclub/nano/config.h @@ -17,29 +17,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) - * NO_DIODE = switches are directly connected to AVR pins - * -*/ -// #define MATRIX_ROW_PINS { D0, D5 } -// #define MATRIX_COL_PINS { F1, F0, B0 } -#define DIRECT_PINS { \ - { F4, F5, F6, F7 }, \ - { D1, D0, D4, C6 }, \ -} - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json index 1821a684ac..430129a6a1 100644 --- a/keyboards/40percentclub/nano/info.json +++ b/keyboards/40percentclub/nano/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["F4", "F5", "F6", "F7"], + ["D1", "D0", "D4", "C6"] + ] + }, "layouts": { "LAYOUT_ortho_2x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h index 0cc521499e..e89243f55e 100644 --- a/keyboards/40percentclub/nein/config.h +++ b/keyboards/40percentclub/nein/config.h @@ -16,18 +16,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { F4, F5, F6 }, \ - { F7, B1, B3 }, \ - { B2, B6, B5 } \ -} - // #define RGB_DI_PIN E2 // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json index 82d03395d8..ba39cb834d 100644 --- a/keyboards/40percentclub/nein/info.json +++ b/keyboards/40percentclub/nein/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["F4", "F5", "F6"], + ["F7", "B1", "B3"], + ["B2", "B6", "B5"] + ] + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h index 9c384ef2aa..c94721d714 100644 --- a/keyboards/40percentclub/sixpack/config.h +++ b/keyboards/40percentclub/sixpack/config.h @@ -17,29 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -/* - * 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 DIRECT_PINS { \ - { D4, C6, D7 }, \ - { E6, B4, B5 } \ -} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Backlight */ #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 6 diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json index 78ca5bda58..ea7e6281a9 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "C6", "D7"], + ["E6", "B4", "B5"] + ] + }, "community_layouts": ["ortho_2x3"], "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h index ddd88f1303..a9564f1bcf 100644 --- a/keyboards/8pack/config.h +++ b/keyboards/8pack/config.h @@ -1,23 +1,11 @@ #pragma once - -/* 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 */ #define LOCKING_RESYNC_ENABLE -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* key matrix pins */ - -#define DIRECT_PINS { { F4, F5, F6, F7 }, { B1, B3, B2, B6 } } - #define BACKLIGHT_LED_COUNT 8 #undef BACKLIGHT_PIN #define BACKLIGHT_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index 4520540642..fa33b2644f 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -9,6 +9,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["F4", "F5", "F6", "F7"], + ["B1", "B3", "B2", "B6"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h index d6551e60c4..d636139928 100644 --- a/keyboards/a_dux/config.h +++ b/keyboards/a_dux/config.h @@ -16,36 +16,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 5 - -/* - * 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) - * NO_DIODE = switches are directly connected to AVR pins - * -*/ -#define DIRECT_PINS { \ - { C6, D2, F7, B2, F4 }, \ - { D7, D0, F6, B3, F5 }, \ - { E6, D4, D3, B1, B6 }, \ - { B4, B5, NO_PIN, NO_PIN, NO_PIN } \ -} - -#define DIRECT_PINS_RIGHT { \ - { F4, B2, F7, D2, C6 }, \ - { F5, B3, F6, D0, D7 }, \ - { B6, B1, D3, D4, E6 }, \ - { B5, B4, NO_PIN, NO_PIN, NO_PIN } \ -} - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json index d5a8365279..6292d5e707 100644 --- a/keyboards/a_dux/info.json +++ b/keyboards/a_dux/info.json @@ -10,6 +10,26 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["C6", "D2", "F7", "B2", "F4"], + ["D7", "D0", "F6", "B3", "F5"], + ["E6", "D4", "D3", "B1", "B6"], + ["B4", "B5", null, null, null] + ] + }, + "split": { + "matrix_pins": { + "right": { + "direct": [ + ["F4", "B2", "F7", "D2", "C6"], + ["F5", "B3", "F6", "D0", "D7"], + ["B6", "B1", "D3", "D4", "E6"], + ["B5", "B4", null, null, null] + ] + } + } + }, "community_layouts": ["split_3x5_2"], "layouts": { "LAYOUT_split_3x5_2": { diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h index d533828dae..7f1170ef37 100644 --- a/keyboards/adafruit/macropad/config.h +++ b/keyboards/adafruit/macropad/config.h @@ -16,22 +16,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -// clang-format off -#define DIRECT_PINS { \ - { NO_PIN, NO_PIN, GP0 }, \ - { GP1, GP2, GP3 }, \ - { GP4, GP5, GP6 }, \ - { GP7, GP8, GP9 }, \ - { GP10, GP11, GP12 } \ -} -// clang-format on - /* OLED SPI Defines */ #define OLED_DISPLAY_128X64 #define OLED_IC OLED_IC_SH1106 diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index adb82407ec..588c51b008 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -10,6 +10,15 @@ }, "processor": "RP2040", "bootloader": "rp2040", + "matrix_pins": { + "direct": [ + [null, null, "GP0"], + ["GP1", "GP2", "GP3"], + ["GP4", "GP5", "GP6"], + ["GP7", "GP8", "GP9"], + ["GP10", "GP11", "GP12"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/anavi/knob1/config.h b/keyboards/anavi/knob1/config.h index 207b653a42..338f5d8dbe 100644 --- a/keyboards/anavi/knob1/config.h +++ b/keyboards/anavi/knob1/config.h @@ -3,17 +3,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* Keyboard Matrix Assignments */ -// clang-format off -#define DIRECT_PINS { \ - { GP26 } \ -} - #define RGBLIGHT_DEFAULT_MODE 9 /* Double tap reset button to enter bootloader */ diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index 0677916600..1bd66e9ef0 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -44,6 +44,11 @@ } ] }, + "matrix_pins": { + "direct": [ + ["GP26"] + ] + }, "layouts": { "LAYOUT_k1": { "layout": [ diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h index a6c0269102..815636ead6 100644 --- a/keyboards/anavi/macropad8/config.h +++ b/keyboards/anavi/macropad8/config.h @@ -17,27 +17,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) - * NO_DIODE = switches are directly connected to AVR pins - * -*/ -#define DIRECT_PINS { \ - { D4, F6, B5, E6 }, \ - { F5, F7, B4, C6 } \ -} - #define BACKLIGHT_PIN D7 #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 3 diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json index 979f436810..51e805059d 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "F6", "B5", "E6"], + ["F5", "F7", "B4", "C6"] + ] + }, "layouts": { "LAYOUT_ortho_2x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/arrayperipherals/1x4p1/config.h b/keyboards/arrayperipherals/1x4p1/config.h index 719c2c00da..b70680e4f5 100644 --- a/keyboards/arrayperipherals/1x4p1/config.h +++ b/keyboards/arrayperipherals/1x4p1/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 5 - - -#define DIRECT_PINS { \ - { C7, B7, D6, F5, F7} \ -} - /* rotary encoder*/ #define ENCODERS_PAD_A {F0} #define ENCODERS_PAD_B {F1} diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index b224d3d5a6..0441646af0 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["C7", "B7", "D6", "F5", "F7"] + ] + }, "layouts": { "LAYOUT_ortho_1x5": { "layout": [ diff --git a/keyboards/beekeeb/piantor/config.h b/keyboards/beekeeb/piantor/config.h index 8a3e5eb467..6a50429c20 100644 --- a/keyboards/beekeeb/piantor/config.h +++ b/keyboards/beekeeb/piantor/config.h @@ -11,23 +11,5 @@ #define SERIAL_USART_TX_PIN GP0 #define SERIAL_USART_RX_PIN GP1 -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 - -#define DIRECT_PINS { \ - { GP5, GP4, GP11, GP15, GP3, GP2}, \ - { GP22, GP20, GP10, GP14, GP9, GP8}, \ - { GP21, GP19, GP6, GP7, GP13, GP12}, \ - { GP17, GP18, GP16, NO_PIN, NO_PIN, NO_PIN} \ -} - -#define DIRECT_PINS_RIGHT { \ - { GP22, GP21, GP2, GP5, GP8, GP11}, \ - { GP20, GP19, GP3, GP6, GP9, GP12}, \ - { GP18, GP17, GP4, GP7, GP10, GP13}, \ - { GP15, GP14, GP16, NO_PIN, NO_PIN, NO_PIN} \ -} - #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 5 diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/info.json index 50f4feed66..a914b1882d 100644 --- a/keyboards/beekeeb/piantor/info.json +++ b/keyboards/beekeeb/piantor/info.json @@ -18,8 +18,26 @@ "pid": "0x0001", "vid": "0xBEEB" }, + "matrix_pins": { + "direct": [ + ["GP5", "GP4", "GP11", "GP15", "GP3", "GP2"], + ["GP22", "GP20", "GP10", "GP14", "GP9", "GP8"], + ["GP21", "GP19", "GP6", "GP7", "GP13", "GP12"], + ["GP17", "GP18", "GP16", null, null, null] + ] + }, "split": { - "enabled": true + "enabled": true, + "matrix_pins": { + "right": { + "direct": [ + ["GP22", "GP21", "GP2", "GP5", "GP8", "GP11"], + ["GP20", "GP19", "GP3", "GP6", "GP9", "GP12"], + ["GP18", "GP17", "GP4", "GP7", "GP10", "GP13"], + ["GP15", "GP14", "GP16", null, null, null] + ] + } + } }, "community_layouts": ["split_3x6_3"], "layouts": { diff --git a/keyboards/botanicalkeyboards/fm2u/config.h b/keyboards/botanicalkeyboards/fm2u/config.h deleted file mode 100644 index a329779827..0000000000 --- a/keyboards/botanicalkeyboards/fm2u/config.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -Copyright 2020 mechmerlin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { C4 } \ -} - -/* - * 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) - * - */ - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - - diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/info.json index c0ea4c9b8a..09d617152b 100644 --- a/keyboards/botanicalkeyboards/fm2u/info.json +++ b/keyboards/botanicalkeyboards/fm2u/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["C4"] + ] + }, "layouts": { "LAYOUT_1u": { "layout": [ diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h deleted file mode 100644 index b8197d3e03..0000000000 --- a/keyboards/bpiphany/sixshooter/config.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { F7, F6, F1 }, \ - { F5, F4, F0 } \ -} - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/info.json index 94059d0c2b..9f3637be0b 100644 --- a/keyboards/bpiphany/sixshooter/info.json +++ b/keyboards/bpiphany/sixshooter/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "matrix_pins": { + "direct": [ + ["F7", "F6", "F1"], + ["F5", "F4", "F0"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}] diff --git a/keyboards/cantor/config.h b/keyboards/cantor/config.h index f002d87b1f..1cb680ac41 100644 --- a/keyboards/cantor/config.h +++ b/keyboards/cantor/config.h @@ -3,20 +3,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 - -#define DIRECT_PINS {{B1, B10, A8, B15, B14, B13}, \ - {B9, B8, B5, B4, B3, A15}, \ - {A3, A4, A5, A6, A7, B0}, \ - {A2, A1, A0, NO_PIN, NO_PIN, NO_PIN}} -#define DIRECT_PINS_RIGHT {{B13, B14, B15, A8, B10, B1}, \ - {A15, B3, B4, B5, B8, B9}, \ - {B0, A7, A6, A5, A4, A3}, \ - {A0, A1, A2, NO_PIN, NO_PIN, NO_PIN}} - #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. #define SERIAL_USART_TX_PIN B6 // USART TX pin #define SERIAL_USART_RX_PIN B7 // USART RX pin diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json index 6d599f4300..b2067508a0 100644 --- a/keyboards/cantor/info.json +++ b/keyboards/cantor/info.json @@ -19,6 +19,26 @@ "pid": "0x0000", "vid": "0xFEED" }, + "matrix_pins": { + "direct": [ + ["B1", "B10", "A8", "B15", "B14", "B13"], + ["B9", "B8", "B5", "B4", "B3", "A15"], + ["A3", "A4", "A5", "A6", "A7", "B0"], + ["A2", "A1", "A0", null, null, null] + ] + }, + "split": { + "matrix_pins": { + "right": { + "direct": [ + ["B13", "B14", "B15", "A8", "B10", "B1"], + ["A15", "B3", "B4", "B5", "B8", "B9"], + ["B0", "A7", "A6", "A5", "A4", "A3"], + ["A0", "A1", "A2", null, null, null] + ] + } + } + }, "community_layouts": ["split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 97ea6e4619..665340e7af 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -#define DIRECT_PINS { \ - { B12, B6, B7 }, \ - { NO_PIN, B5, NO_PIN} \ -} - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index 6945fe7391..910777b90c 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -10,6 +10,12 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B12", "B6", "B7"], + [null, "B5", null] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}] diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h index df93c2baaf..259efacb10 100644 --- a/keyboards/dailycraft/owl8/config.h +++ b/keyboards/dailycraft/owl8/config.h @@ -17,28 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 16 - -/* - * 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 DIRECT_PINS { \ - { F4, F7, B3, B6, F5, F6, B1, B2, D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ -} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - //#define LED_NUM_LOCK_PIN B0 //#define LED_CAPS_LOCK_PIN B1 //#define LED_SCROLL_LOCK_PIN B2 diff --git a/keyboards/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/info.json index de88c712a7..02d503424d 100644 --- a/keyboards/dailycraft/owl8/info.json +++ b/keyboards/dailycraft/owl8/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6", null, null, null, null] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h index 54ee0d965b..259efacb10 100644 --- a/keyboards/dailycraft/stickey4/config.h +++ b/keyboards/dailycraft/stickey4/config.h @@ -17,28 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 8 - -/* - * 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 DIRECT_PINS { \ - { D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ -} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - //#define LED_NUM_LOCK_PIN B0 //#define LED_CAPS_LOCK_PIN B1 //#define LED_SCROLL_LOCK_PIN B2 diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json index bbe43f8b13..95d3539456 100644 --- a/keyboards/dailycraft/stickey4/info.json +++ b/keyboards/dailycraft/stickey4/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D4", "C6", "D7", "E6", null, null, null, null] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h index 6b6bd14445..cbf99d1f5d 100644 --- a/keyboards/dekunukem/duckypad/config.h +++ b/keyboards/dekunukem/duckypad/config.h @@ -20,12 +20,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROWS 1 -#define MATRIX_COLS 17 - -#define DIRECT_PINS {{ B13, B14, B15, A8, A15, B3, B4, B5, B6, B7, C13, C14, C15, F0, F1, A1, A2 }} - #define RGB_DI_PIN A10 #define RGBLED_NUM 15 #define RGB_MATRIX_LED_COUNT 15 diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json index fa31c1df22..06c2727080 100644 --- a/keyboards/dekunukem/duckypad/info.json +++ b/keyboards/dekunukem/duckypad/info.json @@ -10,6 +10,11 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B6", "B7", "C13", "C14", "C15", "F0", "F1", "A1", "A2"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h index 789211e461..d59c8bb414 100644 --- a/keyboards/ferris/sweep/config.h +++ b/keyboards/ferris/sweep/config.h @@ -19,25 +19,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 5 - -#define DIRECT_PINS { \ - { E6, F7, F6, F5, F4 }, \ - { B1, B3, B2, B6, D3 }, \ - { D1, D0, D4, C6, D7 }, \ - { B4, B5, NO_PIN, NO_PIN, NO_PIN } \ -} - -#define DIRECT_PINS_RIGHT { \ - { F4, F5, F6, F7, E6 }, \ - { D3, B6, B2, B3, B1 }, \ - { D7, C6, D4, D0, D1 }, \ - { B5, B4, NO_PIN, NO_PIN, NO_PIN } \ -} - /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D2 diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json index b906014d6f..7174eb52b4 100644 --- a/keyboards/ferris/sweep/info.json +++ b/keyboards/ferris/sweep/info.json @@ -7,5 +7,25 @@ "device_version": "0.0.1" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["E6", "F7", "F6", "F5", "F4"], + ["B1", "B3", "B2", "B6", "D3"], + ["D1", "D0", "D4", "C6", "D7"], + ["B4", "B5", null, null, null] + ] + }, + "split": { + "matrix_pins": { + "right": { + "direct": [ + ["F4", "F5", "F6", "F7", "E6"], + ["D3", "B6", "B2", "B3", "B1"], + ["D7", "C6", "D4", "D0", "D1"], + ["B5", "B4", null, null, null] + ] + } + } + } } diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index ec6cc2949e..eb9850804f 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -14,12 +14,6 @@ * along with this program. If not, see . */ -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -#define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}} - #define RGBLED_NUM 42 #define RGB_MATRIX_LED_COUNT 42 #define RGB_DI_PIN A7 diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index 2a18038e4f..b84877a8dc 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -10,6 +10,12 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B13", "B15", "B3", "B5"], + ["B12", "B14", "A13", "B7"] + ] + }, "debounce": 3, "layouts": { "LAYOUT_ortho_2x4": { diff --git a/keyboards/handwired/aball/config.h b/keyboards/handwired/aball/config.h index 32d16d82f9..cbe0c8b33e 100644 --- a/keyboards/handwired/aball/config.h +++ b/keyboards/handwired/aball/config.h @@ -17,12 +17,5 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -#define DIRECT_PINS {{NO_PIN}} - #define ADNS9800_CS_PIN F7 #define POINTING_DEVICE_INVERT_X diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json index cb34aa7034..84d277c136 100644 --- a/keyboards/handwired/aball/info.json +++ b/keyboards/handwired/aball/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + [null] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bdn9_ble/config.h b/keyboards/handwired/bdn9_ble/config.h index 32d082a00b..2dc8bb5327 100644 --- a/keyboards/handwired/bdn9_ble/config.h +++ b/keyboards/handwired/bdn9_ble/config.h @@ -17,18 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { D1, D0, C6 }, \ - { D7, B5, B6 }, \ - { B7, D6, F7 } \ -} - #define BACKLIGHT_PIN F6 #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json index 3d37d12d75..359939713a 100644 --- a/keyboards/handwired/bdn9_ble/info.json +++ b/keyboards/handwired/bdn9_ble/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D1", "D0", "C6"], + ["D7", "B5", "B6"], + ["B7", "D6", "F7"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h index 995a6e4239..497a2deb16 100644 --- a/keyboards/handwired/bento/rev1/config.h +++ b/keyboards/handwired/bento/rev1/config.h @@ -16,17 +16,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { D7, B1, D2 }, \ - { E6, B4, B2 } \ -} - #define ENCODERS_PAD_A { D1 } #define ENCODERS_PAD_B { D0 } diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json index 2f09b8820c..2b3012b399 100644 --- a/keyboards/handwired/bento/rev1/info.json +++ b/keyboards/handwired/bento/rev1/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D7", "B1", "D2"], + ["E6", "B4", "B2"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h index 9f381ca798..ecc1bc9c52 100644 --- a/keyboards/handwired/dc/mc/001/config.h +++ b/keyboards/handwired/dc/mc/001/config.h @@ -17,19 +17,6 @@ along with this program. If not, see . #pragma once - -/* - BUTTON_MUTE = _BV(4), - BUTTON_STOP = _BV(0), - BUTTON_TRACK_PREVIOUS = _BV(1), - BUTTON_TRACK_NEXT = _BV(2), - BUTTON_PLAY_PAUSE = _BV(3), -*/ -#define DIRECT_PINS \ - { \ - { B4, B0, B1, B2, B3 } \ - } - /* RE_CHANNEL_A = _BV(6), RE_CHANNEL_B = _BV(5), diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json index 114c0f2f35..2bcd5ffd92 100644 --- a/keyboards/handwired/dc/mc/001/info.json +++ b/keyboards/handwired/dc/mc/001/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["B4", "B0", "B1", "B2", "B3"] + ] + }, "debounce": 50, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/lemonpad/config.h b/keyboards/handwired/lemonpad/config.h index 2d978f8931..d1e992c215 100644 --- a/keyboards/handwired/lemonpad/config.h +++ b/keyboards/handwired/lemonpad/config.h @@ -16,27 +16,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -/* - * 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 DIRECT_PINS { \ - { E6, D7, C6 }, \ - { B4, B5, D4 } \ -} - //#define RGB_DI_PIN E2 //#ifdef RGB_DI_PIN //# define RGBLED_NUM 16 diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/info.json index 40e3296fd2..9cbcf4f4f7 100644 --- a/keyboards/handwired/lemonpad/info.json +++ b/keyboards/handwired/lemonpad/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["E6", "D7", "C6"], + ["B4", "B5", "D4"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/stream_cheap/2x3/config.h b/keyboards/handwired/stream_cheap/2x3/config.h index 1ac58c88de..5f36081323 100644 --- a/keyboards/handwired/stream_cheap/2x3/config.h +++ b/keyboards/handwired/stream_cheap/2x3/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -/* define direct pins used */ -#define DIRECT_PINS { { D1,C6,B4}, { D0,D4,D7} } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json index 8754226f1c..555d9540af 100644 --- a/keyboards/handwired/stream_cheap/2x3/info.json +++ b/keyboards/handwired/stream_cheap/2x3/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D1", "C6", "B4"], + ["D0", "D4", "D7"] + ] + }, "community_layouts": ["ortho_2x3"], "layouts": { "LAYOUT_ortho_2x3": { diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h index 65701e8d49..5f36081323 100644 --- a/keyboards/handwired/stream_cheap/2x4/config.h +++ b/keyboards/handwired/stream_cheap/2x4/config.h @@ -1,16 +1,5 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* define direct pins used */ -#define DIRECT_PINS \ - { \ - {D1, D0, D4, C6}, { D7, E6, B4, B5 } \ - } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json index ae7e361a4d..d298a30c14 100644 --- a/keyboards/handwired/stream_cheap/2x4/info.json +++ b/keyboards/handwired/stream_cheap/2x4/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D1", "D0", "D4", "C6"], + ["D7", "E6", "B4", "B5"] + ] + }, "layouts": { "LAYOUT_ortho_2x4": { "layout": [ diff --git a/keyboards/handwired/stream_cheap/2x5/config.h b/keyboards/handwired/stream_cheap/2x5/config.h index f33fc0f7c2..5f36081323 100644 --- a/keyboards/handwired/stream_cheap/2x5/config.h +++ b/keyboards/handwired/stream_cheap/2x5/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 5 - -/* define direct pins used */ -#define DIRECT_PINS { { D1,C6,B4,B5,B2}, { D0,D4,D7,E6,B6} } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json index b8a4623b64..3a81177f31 100644 --- a/keyboards/handwired/stream_cheap/2x5/info.json +++ b/keyboards/handwired/stream_cheap/2x5/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D1", "C6", "B4", "B5", "B2"], + ["D0", "D4", "D7", "E6", "B6"] + ] + }, "layouts": { "LAYOUT_ortho_2x5": { "layout": [ diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h index 1a480db11e..d2bd499e0d 100644 --- a/keyboards/ianklug/grooveboard/config.h +++ b/keyboards/ianklug/grooveboard/config.h @@ -17,30 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#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) - * - */ -//#define MATRIX_ROW_PINS { D0, D5 } -//#define MATRIX_COL_PINS { F1, F0, B0 } -#define DIRECT_PINS { \ - { F7, F6, D1, D2 } \ -} - -/* COL2ROW, ROW2COL */ -//#define DIODE_DIRECTION COL2ROW - //#define LED_NUM_LOCK_PIN B0 //#define LED_CAPS_LOCK_PIN B1 //#define LED_SCROLL_LOCK_PIN B2 diff --git a/keyboards/ianklug/grooveboard/info.json b/keyboards/ianklug/grooveboard/info.json index c4bd7ab01f..a885514071 100644 --- a/keyboards/ianklug/grooveboard/info.json +++ b/keyboards/ianklug/grooveboard/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["F7", "F6", "D1", "D2"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h index eb3f40ba79..4aeb5eaa00 100644 --- a/keyboards/kb_elmo/isolation/config.h +++ b/keyboards/kb_elmo/isolation/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* direct key pin */ -#define DIRECT_PINS {{ B0 }} - /* RGB backlight */ #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json index ef7fb5a14e..262b12056d 100644 --- a/keyboards/kb_elmo/isolation/info.json +++ b/keyboards/kb_elmo/isolation/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega328p", "bootloader": "usbasploader", + "matrix_pins": { + "direct": [ + ["B0"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 6836443389..de8b594cec 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -3,19 +3,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* - * Keyboard Matrix Assignments - */ - -#define DIRECT_PINS { \ - { E6, B6, D6, NO_PIN }, \ - { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ -} #define AUDIO_PIN C6 #ifdef AUDIO_ENABLE # define STARTUP_SONG SONG(STARTUP_SOUND) diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index fb16f585bb..9390f7d56f 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["E6", "B6", "D6", null], + [null, null, null, null] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h index f075302e87..d34d9756f9 100644 --- a/keyboards/keebio/bdn9/rev1/config.h +++ b/keyboards/keebio/bdn9/rev1/config.h @@ -17,18 +17,6 @@ along with this program. If not, see . #pragma once - -/* 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 ENCODERS_PAD_A { D0, F6, B6 } #define ENCODERS_PAD_B { D1, F5, F7 } diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json index a308d1c87c..e5dea50260 100644 --- a/keyboards/keebio/bdn9/rev1/info.json +++ b/keyboards/keebio/bdn9/rev1/info.json @@ -5,5 +5,12 @@ "device_version": "1.0.0" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D2", "D4", "F4"], + ["D7", "B1", "B3"], + ["E6", "B4", "B2"] + ] + } } diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h index 7a7f356a2e..f30de7e197 100644 --- a/keyboards/keebio/bdn9/rev2/config.h +++ b/keyboards/keebio/bdn9/rev2/config.h @@ -17,18 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { B12, B5, B6 }, \ - { B14, B4, B7 }, \ - { A3, F1, F0 } \ -} - // Left, Right, Middle #define ENCODERS_PAD_A { A8, B3, A10 } #define ENCODERS_PAD_B { A4, A15, A9 } diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json index 04d22a1936..24eebef1a8 100644 --- a/keyboards/keebio/bdn9/rev2/info.json +++ b/keyboards/keebio/bdn9/rev2/info.json @@ -5,5 +5,12 @@ "device_version": "2.0.0" }, "processor": "STM32F072", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B12", "B5", "B6"], + ["B14", "B4", "B7"], + ["A3", "F1", "F0"] + ] + } } diff --git a/keyboards/keebio/choconum/config.h b/keyboards/keebio/choconum/config.h index 9419fea3cf..38e745515a 100644 --- a/keyboards/keebio/choconum/config.h +++ b/keyboards/keebio/choconum/config.h @@ -17,21 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 4 -#define DIRECT_PINS { \ - { B2, B10, B3, B4 }, \ - { B1, B11, A15, B5 }, \ - { B0, A5, B7, F0 }, \ - { A7, A6, B8, B6 }, \ - { A4, A3, B9, F1 } \ -} - -/* 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/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json index f92da2ad13..b373df4850 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/info.json @@ -10,6 +10,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B2", "B10", "B3", "B4"], + ["B1", "B11", "A15", "B5"], + ["B0", "A5", "B7", "F0"], + ["A7", "A6", "B8", "B6"], + ["A4", "A3", "B9", "F1"] + ] + }, "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h index bc4e214c20..807383befc 100644 --- a/keyboards/keebio/stick/config.h +++ b/keyboards/keebio/stick/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 12 - -/* key matrix pins */ -#define DIRECT_PINS { \ - { F4, B6, B5, B4, E6, D7, F6, F7, B1, B3, B2, F5 } \ -} - #define ENCODERS_PAD_A { D1, D4 } #define ENCODERS_PAD_B { D0, C6 } @@ -103,7 +93,4 @@ along with this program. If not, see . # endif #endif -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 200 diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json index c247e3ae99..ff91ee9f24 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["F4", "B6", "B5", "B4", "E6", "D7", "F6", "F7", "B1", "B3", "B2", "F5"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h index 79e8b254b3..b62aef8a09 100644 --- a/keyboards/keebio/tukey/config.h +++ b/keyboards/keebio/tukey/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 2 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { { D4, F6 } } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json index 27a5159c0e..2be3e55e70 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "F6"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h index 1d5b265ade..7c5e60fdc8 100644 --- a/keyboards/keyhive/uno/rev1/config.h +++ b/keyboards/keyhive/uno/rev1/config.h @@ -18,15 +18,6 @@ #define RGBLIGHT_EFFECT_RAINBOW_MOOD -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* Uno default pinout */ -#define DIRECT_PINS { \ - { B6 } \ -} - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN F6 #define RGBLED_NUM 1 diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json index 6038321e52..2fc258ee42 100644 --- a/keyboards/keyhive/uno/rev1/info.json +++ b/keyboards/keyhive/uno/rev1/info.json @@ -4,5 +4,10 @@ "device_version": "0.0.1" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["B6"] + ] + } } diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h index 1a03c19ead..b9e3a70286 100644 --- a/keyboards/keyhive/uno/rev2/config.h +++ b/keyboards/keyhive/uno/rev2/config.h @@ -22,15 +22,6 @@ #define ENCODERS_PAD_A { B2 } #define ENCODERS_PAD_B { B3 } -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* Uno default pinout */ -#define DIRECT_PINS { \ - { D0 } \ -} - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN D1 #define RGBLED_NUM 1 diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json index 811d052ac3..2ea14e8aeb 100644 --- a/keyboards/keyhive/uno/rev2/info.json +++ b/keyboards/keyhive/uno/rev2/info.json @@ -4,5 +4,10 @@ "device_version": "0.0.2" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D0"] + ] + } } diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h index 3b0cb8f330..1826763cbf 100755 --- a/keyboards/ktec/staryu/config.h +++ b/keyboards/ktec/staryu/config.h @@ -16,17 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -/* key matrix pins */ -#define DIRECT_PINS { \ - { NO_PIN, D0, D1 }, \ - { D4, D3, D2 }, \ -} - #define RGB_DI_P