From 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 18:39:41 +1100 Subject: [PATCH] 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 ---- .../handwired/stream_cheap/2x3/info.json | 6 +++ keyboards/handwired/stream_cheap/2x4/config.h | 11 ----- .../handwired/stream_cheap/2x4/info.json | 6 +++ keyboards/handwired/stream_cheap/2x5/config.h | 8 ---- .../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 ------------- .../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 ++- .../ploopyco/trackball/rev1_005/config.h | 15 ------- .../ploopyco/trackball/rev1_005/info.json | 7 ++- .../ploopyco/trackball_mini/rev1_001/config.h | 15 ------- .../trackball_mini/rev1_001/info.json | 7 +++ .../ploopyco/trackball_mini/rev1_002/config.h | 15 ------- .../trackball_mini/rev1_002/info.json | 7 +++ .../ploopyco/trackball_nano/rev1_001/config.h | 12 ----- .../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 ----- .../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 diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index 17ae0d55fb95fce42c411c0a53ef360de84a166f..10f946592fab141c6372ed5504b1aefa5b89979c 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 3da716aa373aba5bdf3b57806042762a33d5b997..ca0477753662e91baa87975183e328360e5bf982 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 21f22620ad1205135a59ee44e6e6f6657bb3acb6..d4ba1d439f627f8e33bfdf68e5598be40b460b76 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 96e61924b9fa53e6f8b0b0f83b06632101e0f187..25c0ca51c49e8e1a1f7971956a7872288d44402f 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 f5d74426efb843846b5850efa1877fdebc6a0ecd..1e970661c0ba2ef288a4c8c6aa3a86a5cc4e8bbc 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 0c2de3180875dee41e40e788706b8371e805c835..8a27d94862c1f06e02e63a500bd68438f817cf43 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 fe434962276b8dd6e20427677af62ca28031a9a3..c57f66da5d5569bc2f79dfb833938168cb2b6559 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 5150c28422a535ba0333e8378058bce6d5bb0056..546e02ab63d9cbddc2ae940757ea78d218f8dc2d 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 3a8a54d4faa3116a29cbef1bce3d0720e4005487..d289f893ece4f6e755f3efd99788d872011bd176 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 91c6171dff371f6a9d04c36a28a5b5bb0d7c78b0..1665c7b35b39523d6ed6e7d28b08c77ac70dcee6 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 7d3c140923a575a064d91f840bbdf5ab61253533..39aa83e067baa15d5a92ea366b7e677bcdaba6c9 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 1821a684ac89650aaefa662286048d354d174ffa..430129a6a10710b8c1425e77560fbcff8d0d1af8 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 0cc521499e8cccfb23e2228ad235d4de78d70c21..e89243f55e9e7c376b13d08efc95383f82a232ce 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 82d03395d8a6b3f1a94c426741abc214aab6346e..ba39cb834df6b4c3986e7bbcb4e56064c6c237ef 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 9c384ef2aad1434c7686c00c53ba4aa9f189a7f4..c94721d714af66f86d8143234d6e0fce1c5c2ec7 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 78ca5bda58a11613ca9afc3e86d48c14789daba4..ea7e6281a943f58f7f7ac81d3b9d8c25e43ef0d6 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 ddd88f1303d31115595d882282d5101280eeff0c..a9564f1bcfe75a4f0489e490ad964f570e42251a 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 4520540642d0930cb67b84150595898dc9cb129f..fa33b2644ff70169e86b067f725a908554d5828d 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 d6551e60c41a02e2774bf9690937fff87ec1fc1d..d636139928fb9a80fa0c3de3f382a9deaa71d44c 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 d5a8365279f6458e6e99a80b18d8086874649250..6292d5e707f0522c8e20068d9fd3553563739797 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 d533828dae7659f4fdf9374d62687c09d69c617a..7f1170ef37fc90893a9664e018f17834729c2064 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 adb82407ec628fe487c2f6420f7753d2287ed72f..588c51b008af3212697819ec127439f089f84529 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 207b653a42472b42c3313762629790d65f1902cc..338f5d8dbe409f868f3078c8a12da69136283371 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 0677916600ec668fb1d92209a489131f3ee91e86..1bd66e9ef0fe510b31c46a4846242cbab6f5b3ef 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 a6c0269102af3a86080214a79f73998176af811c..815636ead61d10472c4f86780f4bde3005a4f2d6 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 979f4368104b39b469475f78978115fc12468502..51e805059d22ecd0499fda4f417ba66a18ce65ac 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 719c2c00dab05ed3473cb6386913d523081903ee..b70680e4f53d74e35d4091346953dc84045879c5 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 b224d3d5a6f03dbb296eda29ca1142f0bf234eea..0441646af029430b717b0b5e7d6affe527060845 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 8a3e5eb467cc9fa796dba2348b5ba4fabe0f2918..6a50429c209da033e254b54adb684f4606e7cb8f 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 50f4feed666847648041322b3fe3391dd69681d5..a914b1882df0c32236143026cf1b85b7c8391f2e 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 a32977982764d580a5bc59473252cfec0e66acf0..0000000000000000000000000000000000000000 --- 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 c0ea4c9b8a6a03932b5ce87374eb77f86f463081..09d617152b77203260cc224495e6a661ba63351e 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 b8197d3e0326b78a58fbb7fa13645cca2c8261df..0000000000000000000000000000000000000000 --- 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 94059d0c2b691cd7c6953231d74639018b4d950c..9f3637be0bbb8e50acc2625470313fa302bb9a87 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 f002d87b1f7e2fbda1ab07e64d0466e3e7092ffb..1cb680ac41fa0e94372a880d039c365cdc67a81d 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 6d599f43006f3de0f93ec4b27e262065d6bb7eef..b2067508a01433947fd0f3a3849cb8e4919f0984 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 97ea6e4619d46af7b7599cbd94d82316b09646c2..665340e7af23c06fd635b1a07d22c4f58104c7b4 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 6945fe7391eb6fd1d466e089fc4049946ac2e0e5..910777b90c577c2cdba0402712c53fb10f9f57cb 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 df93c2baafbd544392c9d1a398d3900d1fd9a73f..259efacb1037a187a3a8d30055bda29258a494af 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 de88c712a77e8e8cd156fa1fcef365340167f0d1..02d503424dbbe5eb00f47b1648abf37db3d4e00b 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 54ee0d965b02bdf6997a7f2c4de7e84d9ca7ade8..259efacb1037a187a3a8d30055bda29258a494af 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 bbe43f8b132c399f86a3d6820a4bd50013a206e2..95d3539456d7c8781872112d222756fbd82554f1 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 6b6bd14445169eee7bdc851bb9614fec541e6a8c..cbf99d1f5d7f618eba7bc5f1554c03f89734cc9f 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 fa31c1df22dff7c9d7f6c1416086a450cd52b6a0..06c2727080532901d7a1d7e07fd5dffbcb2d04bf 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 789211e4618b918f1d8ff276a1fa3b8d9f553dc6..d59c8bb4144d1f81e40583e7057e48d83377418a 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 b906014d6fdc8ebfa542b29f675aceb90de906a6..7174eb52b4d1959de94b8375ac3c68725138afaf 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 ec6cc2949e65a71e7a71dc51f8ebba9eff8fb9fb..eb9850804f977feb2d5fdfb0c90ce91899ba321e 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 2a18038e4f84327e511ddad6f45f58884276d21b..b84877a8dcb8cbe5eccee2cd872c04c552caf7d1 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 32d16d82f9b2558fb45f59c5ce63da84497ebd50..cbe0c8b33e829f9853c683801e20e91434b29625 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 cb34aa703452caef378e5df945455ea7d0d74cd9..84d277c13630fda8139fc902bf324d5dd05a6464 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 32d082a00bba0f7f0d13513f66ad34e86b9f8857..2dc8bb53274326565a3536d069d438ec0f85fe4b 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 3d37d12d756e59fb9ec9e1a394e53a4a2e27f92d..359939713ae16ca4594968eb3bbbc946eae252bd 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 995a6e42399677bf85b3e874f1355c4a5442ec4e..497a2deb16c3a4fade40a633b3b932cbaf9364c1 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 2f09b8820c4913eb760a58fdaedb811558f63b90..2b3012b399f6a80d656311c7fa8142b9e3f83f19 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 9f381ca79897e552756ffd61bbd7abf1e05a216f..ecc1bc9c52da04845fcad2a7b8f5cfa67480303e 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 114c0f2f35de30d2830e541873456772040de715..2bcd5ffd925bc67b9fdaadbdf2b78c375efc92ea 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 2d978f89316d33d5e672af3b3ee3f3016ed9fa87..d1e992c215b6a2a076fcb1acc75d7b955f8dafb1 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 40e3296fd296ec5c3808514c925edb5830802d79..9cbcf4f4f7baad570dfb0774e73096c6ca769beb 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 1ac58c88de1da33c5b8530f89e64d94841e8c5bf..5f360813239bad2c21db930bcae016798f148177 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 8754226f1c85b0327fe021b5361af1fc4b4d3f96..555d9540aff31d9a6c1df3e1a90ada64366a2919 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 65701e8d49b65a915d52dd2b1130975a961e5b07..5f360813239bad2c21db930bcae016798f148177 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 ae7e361a4d1aa76c101b287ae44541e9a390c1c7..d298a30c145e9f99678d2af9a905209aeb0ba600 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 f33fc0f7c231ca757ea6d09868b4a9be5539da3e..5f360813239bad2c21db930bcae016798f148177 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 b8a4623b64dab7c9831a405ae547f97d9c4a5c72..3a81177f3177b560039cae373917a97e3a23df35 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 1a480db11e2c13c5077c1ec86ce05f2f99439b07..d2bd499e0d9a2f83deda0ddce92ce41fbbaf1a66 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 c4bd7ab01fa449a4cce592a12bd5e3cbfa647143..a8855140712e876fac8918313b5e4921104f2e3e 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 eb3f40ba79e107dccd329c185b5ad0d337a71606..4aeb5eaa0009952c0e401814f96a815cd3e39b39 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 ef7fb5a14e3ceb7dcdbf9e9bb52f8e8fb3f41d60..262b12056de7e3d52bf16422518a4953b1ec9425 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 6836443389ce37aa1f72b8c6aae3e7b7179cc3fd..de8b594cec1682cf9b73145fb8e45ac5eff34f97 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 fb16f585bb9eb3ce3bcffa18d314e26a41ce5ddd..9390f7d56f4e14f11364f89cfdc42e738ee802e2 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 f075302e871b541e9f64521cf4761425d7c00cf6..d34d9756f9ccec2a7e9d461c9dc94231b78f6c65 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 a308d1c87c5bed1eef0745c0d6e1827249035523..e5dea5026064d521493a70717cb2cc2105b2a69e 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 7a7f356a2eef054681a20798a0ee8f68c656de3e..f30de7e1978bda0ee24853b46fad3b524420ddcf 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 04d22a19365a2abbacf348abdd3be2bfa14e2d85..24eebef1a8f48167539a47a95cbfbe4cba4e98d3 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 9419fea3cf16234f60d56cc53e660377f7c8d5ac..38e745515ab0b86ff0340be59b5d3d0bcaeff825 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 f92da2ad1371e4daa59b9b4b30e9684a39df3b67..b373df485086a3f939653c5681f29153267ac7e2 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 bc4e214c20ecbf2450212b2cb1e932d398b68b5b..807383befc830114c97d08733d6ad732bff5d0db 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 c247e3ae9904e9d73024f4294f7c452bfa7096f6..ff91ee9f24343e49b4240298d304e0d40e5aa922 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 79e8b254b36a1eed3f60a9dfb7c58638d48f32d6..b62aef8a099604a89db4affbd5c80f652a37cde6 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 27a5159c0e37542a8a7ba48e23a8ad861037b983..2be3e55e704567b017cabcb0675b6d006d06c58b 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 1d5b265adefde7a8150bbed7332eeb39496b9be2..7c5e60fdc8bf637801bc39236da37eb54d66f2ec 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 6038321e52796da87fa06fb0c1c6b9c8c7945506..2fc258ee42a0e09062bae9b246d4b87ec6912768 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 1a03c19eadf348e3ea27c5df99d72945ed63eece..b9e3a702861d2ebfeb2019bea0308a62fcfcc4bb 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 811d052ac3fadb0165ae8fc417cfa0f322eb5e5d..2ea14e8aeb7c49cc49c2fa483c6b03d44121c8f4 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 3b0cb8f330a6fa4d29b45cbc1b11baa32f5b32e9..1826763cbfa1d9728afd333d06041b232adb5e94 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_PIN C6 #define RGBLED_NUM 1 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json index 392610c98ae31bc60101cb661aa972dfc3546d59..e222923a2324ea1821a3aa1298ce4ef58b3b36fd 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u2", "bootloader": "lufa-dfu", + "matrix_pins": { + "direct": [ + [null, "D0", "D1"], + ["D4", "D3", "D2"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}] diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h index 13a33aaabc0fd392f0941d8078b16e3df61bce92..8a2391095653b35a28f6180d94317d6de1a527ec 100644 --- a/keyboards/leafcutterlabs/bigknob/config.h +++ b/keyboards/leafcutterlabs/bigknob/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 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 - * -*/ - -// Srating with closest to USB port -#define DIRECT_PINS { \ - { B7, D4, D6, F6, F7} \ -} - /* rotary encoder 1,2,3 closest to usb port is 0*/ #define ENCODERS_PAD_A { D0} #define ENCODERS_PAD_B { D2} diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json index 5933c6301f1ab4e2c03877601359fdd6cf868e36..ac8f8077d3cfe9f57efb0a26d0c5fc90a9bace39 100644 --- a/keyboards/leafcutterlabs/bigknob/info.json +++ b/keyboards/leafcutterlabs/bigknob/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["B7", "D4", "D6", "F6", "F7"] + ] + }, "layouts": { "LAYOUT_ortho_1x5": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}] diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h index fa6ee15f1c4e4e32958d669711649f630b45ab59..343830cf87a37ce3e0fb5e3f5a70b9f801968623 100644 --- a/keyboards/littlealby/mute/config.h +++ b/keyboards/littlealby/mute/config.h @@ -17,19 +17,6 @@ #define USB_MAX_POWER_CONSUMPTION 100 -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* Default pinout */ -/* See arduino micro pinout: https://content.arduino.cc/assets/Pinout-Micro_latest.png - * for pins e.g. - * PB5 = digital pin 9 / analog pin 9 - */ -#define DIRECT_PINS { \ - {B5} \ -} - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B6 #define RGBLED_NUM 1 diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json index 02348599e5deb1c1e02a025ad4345b3d04fc44e9..ed6761b7a9fda42417f39356b6cd8b44c78fdad5 100644 --- a/keyboards/littlealby/mute/info.json +++ b/keyboards/littlealby/mute/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["B5"] + ] + }, "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }] diff --git a/keyboards/macro3/config.h b/keyboards/macro3/config.h index 81ff5f522320bc1ac4ce4ab9977c5c9c4a0a17d7..714f796f48fed11a3dd82646be51bc7008d6333b 100644 --- a/keyboards/macro3/config.h +++ b/keyboards/macro3/config.h @@ -5,15 +5,5 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* key matrix pins */ -#define DIRECT_PINS { \ - { D7, C6, D4, D1 }, \ - { B1, B4, B5, B3 } \ -} - #define ENCODERS_PAD_A { D2, F7 } #define ENCODERS_PAD_B { D3, F6 } diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json index 830abdb9e9c875aa77f42cf7baae73d86117ee70..d8479b2a00f7e3f60bb739a49ca68832a73c0f4a 100644 --- a/keyboards/macro3/info.json +++ b/keyboards/macro3/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D7", "C6", "D4", "D1"], + ["B1", "B4", "B5", "B3"] + ] + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_2x4" }, diff --git a/keyboards/makeymakey/config.h b/keyboards/makeymakey/config.h index 07221e385a0d715fbde5652e6869f4506e612df8..c1b43dc83494f031e96533b46dcdadd23fec3e69 100644 --- a/keyboards/makeymakey/config.h +++ b/keyboards/makeymakey/config.h @@ -16,18 +16,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 6 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { D6, B4, C7, B1, E6, D7 }, \ - { C6, D4, D0, D1, D2, D2 }, \ - { F0, F1, F5, F5, F6, F7 } \ -} - /* LEDs Pins */ #define LED_PINS 5 #define LED_PINS_HW {B5, B6, B7, B3, B2} diff --git a/keyboards/makeymakey/info.json b/keyboards/makeymakey/info.json index f8c83898a40055a687f19bbc346aac004c0de382..c3114dd7446c57658e511b36847f3e3239db5523 100644 --- a/keyboards/makeymakey/info.json +++ b/keyboards/makeymakey/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D6", "B4", "C7", "B1", "E6", "D7"], + ["C6", "D4", "D0", "D1", "D2", "D2"], + ["F0", "F1", "F5", "F5", "F6", "F7"] + ] + }, "debounce": 10, "layouts": { "LAYOUT": { diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h index c8afd9e7526948455a5e61c017815d682beed6cf..daa0bc4d86daa3e3a292ed0ed92768a6a404ebda 100644 --- a/keyboards/miniaxe/config.h +++ b/keyboards/miniaxe/config.h @@ -17,34 +17,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 MATRIX_ROW_PINS { D0, D5 } -// #define MATRIX_COL_PINS { F1, F0, B0 } -#define DIRECT_PINS { \ - { F1, E6, B0, B2, B3 }, \ - { F5, F0, B1, B7, D2 }, \ - { F6, F7, C7, D5, D3 }, \ - { B5, C6, B6, NO_PIN, NO_PIN } \ -} - -/* COL2ROW, ROW2COL*/ -////#define DIODE_DIRECTION - /* Uncomment below if use underglow */ #define RGB_DI_PIN F4 #ifdef RGB_DI_PIN diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json index 3c366ed6f2891e554eaa99afec05903023cb4b90..a36e4469127ed25ab8d8c8271eb7d1c16677ff2e 100644 --- a/keyboards/miniaxe/info.json +++ b/keyboards/miniaxe/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["F1", "E6", "B0", "B2", "B3"], + ["F5", "F0", "B1", "B7", "D2"], + ["F6", "F7", "C7", "D5", "D3"], + ["B5", "C6", "B6", null, null] + ] + }, "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h index fd1028cb1c84d4a888f22a6dede8a66a3043391e..351fb8a5a5e5d4ec3b261ae709fd5e6ea55dd0ec 100644 --- a/keyboards/minimacro5/config.h +++ b/keyboards/minimacro5/config.h @@ -17,27 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#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 MATRIX_ROW_PINS { D0, D5 } -// #define MATRIX_COL_PINS { F1, F0, B0 } -#define DIRECT_PINS { \ - { F4, B6, B2, D7, B4 } \ -} //speed for double tap #define TAPPING_TERM 200 diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json index ad17e89c69fa5dab2af5a2c71274eea6e04af366..1ecd8f7b8c762b658e5e7ebe0c750f4fcfb01c05 100644 --- a/keyboards/minimacro5/info.json +++ b/keyboards/minimacro5/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["F4", "B6", "B2", "D7", "B4"] + ] + }, "layouts": { "LAYOUT_ortho_1x5": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0}] diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index 63cc5f9da64e170b54881dd91ef14f4193fe8bcf..e6b2ef0961133213225c809e720317407442e673 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -1,17 +1,5 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { D1, D4, F4 }, \ - { D0, B4, F5 }, \ - { C6, F7, B6 } \ -} - #define ENCODERS_PAD_A { D7, B1 } #define ENCODERS_PAD_B { E6, B3 } diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index 17503123e35bd7a08286869cd95b69f51b06706d..cfc774bc2b469274df82e0dcf7a4a485cd645eee 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D1", "D4", "F4"], + ["D0", "B4", "F5"], + ["C6", "F7", "B6"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h index 88b9c7abb8a9bd1d81b46d9b8f7d4dfaf9d34941..c168aca492653b21d90996d5c976039b5d6c5ba5 100644 --- a/keyboards/novelkeys/nk1/config.h +++ b/keyboards/novelkeys/nk1/config.h @@ -17,16 +17,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { D4 } \ -} - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json index 137608c978ddb8df68faa3d7f9fbab6c73b62b4a..c9fa789b70d606b86f504fa07262fb51e0e9b828 100755 --- a/keyboards/novelkeys/nk1/info.json +++ b/keyboards/novelkeys/nk1/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D4"] + ] + }, "community_layouts": ["ortho_1x1"], "layouts": { "LAYOUT_ortho_1x1": { diff --git a/keyboards/nullbitsco/scramble/v1/config.h b/keyboards/nullbitsco/scramble/v1/config.h index 6f512db4c5cee2da5d7391d3a616e94a19a05eb5..6a7742ce8785fae8879179b5967334322569161e 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 11307eba89f7d1f71bda487024e9b2041648e55b..0acb6993735a047e459c307991bf7658fdfef6fb 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 b4d7820aad3d32c813b3846cf1b9f74f1b293db4..dd2ae627496793288a8560de84733dd9d26cb6da 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 87b7fcf7ecc9d1fe23de6f868250186711ec7dd4..ba27823b3605d8fe1c86f7eb3b0a9b5a192170e9 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"] + ] + } } diff --git a/keyboards/obosob/steal_this_keyboard/config.h b/keyboards/obosob/steal_this_keyboard/config.h index 1b61491402ca033a4b1147cdb05ab31c3417936a..bf4064bd317ca938cd72ed17128b6cd41069d0ac 100644 --- a/keyboards/obosob/steal_this_keyboard/config.h +++ b/keyboards/obosob/steal_this_keyboard/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 { \ - { F4, F7, B2, D1, D7 }, \ - { F5, B1, B6, D0, E6 }, \ - { F6, B3, D3, D4, B4 }, \ - { C6, B5, NO_PIN, NO_PIN, NO_PIN } \ -} - -#define DIRECT_PINS_RIGHT { \ - { D7, D1, B2, F7, F4}, \ - { E6, D0, B6, B1, F5 }, \ - { B4, D4, D3, B3, F6 }, \ - { B5, C6, NO_PIN, NO_PIN, NO_PIN } \ -} - /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D2 diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json index 1cba614217355e89b16e8dda289ea737f473e5e8..5a80a0b17c035ddf3f90870f39c603d847f9b076 100644 --- a/keyboards/obosob/steal_this_keyboard/info.json +++ b/keyboards/obosob/steal_this_keyboard/info.json @@ -10,6 +10,26 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["F4", "F7", "B2", "D1", "D7"], + ["F5", "B1", "B6", "D0", "E6"], + ["F6", "B3", "D3", "D4", "B4"], + ["C6", "B5", null, null, null] + ] + }, + "split": { + "matrix_pins": { + "right": { + "direct": [ + ["D7", "D1", "B2", "F7", "F4"], + ["E6", "D0", "B6", "B1", "F5"], + ["B4", "D4", "D3", "B3", "F6"], + ["B5", "C6", null, null, null] + ] + } + } + }, "community_layouts": [ "split_3x5_2" ], diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index b7d4b46921872a599bf7360e7c9c8cb4d4dfd56a..edf74052c505a01a7e62b595e686277a8a269ea3 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -17,29 +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, F6, F7, B1, B3 } \ -} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Rotary encoder define*/ #define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_B { B4 } diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index a5ad8532b1b962830fcc75fdda0d5fdcd28bc83e..16f1db03281eaf218c839e2ce2b37867d16005e5 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"] + ] + }, "layouts": { "LAYOUT": { "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/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 93a5eb8145eeec04235e4f06c9d86c4de80f8f44..4068b9ed0e3624d4db15a649b54522e1cab4adf5 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -17,29 +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, F6, F7, B1, B3 } \ -} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Rotary encoder define*/ #define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_B { B4 } diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index a5ad8532b1b962830fcc75fdda0d5fdcd28bc83e..16f1db03281eaf218c839e2ce2b37867d16005e5 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"] + ] + }, "layouts": { "LAYOUT": { "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/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h index e59a05ce301a1ac56f59ae1b5709e4968f25026d..2becbba72742ffdb1442451850cab9fe584f1ebc 100644 --- a/keyboards/ploopyco/mouse/config.h +++ b/keyboards/ploopyco/mouse/config.h @@ -18,26 +18,6 @@ #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, D2, E6, B6, D7, C6, C7, B7 } \ - } - // These pins are not broken out, and cannot be used normally. // They are set as output and pulled high, by default #define UNUSABLE_PINS \ diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json index 3550c1d5a35c2d41cb4aeeca0bf6d5a3212383fa..f9a3e32f41181b6fc95124cc37c4af546180f17a 100644 --- a/keyboards/ploopyco/mouse/info.json +++ b/keyboards/ploopyco/mouse/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ploopyco/trackball/rev1/config.h b/keyboards/ploopyco/trackball/rev1/config.h index 3db085baf2ccccd3a00962b8e710c19c41d1564e..35ab215341828b353ca00c1d508a44cdf292435b 100644 --- a/keyboards/ploopyco/trackball/rev1/config.h +++ b/keyboards/ploopyco/trackball/rev1/config.h @@ -18,21 +18,6 @@ #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 DIRECT_PINS \ - { \ - { D4, D2, E6, B5, D7 } \ - } - // These pins are not broken out, and cannot be used normally. // They are set as output and pulled high, by default #define UNUSABLE_PINS \ diff --git a/keyboards/ploopyco/trackball/rev1/info.json b/keyboards/ploopyco/trackball/rev1/info.json index 4369a04103857829d6d574d059aba4f1c088360b..8e372e7c2b0b8b8fa04ca0e78d83bb81322f9dcb 100644 --- a/keyboards/ploopyco/trackball/rev1/info.json +++ b/keyboards/ploopyco/trackball/rev1/info.json @@ -1,4 +1,9 @@ { "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B5", "D7"] + ] + } } diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h index 321e3004d11aefdfb13c3b9543078ded8385e5a1..fcf51c4c1bfab5e0ce86fbad970269b18b9e23c0 100644 --- a/keyboards/ploopyco/trackball/rev1_005/config.h +++ b/keyboards/ploopyco/trackball/rev1_005/config.h @@ -18,21 +18,6 @@ #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 DIRECT_PINS \ - { \ - { D4, D2, E6, B6, D7 } \ - } - // These pins are not broken out, and cannot be used normally. // They are set as output and pulled high, by default #define UNUSABLE_PINS \ diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json index 042c41f34d642c4740abae7c1f3bc79a65ec8bb8..b963f8842ab5da8cac8f13e2ed6feb15a358fe60 100644 --- a/keyboards/ploopyco/trackball/rev1_005/info.json +++ b/keyboards/ploopyco/trackball/rev1_005/info.json @@ -1,4 +1,9 @@ { "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B6", "D7"] + ] + } } diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/config.h b/keyboards/ploopyco/trackball_mini/rev1_001/config.h index d4c9d23bec59fe8cf8a5e841140775b13d72d6de..485f8e3485e3122987463b69e39a893ce9e4af8b 100644 --- a/keyboards/ploopyco/trackball_mini/rev1_001/config.h +++ b/keyboards/ploopyco/trackball_mini/rev1_001/config.h @@ -19,21 +19,6 @@ #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 DIRECT_PINS \ - { \ - { D4, D2, E6, B6, D7 } \ - } - // These pins are not broken out, and cannot be used normally. // They are set as output and pulled high, by default #define UNUSABLE_PINS \ diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/info.json b/keyboards/ploopyco/trackball_mini/rev1_001/info.json new file mode 100644 index 0000000000000000000000000000000000000000..20c192f8691094e103cc6798d5a3fc4318429f9a --- /dev/null +++ b/keyboards/ploopyco/trackball_mini/rev1_001/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B6", "D7"] + ] + } +} diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/config.h b/keyboards/ploopyco/trackball_mini/rev1_002/config.h index d4c9d23bec59fe8cf8a5e841140775b13d72d6de..485f8e3485e3122987463b69e39a893ce9e4af8b 100644 --- a/keyboards/ploopyco/trackball_mini/rev1_002/config.h +++ b/keyboards/ploopyco/trackball_mini/rev1_002/config.h @@ -19,21 +19,6 @@ #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 DIRECT_PINS \ - { \ - { D4, D2, E6, B6, D7 } \ - } - // These pins are not broken out, and cannot be used normally. // They are set as output and pulled high, by default #define UNUSABLE_PINS \ diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/info.json b/keyboards/ploopyco/trackball_mini/rev1_002/info.json new file mode 100644 index 0000000000000000000000000000000000000000..20c192f8691094e103cc6798d5a3fc4318429f9a --- /dev/null +++ b/keyboards/ploopyco/trackball_mini/rev1_002/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B6", "D7"] + ] + } +} diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/config.h b/keyboards/ploopyco/trackball_nano/rev1_001/config.h index 3bde88487a517f93be1fdf762109540042001e2c..14fcb8ca953291dc50e94b4766179a68b2eb839a 100644 --- a/keyboards/ploopyco/trackball_nano/rev1_001/config.h +++ b/keyboards/ploopyco/trackball_nano/rev1_001/config.h @@ -19,18 +19,6 @@ #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 DIRECT_PINS {{NO_PIN}} - // These pins are not broken out, and cannot be used normally. // They are set as output and pulled high, by default #define UNUSABLE_PINS \ diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/info.json b/keyboards/ploopyco/trackball_nano/rev1_001/info.json new file mode 100644 index 0000000000000000000000000000000000000000..abf5f9fe74fecf7161ef22080ed7d8f34ca7ccea --- /dev/null +++ b/keyboards/ploopyco/trackball_nano/rev1_001/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "direct": [ + [null] + ] + } +} diff --git a/keyboards/ryanbaekr/rb1/config.h b/keyboards/ryanbaekr/rb1/config.h index d6e311bb034088515ce85a9666587bb9d3103063..9024fa25d5bd2587d9fab884dbcdde512583e458 100644 --- a/keyboards/ryanbaekr/rb1/config.h +++ b/keyboards/ryanbaekr/rb1/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * DIRECT: AVR pins used for keys - * - */ -#define DIRECT_PINS {{ B1 }} - /* 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/ryanbaekr/rb1/info.json b/keyboards/ryanbaekr/rb1/info.json index 47ee8c7d2bf1a83a8862c96baa3771aec574e541..f610428f683b2c0a05f0a00657e55a29148985db 100644 --- a/keyboards/ryanbaekr/rb1/info.json +++ b/keyboards/ryanbaekr/rb1/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["B1"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h index 88242cd80ca30c588a5f4011dc72d4ea8e527c9b..03b5e62bb55305befd73fa01b823550b6ef0d62a 100644 --- a/keyboards/sendyyeah/pix/config.h +++ b/keyboards/sendyyeah/pix/config.h @@ -16,19 +16,9 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 5 - #define OLED_FONT_H "keymaps/default/glcdfont.c" #define OLED_TIMEOUT 600000 // Turn of after 10 minutes -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { C6, D7, E6, B4, F6 }, \ -} - #define ENCODERS_PAD_A { B1 } #define ENCODERS_PAD_B { B3 } diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json index 62e387e16babb6a52b617d04be0baaa25ccac984..d3e5b413a19c5e234dfc028e18f16372f6c186f1 100644 --- a/keyboards/sendyyeah/pix/info.json +++ b/keyboards/sendyyeah/pix/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["C6", "D7", "E6", "B4", "F6"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h index 0f4ec182a46e1e0400793e71d084cd279149be5f..08941df1ac88ea782271502107ad4399be9b44ae 100644 --- a/keyboards/sergiopoverony/creator_pro/config.h +++ b/keyboards/sergiopoverony/creator_pro/config.h @@ -16,16 +16,6 @@ #pragma once -/* key matrix size pins */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 9 -#define DIRECT_PINS { \ - { D1, D4, C6, D7, \ - E6, \ - B2, B3, B1, F7 } \ -} - - /*led layout indication pins*/ #define RED_LED D0 #define BLUE_LED B5 diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json index a59d0824fbcdf2d260b5d86431d4bb2f04260051..5b7a061e2461b5d2625e015ccc501fb8bbdf82f1 100644 --- a/keyboards/sergiopoverony/creator_pro/info.json +++ b/keyboards/sergiopoverony/creator_pro/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D1", "D4", "C6", "D7", "E6", "B2", "B3", "B1", "F7"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h index e631c03dffd66e5352f18b9838f53e6ea9e1d799..59ffda45c01709dce0ad71930a07e68839b9eb58 100644 --- a/keyboards/spaceman/2_milk/config.h +++ b/keyboards/spaceman/2_milk/config.h @@ -15,16 +15,6 @@ */ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 1 - -/* Milk default pinout */ -#define DIRECT_PINS { \ - {D4}, \ - {C6} \ -} - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B6 #define RGBLED_NUM 1 diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json index c7e4c944c70a97d0bbb4b49770f7f96b1fa2ac9b..c1f31a3ba7ae9ba282af8c947fa15b3bdb6069ab 100644 --- a/keyboards/spaceman/2_milk/info.json +++ b/keyboards/spaceman/2_milk/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4"], + ["C6"] + ] + }, "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index c4782567ff04870ea8c40719a17ca8ba8b8804c4..777c56465f2c8d8bda4bf5a5422236faf4d47533 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -17,21 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 3 - -/* - * Keyboard Matrix Assignments - */ -#define DIRECT_PINS { \ - { C6, D6, D5 }, \ - { C7, F7, D4 }, \ - { E6, F5, F6 }, \ - { F0, F1, F4 }, \ -} - #define ENCODERS_PAD_A { B4 } #define ENCODERS_PAD_B { D7 } diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index 744efd5b764e4fc03b302aa23841a361bc9beaab..a38404cc97f721615e5b059babe0bc827ed9d6bc 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["C6", "D6", "D5"], + ["C7", "F7", "D4"], + ["E6", "F5", "F6"], + ["F0", "F1", "F4"] + ] + }, "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h index e7b0d17fd753e011cfcae07c50b43c77ec8b57ee..70d1b76bea66be3130d260762dec544fc25d2c7f 100755 --- a/keyboards/tominabox1/bigboy/config.h +++ b/keyboards/tominabox1/bigboy/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix size */ -#define DIRECT_PINS { \ - { D0, B1, B0 }, \ - { B7, B2, B3 } \ -} - - #define ENCODERS_PAD_A { C6 } #define ENCODERS_PAD_B { B6 } #define ENCODER_RESOLUTION 2 diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json index 79150cd3c27dd52a1c0156ed8a77061e5540fa7f..79cf08b39b47568f9788caef12d3536755de04f6 100644 --- a/keyboards/tominabox1/bigboy/info.json +++ b/keyboards/tominabox1/bigboy/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D0", "B1", "B0"], + ["B7", "B2", "B3"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}] diff --git a/keyboards/ungodly/nines/config.h b/keyboards/ungodly/nines/config.h index 2375d9b63f58a0b423d83bd38491d7aecf7690c1..85880e4e637a1c7fb2a84df7ff87938e88b56328 100644 --- a/keyboards/ungodly/nines/config.h +++ b/keyboards/ungodly/nines/config.h @@ -15,18 +15,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 } \ -} - /* Rotary Encoder Assignments */ #define ENCODERS_PAD_A { C6, E6 } #define ENCODERS_PAD_B { D7, B4 } diff --git a/keyboards/ungodly/nines/info.json b/keyboards/ungodly/nines/info.json index ee71e97cf505d8a9dfa97f041510472b55f3bec3..1e7dabe367fdac704121346815587196147dd5b3 100644 --- a/keyboards/ungodly/nines/info.json +++ b/keyboards/ungodly/nines/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/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h index 05383c05a5fea1eb88a0b2011040cea5e8ac69e6..36fc5c6200f22192eaa8752d29236e30cec3d221 100644 --- a/keyboards/winkeys/mini_winni/config.h +++ b/keyboards/winkeys/mini_winni/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* key matrix pins */ -#define DIRECT_PINS { { F4, F5, B4, D7 }, { F6, F7, B6, B5 } } - #define RGB_DI_PIN E6 #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json index 10c304db468f05ee236b9ce185f15d9cdb4a0f61..b3cba1658c8cd714570bdc9c3c2eb3ca091036e3 100644 --- a/keyboards/winkeys/mini_winni/info.json +++ b/keyboards/winkeys/mini_winni/info.json @@ -9,6 +9,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["F4", "F5", "B4", "D7"], + ["F6", "F7", "B6", "B5"] + ] + }, "layouts": { "LAYOUT_all": { "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/winry/winry315/config.h b/keyboards/winry/winry315/config.h index e43016f62b8f21ba088b16c91181de2edd7434c7..5d195be4327349467493938101015e4971063aa6 100644 --- a/keyboards/winry/winry315/config.h +++ b/keyboards/winry/winry315/config.h @@ -3,18 +3,6 @@ #pragma once - -// Key matrix size. -#define MATRIX_ROWS 1 -#define MATRIX_COLS 24 - -// Key pins (including encoder press switches). -// The NO_PIN entries are reserved for encoder rotation mappings. -#define DIRECT_PINS \ - { \ - { F4, C7, D4, D5, D1, F5, C6, D6, D3, D2, F6, B6, D7, B4, B5, B2, D0, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ - } - // clang-format off // Encoder pins. diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json index 7740c1a3e8c5433e70e6c128264c62bf1a6a1a88..5abc92a45575fe8c093179221710989a6c38fd0b 100644 --- a/keyboards/winry/winry315/info.json +++ b/keyboards/winry/winry315/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["F4", "C7", "D4", "D5", "D1", "F5", "C6", "D6", "D3", "D2", "F6", "B6", "D7", "B4", "B5", "B2", "D0", "E6", null, null, null, null, null, null] + ] + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_top" }, diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h index fc84c89bf6830d09458a2988a2ec21370e732fc5..19f01664b2c2243d4f266e628927f34f33ef3617 100644 --- a/keyboards/xiudi/xd002/config.h +++ b/keyboards/xiudi/xd002/config.h @@ -15,18 +15,6 @@ */ #pragma once - -/* matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 2 - -/* - * Keyboard Matrix Assignments - * - * On this board we have direct connection: no diodes. - */ -#define DIRECT_PINS {{ B0, B1 }} - #define RGBLED_NUM 2 #define RGB_DI_PIN B2 diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json index f06e823a885d079d01b62d75a470dbd05bc983ed..4284b0548bc8c6cfab6febe31b2865493529141d 100644 --- a/keyboards/xiudi/xd002/info.json +++ b/keyboards/xiudi/xd002/info.json @@ -8,6 +8,11 @@ "pid": "0x0202", "device_version": "0.0.1" }, + "matrix_pins": { + "direct": [ + ["B0", "B1"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 2dcbc92637f44610038293d61d7a1d4b945106ea..77f57ce32217479bd1c894a27f7161d1864cc2ac 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -9,6 +9,11 @@ }, "processor": "atmega16u2", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D3", "D0", "C4", "B4"] + ] + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"L", "x":0, "y":0}, {"label":"O", "x":1, "y":0}, {"label":"V", "x":2, "y":0}, {"label":"E", "x":3, "y":0}] diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h index 9a1e233d32796fcb783301fef87f6cc7391113a2..0b4e44336cdaf436649fd521248e76e81a88b0aa 100644 --- a/keyboards/xiudi/xd004/v1/config.h +++ b/keyboards/xiudi/xd004/v1/config.h @@ -23,29 +23,11 @@ where some things are disabled to save space as well. #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 4 - -/* - * Keyboard Matrix Assignments - * - * On this board we have direct connection: no diodes. - */ -#define DIRECT_PINS \ - { \ - { D3, D0, C4, B4 } \ - } - /* Backlight Setup */ // Looks like each backlight LED is connected to a single output, D5 is the one furtherst away from USB port #define BACKLIGHT_PIN D5 #define BACKLIGHT_LEVELS 6 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk We do not have enough space in the flash for this at the moment, maybe diff --git a/keyboards/yatara/drink_me/config.h b/keyboards/yatara/drink_me/config.h deleted file mode 100644 index 07deaad16acfb92c486bff4d36e088b2fcf6e505..0000000000000000000000000000000000000000 --- a/keyboards/yatara/drink_me/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 Yatara - * - * 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 4 - -/* Pinout */ -#define DIRECT_PINS { \ - {B4, B5, B6, B7} \ -} diff --git a/keyboards/yatara/drink_me/info.json b/keyboards/yatara/drink_me/info.json index d1d979a4e341c4ea2e80de3989966d717efcf5aa..3df62cf378fedce958024bdcde62f945d86271d2 100644 --- a/keyboards/yatara/drink_me/info.json +++ b/keyboards/yatara/drink_me/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["B4", "B5", "B6", "B7"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h index b763558f36e6eb047dc6edbd1e30b3570fc9a5ed..b14cd03b1b2f514192610885f7ae714e50ce86c7 100644 --- a/keyboards/yeehaw/config.h +++ b/keyboards/yeehaw/config.h @@ -15,16 +15,6 @@ */ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 14 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ -{ D2, D4, C6, E6, F5, B1, D3, D7, B4, F6, B3, B5, F7, F4 } \ -} - #define ENCODERS_PAD_A { D1 } #define ENCODERS_PAD_B { D0 } diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json index 30a0b1f6cbd111331aabc0f32e5580e4871f13b5..98a98cac914878dc20ed2c1954182e8b867b2661 100644 --- a/keyboards/yeehaw/info.json +++ b/keyboards/yeehaw/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D2", "D4", "C6", "E6", "F5", "B1", "D3", "D7", "B4", "F6", "B3", "B5", "F7", "F4"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"label":"VOLU", "x":1, "y":0}, {"label":"VOLD", "x":1, "y":1}, {"label":"M1", "x":2, "y":1.5}, {"label":"UP", "x":3, "y":1.5}, {"label":"MNXT", "x":1, "y":2}, {"label":"M2", "x":4, "y":2}, {"label":"LEFT", "x":2, "y":2.5}, {"label":"DOWN", "x":3, "y":2.5}, {"label":"MO(1)", "x":0, "y":2.75}, {"label":"MPRV", "x":1, "y":3}, {"label":"RIGHT", "x":4, "y":3}, {"label":"MPLY", "x":2, "y":3.5}, {"label":"CTL S", "x":3, "y":3.5}, {"label":"RGB TOG", "x":2.5, "y":4.5}] diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h index b4040091be5e088bb3f994a2d7b15f2f172fcf0e..061dfb6dc8435df8c3d9a07125a1da8f2806dff3 100644 --- a/keyboards/yushakobo/quick7/config.h +++ b/keyboards/yushakobo/quick7/config.h @@ -17,36 +17,9 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 3 -#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 { \ - { D2, D4, F4 }, \ - { D7, B1, B3 }, \ - { E6, B4, B2 }, \ -} - #define ENCODERS_PAD_A { D1, F5 } #define ENCODERS_PAD_B { D0, F6 } - - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN D3 # define RGBLED_NUM 13 diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json index d81bd07e1b0bd2ecc45fbba04b9d9c0a4b22cd03..6d6d4d6725e2d3f52f625d4a55512c4d9cc4f27a 100644 --- a/keyboards/yushakobo/quick7/info.json +++ b/keyboards/yushakobo/quick7/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D2", "D4", "F4"], + ["D7", "B1", "B3"], + ["E6", "B4", "B2"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yynmt/acperience12/rev1/config.h b/keyboards/yynmt/acperience12/rev1/config.h index fb94abb5da01a30a259f8969094659af92442e1e..65a752a97f50c81d87ac34a7895fd4c3c589351b 100644 --- a/keyboards/yynmt/acperience12/rev1/config.h +++ b/keyboards/yynmt/acperience12/rev1/config.h @@ -16,12 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 2 - -#define DIRECT_PINS { { B5, D0 }, { B4, D1 }, { B3, D2 }, { B2, D3 }, { B1, D4 }, { B0, D5 } } - /* 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/yynmt/acperience12/rev1/info.json b/keyboards/yynmt/acperience12/rev1/info.json index 3d8bf426bacbc00e18a9eb09f7153a6412fbd677..20d4f249c292ab92dfe5eda3252bff9e1acb1851 100644 --- a/keyboards/yynmt/acperience12/rev1/info.json +++ b/keyboards/yynmt/acperience12/rev1/info.json @@ -10,6 +10,16 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["B5", "D0"], + ["B4", "D1"], + ["B3", "D2"], + ["B2", "D3"], + ["B1", "D4"], + ["B0", "D5"] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/z12/config.h b/keyboards/z12/config.h index 0f808ca88a73c243da2d51760ea8af3132fc352c..6ee032f5c864e183992c8e0c265a6fe562f50b3b 100644 --- a/keyboards/z12/config.h +++ b/keyboards/z12/config.h @@ -20,19 +20,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { B5, B6 } #define ENCODERS_PAD_B { B4, B2 } -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 4 - -/*Keyboard Matrix Assignments */ - -#define DIRECT_PINS { \ - { NO_PIN, E6, C6, NO_PIN }, \ - { D2, D7, D4, D3 }, \ - { F7, B1, B3, NO_PIN }, \ - { F6, F5, F4, NO_PIN } \ -} - /* 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/z12/info.json b/keyboards/z12/info.json index 1a7c75b12a1452976a9d253e8b8deab9474ff22e..baed03f0fea2b553a4a0561121a37ad179d22b81 100644 --- a/keyboards/z12/info.json +++ b/keyboards/z12/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + [null, "E6", "C6", null], + ["D2", "D7", "D4", "D3"], + ["F7", "B1", "B3", null], + ["F6", "F5", "F4", null] + ] + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/z34/config.h b/keyboards/z34/config.h index b318b750901e976ac0f95f21a50acb3117c3e04d..2f46a4a04b86d1e810e39fc5439ca6515c097d9b 100644 --- a/keyboards/z34/config.h +++ b/keyboards/z34/config.h @@ -16,27 +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 */ - -#define DIRECT_PINS { \ - { C6, F7, F6, F5, F4 }, \ - { D7, B6, B2, B3, B1 }, \ - { E6, D4, D0, D1, D3 }, \ - { B4, B5, NO_PIN, NO_PIN, NO_PIN } \ -} - -#define DIRECT_PINS_RIGHT { \ - { F4, F5, F6, F7, C6 }, \ - { B1, B3, B2, B6, D7 }, \ - { D3, D1, D0, 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 /* Locking resynchronize hack */ diff --git a/keyboards/z34/info.json b/keyboards/z34/info.json index 00d5e5252feb88fe311137bd2422fa014b4128e0..0f210d407765faab43dd762d90e10ecfaa0e0fc5 100644 --- a/keyboards/z34/info.json +++ b/keyboards/z34/info.json @@ -10,6 +10,26 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["C6", "F7", "F6", "F5", "F4"], + ["D7", "B6", "B2", "B3", "B1"], + ["E6", "D4", "D0", "D1", "D3"], + ["B4", "B5", null, null, null] + ] + }, + "split": { + "matrix_pins": { + "right": { + "direct": [ + ["F4", "F5", "F6", "F7", "C6"], + ["B1", "B3", "B2", "B6", "D7"], + ["D3", "D1", "D0", "D4", "E6"], + ["B5", "B4", null, null, null] + ] + } + } + }, "layouts": { "LAYOUT": { "layout": [