diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-06 09:53:52 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-05 22:53:52 +0000 |
| commit | 23c365b023e409885e6f201f12df56e5145dde47 (patch) | |
| tree | 062e72be726939d5f6ddda944facb423bbf386cf /keyboards | |
| parent | b34d51d08d7083fc790db2562a4d39890f34886f (diff) | |
Move matrix config to info.json, part 1 (#19985)
Diffstat (limited to 'keyboards')
502 files changed, 1299 insertions, 3461 deletions
diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h index 702fb3c609..6023c08795 100644 --- a/keyboards/0_sixty/config.h +++ b/keyboards/0_sixty/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json index 154f7bd442..6097a2f349 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -6,6 +6,11 @@ "vid": "0x7654", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2"], + "rows": ["B1", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "features": { "extrakey": true, "console": true, diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h index 036f18fe6c..244a5f192d 100644 --- a/keyboards/0xc7/61key/config.h +++ b/keyboards/0xc7/61key/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, F7, F6, F5, F4, F1, F0 } - -/* 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/0xc7/61key/info.json b/keyboards/0xc7/61key/info.json index 76b525a99e..569a054daf 100644 --- a/keyboards/0xc7/61key/info.json +++ b/keyboards/0xc7/61key/info.json @@ -8,6 +8,11 @@ "pid": "0x6161", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h index f77002e8ab..10b1f88216 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -16,26 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -// clang-format off - -/* - * 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 { D5, D6, D7, B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 -// clang-format on /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json index a18bd7b313..6f3b2d06f0 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/info.json @@ -8,6 +8,11 @@ "pid": "0xA455", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D4", "C0", "C1", "C2", "C3"], + "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"} diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h index 5943564661..ee33867ec3 100644 --- a/keyboards/10bleoledhub/config.h +++ b/keyboards/10bleoledhub/config.h @@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/ #pragma once - -#define MATRIX_ROW_PINS { F0, F5, F4, F6 } -#define MATRIX_COL_PINS { D6, D7, B5 } - -#define DIODE_DIRECTION ROW2COL - #define SSD1306OLED #define RGB_DI_PIN B7 diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json index dd106a74a5..4f5cd9564a 100644 --- a/keyboards/10bleoledhub/info.json +++ b/keyboards/10bleoledhub/info.json @@ -8,6 +8,11 @@ "pid": "0x7C99", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B5"], + "rows": ["F0", "F5", "F4", "F6"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "C7", "pin_b": "F7"} diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h index b58eef1085..edcad67b86 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B3, B2, B1, B0, D4 } -#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json index 07f35c7340..010a82cb5e 100644 --- a/keyboards/1upkeyboards/1up60hse/info.json +++ b/keyboards/1upkeyboards/1up60hse/info.json @@ -8,6 +8,11 @@ "pid": "0x6873", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"], + "rows": ["B3", "B2", "B1", "B0", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h index ff5f010cbe..1aa9d54fe1 100644 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ b/keyboards/1upkeyboards/1up60hte/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json index 98a9082989..383c7f6525 100644 --- a/keyboards/1upkeyboards/1up60hte/info.json +++ b/keyboards/1upkeyboards/1up60hte/info.json @@ -8,6 +8,11 @@ "pid": "0x6874", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"], + "rows": ["B3", "B2", "B1", "B0", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h index 806f23075f..348604d71c 100644 --- a/keyboards/1upkeyboards/1up60rgb/config.h +++ b/keyboards/1upkeyboards/1up60rgb/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 } - -/* 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 diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json index 57a0143544..b0ea1ed036 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x7267", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h index dfed1e4e6f..858e5682d4 100644 --- a/keyboards/1upkeyboards/pi40/config.h +++ b/keyboards/1upkeyboards/pi40/config.h @@ -15,11 +15,6 @@ #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c" #endif -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 } -#define MATRIX_COL_PINS { GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12 } - #define RGB_DI_PIN GP0 #define RGB_MATRIX_LED_COUNT 47 #define RGBLED_NUM 47 diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json index 42c0bc7b12..10fb9c1674 100644 --- a/keyboards/1upkeyboards/pi40/info.json +++ b/keyboards/1upkeyboards/pi40/info.json @@ -6,6 +6,11 @@ "pid": "0x5600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12"], + "rows": ["GP21", "GP20", "GP19", "GP18"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "GP14", "pin_b": "GP13"} diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h index 7af70c5b75..ef1a458c9d 100644 --- a/keyboards/1upkeyboards/super16/config.h +++ b/keyboards/1upkeyboards/super16/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS \ - { D1, D0, F4, F5 } -#define MATRIX_COL_PINS \ - { D4, C6, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json index d648c32f3e..53648fbd02 100644 --- a/keyboards/1upkeyboards/super16/info.json +++ b/keyboards/1upkeyboards/super16/info.json @@ -8,6 +8,11 @@ "pid": "0x5516", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "F6", "F7"], + "rows": ["D1", "D0", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4", "numpad_4x4"], diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h index 04f5fdd979..d3235d95ff 100644 --- a/keyboards/1upkeyboards/super16v2/config.h +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -19,24 +19,6 @@ #define MOUSEKEY_MOVE_DELTA 25 -/* - * 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) - * - */ - -// 0 1 2 3 -#define MATRIX_ROW_PINS { D1, D2, D3, D4 } -#define MATRIX_COL_PINS { D5, D6, C2, D0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 20 #ifdef RGB_DI_PIN diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json index 13e2c55fa5..ee5ba391fb 100644 --- a/keyboards/1upkeyboards/super16v2/info.json +++ b/keyboards/1upkeyboards/super16v2/info.json @@ -8,6 +8,11 @@ "pid": "0x5517", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D6", "C2", "D0"], + "rows": ["D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"}, diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h index 02e8564702..bb68f2b5d4 100644 --- a/keyboards/1upkeyboards/sweet16/v1/config.h +++ b/keyboards/1upkeyboards/sweet16/v1/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifndef CONVERT_TO_PROTON_C # define LED_NUM_LOCK_PIN B0 // RXLED # define LED_CAPS_LOCK_PIN D5 // TXLED diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json index d549338988..c89680ba2d 100644 --- a/keyboards/1upkeyboards/sweet16/v1/info.json +++ b/keyboards/1upkeyboards/sweet16/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x0161", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h index eb8bd97b59..0a8b6b948e 100644 --- a/keyboards/25keys/aleth42/rev0/config.h +++ b/keyboards/25keys/aleth42/rev0/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json index 18023c847e..cd86f9ddf8 100644 --- a/keyboards/25keys/aleth42/rev0/info.json +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.0" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B7"}, diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index e0799e65a1..56ba105e5d 100644 --- a/keyboards/25keys/aleth42/rev1/config.h +++ b/keyboards/25keys/aleth42/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B0, B2, B1 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json index 9d70daf01f..c7e5658ec4 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"], + "rows": ["B4", "B0", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"}, diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h index 776f7f3138..b537056e6b 100644 --- a/keyboards/25keys/zinc/rev1/config.h +++ b/keyboards/25keys/zinc/rev1/config.h @@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define MASTER_RIGHT //#define EE_HANDS -#define MATRIX_ROW_PINS { F6, F7, B1, B3 } -#define MATRIX_COL_PINS { F4, D4, C6, D7, E6, B4 } - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json index fa41ed213f..5d9ec2d7d4 100644 --- a/keyboards/25keys/zinc/rev1/info.json +++ b/keyboards/25keys/zinc/rev1/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Zinc rev.1", + "matrix_pins": { + "cols": ["F4", "D4", "C6", "D7", "E6", "B4"], + "rows": ["F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" } diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h index 0a7e29a9a6..b537056e6b 100644 --- a/keyboards/25keys/zinc/reva/config.h +++ b/keyboards/25keys/zinc/reva/config.h @@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define MASTER_RIGHT //#define EE_HANDS -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3} - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json index ec98ea65a9..3bf44bfe8f 100644 --- a/keyboards/25keys/zinc/reva/info.json +++ b/keyboards/25keys/zinc/reva/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Zinc rev.A", + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" } diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h index 67a1b48157..a1bbffcef4 100644 --- a/keyboards/2key2crawl/config.h +++ b/keyboards/2key2crawl/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C4, C5 } -#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7, B2 } - -/* 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 diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json index e4ab7f79a9..1421a7b1e0 100644 --- a/keyboards/2key2crawl/info.json +++ b/keyboards/2key2crawl/info.json @@ -8,6 +8,11 @@ "pid": "0x6090", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"], + "rows": ["C4", "C5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1", "resolution": 1} diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h deleted file mode 100644 index 23ccf24b81..0000000000 --- a/keyboards/30wer/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - - -/* pcb default pin-out */ -#define MATRIX_ROW_PINS { E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0, D4, C6, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json index bbaa61f6ba..bced976dd5 100644 --- a/keyboards/30wer/info.json +++ b/keyboards/30wer/info.json @@ -8,6 +8,11 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0", "D4", "C6", "D7"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h index 6bb66fc39f..dca5d4a1ff 100644 --- a/keyboards/3keyecosystem/2key2/config.h +++ b/keyboards/3keyecosystem/2key2/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F6 } -#define MATRIX_COL_PINS { F4, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB matrix key backlighting */ #define RGB_DI_PIN B2 #define RGB_MATRIX_LED_COUNT 2 diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json index 1da073d0fc..398a4d3439 100644 --- a/keyboards/3keyecosystem/2key2/info.json +++ b/keyboards/3keyecosystem/2key2/info.json @@ -8,6 +8,11 @@ "pid": "0x3304", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D7"], + "rows": ["F6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 86d1f0b90f..20ecf94708 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -21,22 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* - * 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 { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 } - -/* 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/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json index d0544f9a2e..70a2749a65 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/info.json @@ -8,6 +8,11 @@ "pid": "0x0F25", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h index ac308220e4..7caa265c1a 100644 --- a/keyboards/40percentclub/4x4/config.h +++ b/keyboards/40percentclub/4x4/config.h @@ -2,23 +2,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 MATRIX_ROW_PINS { B2, D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 } - -/* 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/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json index 7864832484..eb066e591b 100644 --- a/keyboards/40percentclub/4x4/info.json +++ b/keyboards/40percentclub/4x4/info.json @@ -8,6 +8,11 @@ "pid": "0x0A0C", "device_version": "44.4.4" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], + "rows": ["B2", "D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4", "ortho_4x12"], diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h index 078344e34b..7caa265c1a 100644 --- a/keyboards/40percentclub/5x5/config.h +++ b/keyboards/40percentclub/5x5/config.h @@ -2,23 +2,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 MATRIX_ROW_PINS { B2, D1, D0, D4, C6 } -#define MATRIX_COL_PINS { D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 } - -/* 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/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json index 76554d54e4..b113485584 100644 --- a/keyboards/40percentclub/5x5/info.json +++ b/keyboards/40percentclub/5x5/info.json @@ -8,6 +8,11 @@ "pid": "0x05B5", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], + "rows": ["B2", "D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"], diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h index 8fbc9ea06f..20ecf94708 100644 --- a/keyboards/40percentclub/6lit/config.h +++ b/keyboards/40percentclub/6lit/config.h @@ -21,22 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* - * 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 { D7, E6 } -#define MATRIX_COL_PINS { F6, F7, B1 } - -/* 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/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json index a0892d2a7a..9ddd475570 100644 --- a/keyboards/40percentclub/6lit/info.json +++ b/keyboards/40percentclub/6lit/info.json @@ -8,6 +8,11 @@ "pid": "0x0F61", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1"], + "rows": ["D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h index 4107b37948..20ecf94708 100644 --- a/keyboards/40percentclub/foobar/config.h +++ b/keyboards/40percentclub/foobar/config.h @@ -21,22 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* - * 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 { D7, E6, B4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 } - -/* 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/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json index ecc079f51b..53cda10128 100644 --- a/keyboards/40percentclub/foobar/info.json +++ b/keyboards/40percentclub/foobar/info.json @@ -8,6 +8,11 @@ "pid": "0x0F00", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2"], + "rows": ["D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h index 3d6c38ec80..627d9d6dbb 100644 --- a/keyboards/40percentclub/gherkin/config.h +++ b/keyboards/40percentclub/gherkin/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 } - -/* 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 diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index ee85708f19..0f889aa04d 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5" }, diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h index af2a983fb4..8b4ccf1479 100644 --- a/keyboards/40percentclub/half_n_half/config.h +++ b/keyboards/40percentclub/half_n_half/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* 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/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json index 6b847361dc..0bec859a5a 100644 --- a/keyboards/40percentclub/half_n_half/info.json +++ b/keyboards/40percentclub/half_n_half/info.json @@ -8,6 +8,11 @@ "pid": "0x4A1F", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/40percentclub/i75/promicro/config.h b/keyboards/40percentclub/i75/promicro/config.h deleted file mode 100644 index 844291c8df..0000000000 --- a/keyboards/40percentclub/i75/promicro/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2018 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 MATRIX_ROW_PINS { B4, E6, D7, C6, D4, D0, D1, D2, D3 } -#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/info.json index 4369a04103..933c4f8616 100644 --- a/keyboards/40percentclub/i75/promicro/info.json +++ b/keyboards/40percentclub/i75/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/40percentclub/i75/teensy2/config.h b/keyboards/40percentclub/i75/teensy2/config.h deleted file mode 100644 index d8f09b1388..0000000000 --- a/keyboards/40percentclub/i75/teensy2/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2018 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 MATRIX_ROW_PINS { D3, D2, D1, D0, B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { C6, C7, D6, D7, B5, B6, F7, F6, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/info.json index 0b2db81c11..2296a57828 100644 --- a/keyboards/40percentclub/i75/teensy2/info.json +++ b/keyboards/40percentclub/i75/teensy2/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C6", "C7", "D6", "D7", "B5", "B6", "F7", "F6", "F5"], + "rows": ["D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h index 2848c7a32c..2f4ce8ee17 100644 --- a/keyboards/40percentclub/luddite/config.h +++ b/keyboards/40percentclub/luddite/config.h @@ -1,12 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json index 948ef091bd..d81a6b842a 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/info.json @@ -8,6 +8,11 @@ "pid": "0x4C55", "device_version": "10.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "levels": 4 diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h index 0a07934e75..b9449c4714 100644 --- a/keyboards/40percentclub/mf68/config.h +++ b/keyboards/40percentclub/mf68/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json index 2c8a4c92d6..eecade3b22 100644 --- a/keyboards/40percentclub/mf68/info.json +++ b/keyboards/40percentclub/mf68/info.json @@ -8,6 +8,11 @@ "pid": "0x4D68", "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], + "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "breathing": true diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h index 6bdf5db350..60d3b4e424 100644 --- a/keyboards/40percentclub/nori/config.h +++ b/keyboards/40percentclub/nori/config.h @@ -16,23 +16,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 MATRIX_ROW_PINS { D3, D2, D1, D0 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D4, C6, D7, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // enable RGB underglow #define RGB_DI_PIN B4 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json index 9a031a06cb..97c793b069 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/info.json @@ -8,6 +8,11 @@ "pid": "0x0A0C", "device_version": "4.4.4" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5" }, diff --git a/keyboards/40percentclub/polyandry/promicro/config.h b/keyboards/40percentclub/polyandry/promicro/config.h deleted file mode 100644 index ff148a0b3f..0000000000 --- a/keyboards/40percentclub/polyandry/promicro/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* key matrix pins - * Direct pins is not used because there is not a shared ground position - * between all compatible microcontrollers. -*/ -#define MATRIX_ROW_PINS { D7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, E6, B4, F4, F5, F6, F7, B3, B2 } - -/* doesn't really matter lol */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/info.json index 4369a04103..a8169c93dd 100644 --- a/keyboards/40percentclub/polyandry/promicro/info.json +++ b/keyboards/40percentclub/polyandry/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "E6", "B4", "F4", "F5", "F6", "F7", "B3", "B2"], + "rows": ["D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/40percentclub/polyandry/teensy2/config.h deleted file mode 100644 index 8eaeb3167a..0000000000 --- a/keyboards/40percentclub/polyandry/teensy2/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* key matrix pins */ - -// Note from original contributor (ryjelsum): -// Untested - don't have teensy2. if some keys do not function or are in wrong place, -// please check the pin definitions. I may have screwed up. :) - -#define MATRIX_ROW_PINS { D3 } -#define MATRIX_COL_PINS { B7, D0, D1, D2, C6, C7, F6, F7, B6, B5, D7, D6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json index 0b2db81c11..0a870332b2 100644 --- a/keyboards/40percentclub/polyandry/teensy2/info.json +++ b/keyboards/40percentclub/polyandry/teensy2/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"], + "rows": ["D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h index 357380e3a7..5e3bf27f3d 100644 --- a/keyboards/40percentclub/tomato/config.h +++ b/keyboards/40percentclub/tomato/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json index cbaefde2bd..8877c31429 100644 --- a/keyboards/40percentclub/tomato/info.json +++ b/keyboards/40percentclub/tomato/info.json @@ -8,6 +8,11 @@ "pid": "0x546F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_3x10"], diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h index fcf2f8ea44..1d951890cd 100644 --- a/keyboards/45_ats/config.h +++ b/keyboards/45_ats/config.h @@ -18,13 +18,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D5, D7, D6 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, F6, F5, F4, C7, F7, C6, B6, D4 } - -/* 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 diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json index 0bf42f9a75..f4f163ccc1 100644 --- a/keyboards/45_ats/info.json +++ b/keyboards/45_ats/info.json @@ -8,6 +8,11 @@ "pid": "0x4511", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"], + "rows": ["D3", "D5", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/4by3/config.h b/keyboards/4by3/config.h deleted file mode 100644 index 5f20b5b97a..0000000000 --- a/keyboards/4by3/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json index 0ed57ce2f6..ade503696c 100644 --- a/keyboards/4by3/info.json +++ b/keyboards/4by3/info.json @@ -8,6 +8,11 @@ "pid": "0x2019", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index f7ef22d986..d922c2e10f 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -1,13 +1,5 @@ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} -#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index 9932b6ec55..2c5c25df4b 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"], + "rows": ["C2", "D0", "B0", "C7", "C5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C2", "esc_output": "C4" diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index b5602b1cc0..6892802218 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B15,A9,B7,A1,A2} -#define MATRIX_COL_PINS {A3,A4,F1,F0,C15,C14,C13,B9,B8,B6,B5,B4,B3,A15} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 12 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index fe2e424999..92cd38952a 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A3", "A4", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B15", "A9", "B7", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A10" }, diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h deleted file mode 100644 index b1743d0982..0000000000 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {D0,C2,C4,D4,D2} -#define MATRIX_COL_PINS {C5,C6,C7,B7,B6,B5,B4,B3,B2,B1,B0,D6,D5,D3,D1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index 49686d5bf3..9ff31a1ee3 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"], + "rows": ["D0", "C2", "C4", "D4", "D2"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D0", "esc_output": "C4" diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 3d480a1e93..76bc9a6b4f 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { A0, B1, B0, A4, B5, B4, B3 } -#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD2 #define BACKLIGHT_PWM_CHANNEL 4 #define BACKLIGHT_PAL_MODE 2 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 534736ccd7..23c7496c60 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "B1", "B0", "A4", "B5", "B4", "B3"], + "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A3", "levels": 10, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index eed3b708c4..6ecc98da2d 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { A0, A3, A4, A7, B5, B4, B3 } -#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index 7ced2cf40c..b815c9bf4f 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A0", "A3", "A4", "A7", "B5", "B4", "B3"], + "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h index 2764861e97..e033b16259 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/config.h +++ b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { A1, B12, B14, A2, A0, A3, A4} -#define MATRIX_ROW_PINS { C14, C13, B5, B4, B8, A15, B3, B9, A5, A7} -#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/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json index 07bd69f22e..0710674dff 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/info.json +++ b/keyboards/4pplet/perk60_iso/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"], + "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "community_layouts": ["60_iso"], diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index f7ef22d986..d922c2e10f 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -1,13 +1,5 @@ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} -#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index b6e9c37ba2..cf8bfba558 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"], + "rows": ["C2", "D0", "B0", "C7", "C5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C2", "esc_output": "C4" diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h deleted file mode 100644 index 670c8132a1..0000000000 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {D4,D1,C2,C4,C7,B2} -#define MATRIX_COL_PINS {D3,D0,D2,B6,B5,B4,B3,D6,D5,B0,B1} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json index 0b98be4876..ea24fceea0 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"], + "rows": ["D4", "D1", "C2", "C4", "C7", "B2"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D4", "esc_output": "D3" diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index 7c1e13ce84..85521fa3b6 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5} -#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 866ae5c1ac..72a9ac953c 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], + "rows": ["C2", "D0", "B0", "D6", "D5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C4", "esc_output": "C2" diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 689a515013..979a022177 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5} -#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index 1a6937b096..d7bceba391 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], + "rows": ["C2", "D0", "B0", "D6", "D5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C4", "esc_output": "C2" diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index 05e66f6a79..91a0e7f0cd 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} -#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 1 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json index 7b09f0a0d3..9648794a7d 100644 --- a/keyboards/4pplet/waffling60/rev_d/info.json +++ b/keyboards/4pplet/waffling60/rev_d/info.json @@ -8,6 +8,11 @@ "pid": "0x000E", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], + "rows": ["B14", "A9", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h deleted file mode 100644 index beb204bb2d..0000000000 --- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} -#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json index dc3ea424bb..84f375371d 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json +++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x000D", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], + "rows": ["B14", "A9", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h deleted file mode 100644 index cb2e06921a..0000000000 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com> - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} -#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json index 8f9c34b563..c920744d27 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/info.json +++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json @@ -8,6 +8,11 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], + "rows": ["B14", "A9", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index 8b3dc47247..063cfb1b3c 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {C4,C5,B4,B3,B1,B0,D6,D5,D3,D4,D1,D2} -#define MATRIX_COL_PINS {C6,C7,B7,B6,B5,B2,D0,C2} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D7 #define RGBLED_NUM 2 diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index 13bffb7384..434b615f4a 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"], + "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C4", "esc_output": "C6" diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index c863208012..5656563fa1 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {B13,B12,A5,A4,A2,A1,F0,C15,C13,C14,F1,A0} -#define MATRIX_COL_PINS {B2,B1,B0,A7,A6,A3,B9,B8} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 2 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json index f6a835652f..cc5829cb43 100644 --- a/keyboards/4pplet/waffling80/rev_b/info.json +++ b/keyboards/4pplet/waffling80/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x000F", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8"], + "rows": ["B13", "B12", "A5", "A4", "A2", "A1", "F0", "C15", "C13", "C14", "F1", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index 959bd92622..b9a17d4128 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, C15, A8 } -#define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 } -#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/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json index b902a0d6cf..645c408dcf 100644 --- a/keyboards/4pplet/yakiimo/rev_a/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"], + "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A6", "scroll_lock": "A7" diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h index ba7016ab34..f6b4b30cf5 100644 --- a/keyboards/7c8/framework/config.h +++ b/keyboards/7c8/framework/config.h @@ -16,11 +16,7 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, D7, B2, D6, B3, D5, B4, D4, B5 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 } - #define TAP_CODE_DELAY 16 -#define DIODE_DIRECTION COL2ROW #define LEADER_TIMEOUT 250 #define LEADER_PER_KEY_TIMING 150 diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json index ca440e9a76..862acea115 100644 --- a/keyboards/7c8/framework/info.json +++ b/keyboards/7c8/framework/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], + "rows": ["B0", "B1", "D7", "B2", "D6", "B3", "D5", "B4", "D4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"} diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h index 8f721392c8..a5dd0856a3 100644 --- a/keyboards/9key/config.h +++ b/keyboards/9key/config.h @@ -17,17 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* 9Key PCB default pin-out */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { F4, F5, F6 } - /* ws2812 RGB LED */ #define RGB_DI_PIN F7 #define RGBLED_NUM 1 // Number of LEDs -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 200 diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json index fa74573e3e..e4109ef2aa 100644 --- a/keyboards/9key/info.json +++ b/keyboards/9key/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h index 152c1a512b..f7e36e63eb 100644 --- a/keyboards/gami_studio/lex60/config.h +++ b/keyboards/gami_studio/lex60/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {D5,D4,B0,D2,D3} -#define MATRIX_COL_PINS {B7,F7,C7,E6,C6,F0,B6,F1,B5,F4,B4,F5,D7,F6,D6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D1 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json index 8c1d730787..62ac3b40bf 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/info.json @@ -8,6 +8,11 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "F7", "C7", "E6", "C6", "F0", "B6", "F1", "B5", "F4", "B4", "F5", "D7", "F6", "D6"], + "rows": ["D5", "D4", "B0", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "D5", "esc_output": "B7" diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index d0415c48f5..a3516ccedb 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -4,9 +4,3 @@ #define VERSION "Paula Deen" #define FORCE_NKRO - -#define MATRIX_ROW_PINS { F4, F5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 085d56f91e..465cd940a1 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -8,6 +8,11 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"], + "rows": ["F4", "F5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h index 0a184388ae..0fea806b6f 100644 --- a/keyboards/geekboards/tester/config.h +++ b/keyboards/geekboards/tester/config.h @@ -1,10 +1,5 @@ #pragma once - -#define MATRIX_ROW_PINS { B0, D4} -#define MATRIX_COL_PINS { F7, F6, D2, D3} - -#define DIODE_DIRECTION COL2ROW #define LOCKING_SUPPORT_ENABL #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json index fdc0463e41..97d2c078fe 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/info.json @@ -8,6 +8,11 @@ "pid": "0x1319", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "D2", "D3"], + "rows": ["B0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "debounce": 3, diff --git a/keyboards/generic_panda/panda65_01/config.h b/keyboards/generic_panda/panda65_01/config.h deleted file mode 100644 index 20163dedc5..0000000000 --- a/keyboards/generic_panda/panda65_01/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 generic_panda - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 MATRIX_ROW_PINS { A9, A8, B15, A6, A4 } -#define MATRIX_COL_PINS { A3, A10, B7, B6, B5, B4, B3, A15, A14, A2, A1, A0, F1, F0, B10, B11 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json index 57fe2ea133..fe6292d80f 100644 --- a/keyboards/generic_panda/panda65_01/info.json +++ b/keyboards/generic_panda/panda65_01/info.json @@ -8,6 +8,11 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A2", "A1", "A0", "F1", "F0", "B10", "B11"], + "rows": ["A9", "A8", "B15", "A6", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h deleted file mode 100644 index 9c6056154a..0000000000 --- a/keyboards/genone/eclipse_65/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 MATRIX_ROW_PINS { B3, B7, B0, B1, B2 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/genone/eclipse_65/info.json b/keyboards/genone/eclipse_65/info.json index b17bc2bf68..ad20ba2837 100644 --- a/keyboards/genone/eclipse_65/info.json +++ b/keyboards/genone/eclipse_65/info.json @@ -8,6 +8,11 @@ "pid": "0x2222", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], + "rows": ["B3", "B7", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/genone/g1_65/config.h b/keyboards/genone/g1_65/config.h deleted file mode 100644 index 95e67a9d12..0000000000 --- a/keyboards/genone/g1_65/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 MATRIX_ROW_PINS { B3, B7, B0, B1, B2 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/genone/g1_65/info.json b/keyboards/genone/g1_65/info.json index da5a1df03a..2e02a77ff1 100644 --- a/keyboards/genone/g1_65/info.json +++ b/keyboards/genone/g1_65/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], + "rows": ["B3", "B7", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/geonworks/frogmini/fmh/config.h b/keyboards/geonworks/frogmini/fmh/config.h index 4f62de8d8b..7410a49e59 100644 --- a/keyboards/geonworks/frogmini/fmh/config.h +++ b/keyboards/geonworks/frogmini/fmh/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 -#define MATRIX_COL_PINS { C4 , C5 , B0 , C13, C14, C15, B9 , C1 , C2 , C3 , A6 , A5 , A4 , A0 } -// R0 , R1 , R2 , R3 , R4 , R5 , R6 -#define MATRIX_ROW_PINS { A3 , A2 , A1 , B8 , A7 , C0 } - -#define DIODE_DIRECTION COL2ROW - #define I2C_DRIVER I2CD1 #define I2C_SCL_PIN B6 #define I2C_SDA_PIN B7 diff --git a/keyboards/geonworks/frogmini/fmh/info.json b/keyboards/geonworks/frogmini/fmh/info.json index 856705b4f1..617c7a4972 100644 --- a/keyboards/geonworks/frogmini/fmh/info.json +++ b/keyboards/geonworks/frogmini/fmh/info.json @@ -8,6 +8,11 @@ "pid": "0x2D28", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], + "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/geonworks/frogmini/fms/config.h b/keyboards/geonworks/frogmini/fms/config.h index ad9c202933..6576ee9efe 100644 --- a/keyboards/geonworks/frogmini/fms/config.h +++ b/keyboards/geonworks/frogmini/fms/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 -#define MATRIX_COL_PINS { C4 , C5 , B0 , C13, C14, C15, B9 , C1 , C2 , C3 , A6 , A5 , A4 , A0 } -// R0 , R1 , R2 , R3 , R4 , R5 , R6 -#define MATRIX_ROW_PINS { A3 , A2 , A1 , B8 , A7 , C0 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/geonworks/frogmini/fms/info.json b/keyboards/geonworks/frogmini/fms/info.json index 9e51f9226f..5c459d129e 100644 --- a/keyboards/geonworks/frogmini/fms/info.json +++ b/keyboards/geonworks/frogmini/fms/info.json @@ -8,6 +8,11 @@ "pid": "0x2D33", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], + "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A10", "levels": 20 diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h deleted file mode 100644 index b2d8ee9014..0000000000 --- a/keyboards/ggkeyboards/genesis/hotswap/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 MATRIX_ROW_PINS \ - { C5, C4, C3, C2, C1, C0 } -#define MATRIX_COL_PINS \ - { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json index 35b52cb9c4..8963434bd9 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/info.json +++ b/keyboards/ggkeyboards/genesis/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xD4D3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], + "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/ggkeyboards/genesis/solder/config.h b/keyboards/ggkeyboards/genesis/solder/config.h deleted file mode 100644 index 6bdd3cc57c..0000000000 --- a/keyboards/ggkeyboards/genesis/solder/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 MATRIX_ROW_PINS { C5, C4, C3, C2, C1, C0 } -#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json index ebc309987c..27b1d36847 100644 --- a/keyboards/ggkeyboards/genesis/solder/info.json +++ b/keyboards/ggkeyboards/genesis/solder/info.json @@ -8,6 +8,11 @@ "pid": "0xD4D2", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], + "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h index fdeb69cae2..baf09cebb5 100644 --- a/keyboards/gh60/revc/config.h +++ b/keyboards/gh60/revc/config.h @@ -17,26 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -// Rev A -// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 } -// Rev B/C - #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json index 052eaea8a3..9db9441171 100644 --- a/keyboards/gh60/revc/info.json +++ b/keyboards/gh60/revc/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h index ce76bc8233..3e9a6d3a1c 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 88a09cb3f6..9a3b190d54 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4 diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h index a7d7231e25..5382607589 100644 --- a/keyboards/gh60/v1p3/config.h +++ b/keyboards/gh60/v1p3/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json index 4806535fd0..648a98e37c 100644 --- a/keyboards/gh60/v1p3/info.json +++ b/keyboards/gh60/v1p3/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 15 diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h index 5befa284fa..b44dfaac52 100644 --- a/keyboards/gh80_3000/config.h +++ b/keyboards/gh80_3000/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 } -#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 } - -/* 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 diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/info.json index b03ea8f6a3..abc9c14051 100644 --- a/keyboards/gh80_3000/info.json +++ b/keyboards/gh80_3000/info.json @@ -8,6 +8,11 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"], + "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["fullsize_ansi", "fullsize_iso"], diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h index 2853b095cc..ea09e835d0 100644 --- a/keyboards/ghs/rar/config.h +++ b/keyboards/ghs/rar/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN #define RGBLED_NUM 17 diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json index 1a8b534e56..b97ee064fd 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"], + "rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h index 01e84b4cdd..1b2a8bdf5b 100644 --- a/keyboards/giabalanai/config.h +++ b/keyboards/giabalanai/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B1, F7, F6, F5, F4, B3, B2, B6, D0, D1 } -#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, C7, B7, F1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index 30bd26159f..31c0c3366d 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -8,6 +8,11 @@ "pid": "0xF4B0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [] }, @@ -19,6 +24,12 @@ {"pin_a": "B4", "pin_b": "B6"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h index 402c6f17cc..ba683e4fed 100755 --- a/keyboards/gizmo_engineering/gk6/config.h +++ b/keyboards/gizmo_engineering/gk6/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments -*/ -#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4} -#define MATRIX_COL_PINS { B5, C6, C7, F7, F6, D5, D3, D2, F1, F4, B7, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - // RGB Matrix #define DRIVER_ADDR_1 0b1110100 #define DRIVER_ADDR_2 0b1110111 diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json index a8c0e5b05d..f3169e3c0d 100644 --- a/keyboards/gizmo_engineering/gk6/info.json +++ b/keyboards/gizmo_engineering/gk6/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "30.3.1" }, + "matrix_pins": { + "cols": ["B5", "C6", "C7", "F7", "F6", "D5", "D3", "D2", "F1", "F4", "B7", "F5"], + "rows": ["B6", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h index 9589c7887d..036340f2fd 100644 --- a/keyboards/gkeyboard/gkb_m16/config.h +++ b/keyboards/gkeyboard/gkb_m16/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D4, D5, D6, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json index ca200a1485..4719f1ee94 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/info.json @@ -8,6 +8,11 @@ "pid": "0x4201", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7"], + "rows": ["D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json index 76e6e89925..0ece27735d 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x5045", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 3] }, diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h index c2483d675f..64febeb948 100644 --- a/keyboards/gmmk/gmmk2/p65/config.h +++ b/keyboards/gmmk/gmmk2/p65/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json index 5d5aba914e..af52b203dc 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/info.json +++ b/keyboards/gmmk/gmmk2/p65/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x504A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 3] }, diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index f5b05748c7..5a67f0b74c 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x504B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h index 19cab78423..16aae9b330 100644 --- a/keyboards/gmmk/gmmk2/p96/config.h +++ b/keyboards/gmmk/gmmk2/p96/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index a2f377615b..22678f64a1 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x505A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index c633d722a0..8188418469 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10 } -#define MATRIX_COL_PINS \ - { A0, A1, A2, A3, A4, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json index b8a7e94a82..7e66ad5043 100644 --- a/keyboards/gmmk/pro/rev1/ansi/info.json +++ b/keyboards/gmmk/pro/rev1/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json index 48181ec488..082f28a774 100644 --- a/keyboards/gmmk/pro/rev1/iso/info.json +++ b/keyboards/gmmk/pro/rev1/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index a8a25f8547..0a20c97d2e 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index c37ccd53df..e3cb707c48 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h index c3762c6388..fa9a83d08e 100644 --- a/keyboards/gon/nerd60/config.h +++ b/keyboards/gon/nerd60/config.h @@ -1,12 +1,5 @@ #pragma once -/* matrix pins */ -#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 097d4d45c0..4b1f158717 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -8,6 +8,11 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"], + "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h index 8db20474be..fa9a83d08e 100644 --- a/keyboards/gon/nerdtkl/config.h +++ b/keyboards/gon/nerdtkl/config.h @@ -1,12 +1,5 @@ #pragma once -/* matrix pins */ -#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index f9e38f0c89..ac7d8a0ce7 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -8,6 +8,11 @@ "pid": "0x5244", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"], + "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h index f660448b46..86fc4cef7f 100644 --- a/keyboards/gopolar/gg86/config.h +++ b/keyboards/gopolar/gg86/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C6, B6, B5, B4, D7, D6, D4, C7, E6, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index dc017f23c4..d03cbc899b 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gorthage_truck/config.h b/keyboards/gorthage_truck/config.h deleted file mode 100644 index 56b84cb427..0000000000 --- a/keyboards/gorthage_truck/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 s8erdude - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 MATRIX_ROW_PINS { C6, B6, B5, B4, C7, B3, B7, D7} -#define MATRIX_COL_PINS { F0, F1, F4, F7, D6, E6, B0, B1, B2} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/info.json index fe5b37c6b8..7f40f6583f 100644 --- a/keyboards/gorthage_truck/info.json +++ b/keyboards/gorthage_truck/info.json @@ -8,6 +8,11 @@ "pid": "0x58E4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F7", "D6", "E6", "B0", "B1", "B2"], + "rows": ["C6", "B6", "B5", "B4", "C7", "B3", "B7", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} diff --git a/keyboards/gowla/config.h b/keyboards/gowla/config.h deleted file mode 100644 index 843389ea2e..0000000000 --- a/keyboards/gowla/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* Pin-out */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { B5, B4, E6 } - -/* ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/gowla/info.json b/keyboards/gowla/info.json index 8393d1c82d..b9225b0cf0 100644 --- a/keyboards/gowla/info.json +++ b/keyboards/gowla/info.json @@ -8,6 +8,11 @@ "pid": "0xE9B6", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h index 479ca4c744..70ee32e0a3 100644 --- a/keyboards/gray_studio/aero75/config.h +++ b/keyboards/gray_studio/aero75/config.h @@ -3,23 +3,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 MATRIX_ROW_PINS { A7, A6, B12, A2, A1, A0 } -#define MATRIX_COL_PINS { A3, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15, B1, A8, B15, B14, B13 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index 37376a90e9..aaf8cf8dfd 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/info.json @@ -8,6 +8,11 @@ "pid": "0x3075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"], + "rows": ["A7", "A6", "B12", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h index 8d360498a5..ceab86fb29 100644 --- a/keyboards/gray_studio/apollo80/config.h +++ b/keyboards/gray_studio/apollo80/config.h @@ -16,21 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json index 2f090ef342..5fc332b465 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/info.json @@ -8,6 +8,11 @@ "pid": "0x3001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], + "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h index 64b58911e3..ee5248471a 100644 --- a/keyboards/gray_studio/cod67/config.h +++ b/keyboards/gray_studio/cod67/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } -#define MATRIX_COL_PINS { D7, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index 2f8a81d08e..06de4b4f4b 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -8,6 +8,11 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"], + "rows": ["C7", "C6", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "on_state": 0 diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h index 20dbdb3f50..41df8a357d 100644 --- a/keyboards/gray_studio/hb85/config.h +++ b/keyboards/gray_studio/hb85/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json index a8b7641a0b..e49b1667c5 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/info.json @@ -8,6 +8,11 @@ "pid": "0x2000", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h index 17a91e8e47..1b3e39536f 100644 --- a/keyboards/gray_studio/space65/config.h +++ b/keyboards/gray_studio/space65/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D0, D1, F0, F4, F1 } -#define MATRIX_COL_PINS { B0, B3, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json index 0689443af5..92eb084b56 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/info.json @@ -8,6 +8,11 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["D0", "D1", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h index 0cd753963c..089bb27b17 100644 --- a/keyboards/gray_studio/space65r3/config.h +++ b/keyboards/gray_studio/space65r3/config.h @@ -2,23 +2,6 @@ // SPDX-License-Identifier: GPL-2.0 #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 MATRIX_ROW_PINS { A6, B12, A2, A0, A1 } -#define MATRIX_COL_PINS { A3, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15, B0, A8, B15, B14, B13 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json index b514a2886b..c2eca2b769 100644 --- a/keyboards/gray_studio/space65r3/info.json +++ b/keyboards/gray_studio/space65r3/info.json @@ -8,6 +8,11 @@ "pid":"0x3003", "device_version": "0.0.3", }, + "matrix_pins": { + "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"], + "rows": ["A6", "B12", "A2", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h index cad954709b..1934bc77ad 100644 --- a/keyboards/gray_studio/think65/hotswap/config.h +++ b/keyboards/gray_studio/think65/hotswap/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } -#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json index 1ec54ad748..ff21f224f4 100644 --- a/keyboards/gray_studio/think65/hotswap/info.json +++ b/keyboards/gray_studio/think65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x4001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], + "rows": ["B0", "B1", "B2", "B3", "E6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h index b6e0419aa1..1934bc77ad 100644 --- a/keyboards/gray_studio/think65/solder/config.h +++ b/keyboards/gray_studio/think65/solder/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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) - * - */ - // 0 1 2 3 4 5 6 7 8 9 A B C D E F -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } -#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json index 5374b4619d..c16f665209 100644 --- a/keyboards/gray_studio/think65/solder/info.json +++ b/keyboards/gray_studio/think65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], + "rows": ["B0", "B1", "B2", "B3", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h index a5a0733063..38cde33eec 100644 --- a/keyboards/grid600/press/config.h +++ b/keyboards/grid600/press/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { F0 } -#define MATRIX_COL_PINS { F1, F4, F5, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN B6 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json index 6fb7c8d5b0..0e0aaff476 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/info.json @@ -8,6 +8,11 @@ "pid": "0x7539", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6"], + "rows": ["F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gvalchca/ga150/config.h b/keyboards/gvalchca/ga150/config.h deleted file mode 100644 index 7678422bc5..0000000000 --- a/keyboards/gvalchca/ga150/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Kirill Shkuretskiy - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B2,B3,F1,F0} -#define MATRIX_COL_PINS {E6,B7,D5,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,D3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/info.json index 4e2d65df59..53b4b69a42 100644 --- a/keyboards/gvalchca/ga150/info.json +++ b/keyboards/gvalchca/ga150/info.json @@ -8,6 +8,11 @@ "pid": "0x6135", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "D3"], + "rows": ["B1", "B2", "B3", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "E6" diff --git a/keyboards/gvalchca/spaccboard/config.h b/keyboards/gvalchca/spaccboard/config.h deleted file mode 100644 index 2703cdd688..0000000000 --- a/keyboards/gvalchca/spaccboard/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Kirill Shkuretskiy - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B2,B3,C7,F0} -#define MATRIX_COL_PINS {E6,B7,D5,D6,D7,B4,B5,B6,C6,F7,F6,F5,F4,F1,D3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/info.json index 435abb01e0..31c752537f 100644 --- a/keyboards/gvalchca/spaccboard/info.json +++ b/keyboards/gvalchca/spaccboard/info.json @@ -8,6 +8,11 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "D3"], + "rows": ["B1", "B2", "B3", "C7", "F0"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "E6" diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h index 37e578dfea..c02ea1f913 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h @@ -18,31 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * 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) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, A10 can be ignored. -// On this keyboard the pins are ordered in the following way: (top/bottom meaning where the trace is routed on the membranes) -// top, top, top, top, top, top, top, top, bottom, top, bottom, top, bottom, top, bottom, top, bottom, bottom, top, top, top, top, bottom, bottom - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, C4, B0, B10, B13, C6, C7, C8, C9 } -#define MATRIX_ROW_PINS { A7, C5, B1, B12, B14, B15, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json index 2aebd925ee..95a572bd17 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"], + "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h deleted file mode 100644 index c414e3254c..0000000000 --- a/keyboards/ibnuda/alicia_cook/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 Ibnu D. Aji - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 MATRIX_ROW_PINS { D2, D3, F4, F5 } -#define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index 9e34484de5..137c6bc7de 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -8,6 +8,11 @@ "pid": "0x6955", "device_version": "8.9.9" }, + "matrix_pins": { + "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D2", "D3", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index bf563918c9..2521d16e8c 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2} -#define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index 7b3c71aa88..3fd6dfe21a 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -8,6 +8,11 @@ "pid": "0x6974", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h index f943c2c053..10887bdf18 100644 --- a/keyboards/ibnuda/squiggle/rev1/config.h +++ b/keyboards/ibnuda/squiggle/rev1/config.h @@ -1,19 +1,3 @@ #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 MATRIX_ROW_PINS { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MASTER_LEFT diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index 6016649bce..e2e2b4a3f7 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h index 90077d2361..baf09cebb5 100644 --- a/keyboards/idb/idb_60/config.h +++ b/keyboards/idb/idb_60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { C2, D0, D1, D2, D3, D4, D5, D6, B0, B1 } -#define MATRIX_COL_PINS { B2, B3, B4, C6, B6, B7, C7, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json index 1114abd5bd..a7035245f0 100644 --- a/keyboards/idb/idb_60/info.json +++ b/keyboards/idb/idb_60/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B4", "C6", "B6", "B7", "C7", "B5"], + "rows": ["C2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "B0", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 54f0fc0c7c..4f15181dfd 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B3, C7, B6, C6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index a192072701..b0d2c6f712 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B3", "C7", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h index d44e54d32c..707f040992 100644 --- a/keyboards/idobao/id75/v2/config.h +++ b/keyboards/idobao/id75/v2/config.h @@ -16,23 +16,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 MATRIX_ROW_PINS { B0, B3, C7, B6, C6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #undef RGB_DI_PIN #define RGB_DI_PIN F0 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index 558cbda3c8..599e02ab59 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0075", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B3", "C7", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index d3eb71dc92..fc65958e3e 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -17,37 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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) - * - * The matrix description in the vendor-supplied JSON file for kbfirmware.com - * had 9 columns: - * { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - * and 12 rows: - * { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } - * However, the row 6 was completely empty, and the pin F0 was not actually - * routed anywhere on the PCB, therefore this row was removed to save some - * resources (the EEPROM space for dynamic keymaps is especially scarce). - * - * After doing the above change, the matrix was transposed (rows and columns - * were swapped), because a matrix with the COL2ROW layout can be scanned much - * more efficiently than a matrix with the ROW2COL layout (depending on various - * optimizations, the difference in scan rate can be over 2 times). Because of - * this, the "columns" in the matrix layout now mostly correspond to physical - * rows, and the "rows" have mostly vertical physical orientation. - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */ diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json index 89b64f3951..c8ee450e44 100644 --- a/keyboards/idobao/id80/v2/info.json +++ b/keyboards/idobao/id80/v2/info.json @@ -6,6 +6,11 @@ "vid": "0x6964", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index 2f4ebd7744..881174152c 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -14,25 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } - -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index ca39654575..ea98558455 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index 7f48dc7752..1d968410b1 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -18,14 +18,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index 2046283d8e..5acdaba228 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -8,6 +8,11 @@ "pid": "0x0096", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 7, diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 5c612855fb..0cb9bb1f19 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index 725ddc0c4d..e5c423e527 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0"], + "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index a3b2a5ef92..4851844dad 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -3,21 +3,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 MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN B1 #if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index 75add6a896..f77698554d 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -6,6 +6,11 @@ "pid": "0x0127", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0"], + "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x5"], diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h index f7f6409149..50001e978c 100644 --- a/keyboards/illuminati/is0/config.h +++ b/keyboards/illuminati/is0/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D2 } -#define MATRIX_COL_PINS { D0 } - -/* 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/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json index 1d201e3535..c1816b5e2a 100644 --- a/keyboards/illuminati/is0/info.json +++ b/keyboards/illuminati/is0/info.json @@ -8,6 +8,11 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0"], + "rows": ["D2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h index b83ebd140a..7b9007c1f6 100644 --- a/keyboards/illusion/rosa/config.h +++ b/keyboards/illusion/rosa/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { D1, D4, F0, B0, B1 } -#define MATRIX_COL_PINS { D0, D2, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6 } - -/* 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/illusion/rosa/info.json b/keyboards/illusion/rosa/info.json index bb533bfb2f..4432fbca49 100644 --- a/keyboards/illusion/rosa/info.json +++ b/keyboards/illusion/rosa/info.json @@ -8,6 +8,11 @@ "pid": "0x6952", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D2", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["D1", "D4", "F0", "B0", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "on_state": 0 diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h index 5e8abdf2e0..0e5e8b9d25 100644 --- a/keyboards/ilumkb/primus75/config.h +++ b/keyboards/ilumkb/primus75/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 } - -/* 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 diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json index 9b665dda74..7f447ff1ae 100644 --- a/keyboards/ilumkb/primus75/info.json +++ b/keyboards/ilumkb/primus75/info.json @@ -8,6 +8,11 @@ "pid": "0x1014", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"], + "rows": ["D0", "D1", "D2", "D3", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h index 6c6326b3cd..151eba96c9 100644 --- a/keyboards/ilumkb/simpler61/config.h +++ b/keyboards/ilumkb/simpler61/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_LED_PROCESS_LIMIT 4 diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json index 867152f295..e9f4488dc7 100644 --- a/keyboards/ilumkb/simpler61/info.json +++ b/keyboards/ilumkb/simpler61/info.json @@ -8,6 +8,11 @@ "pid": "0xC361", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h index f6fcafb749..5554f56bd1 100644 --- a/keyboards/ilumkb/simpler64/config.h +++ b/keyboards/ilumkb/simpler64/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_LED_PROCESS_LIMIT 4 diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json index 15d17d3540..40371b7a28 100644 --- a/keyboards/ilumkb/simpler64/info.json +++ b/keyboards/ilumkb/simpler64/info.json @@ -8,6 +8,11 @@ "pid": "0xC364", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h index c63b26264e..fdd1846753 100644 --- a/keyboards/ilumkb/volcano660/config.h +++ b/keyboards/ilumkb/volcano660/config.h @@ -15,23 +15,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 MATRIX_ROW_PINS { B0, B1, B2, B3, B6 } -#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D3, D5, D4, D6, D7, B4, B5 } - -/* 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/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/info.json index 9e5ec18b67..3a725c01e8 100644 --- a/keyboards/ilumkb/volcano660/info.json +++ b/keyboards/ilumkb/volcano660/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B1", "B2", "B3", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h index 4ef09efc37..a194f0e444 100644 --- a/keyboards/inett_studio/sqx/hotswap/config.h +++ b/keyboards/inett_studio/sqx/hotswap/config.h @@ -18,11 +18,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4, B7, D6} -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 } -#define DIODE_DIRECTION ROW2COL - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json index 1d9014bdbd..54c18859f2 100644 --- a/keyboards/inett_studio/sqx/hotswap/info.json +++ b/keyboards/inett_studio/sqx/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], + "rows": ["F0", "F1", "F4", "B7", "D6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_tsangan_hhkb"], diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h index be6d4a8e65..21929f17f3 100644 --- a/keyboards/inett_studio/sqx/universal/config.h +++ b/keyboards/inett_studio/sqx/universal/config.h @@ -18,11 +18,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4, B7, D6} -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 } -#define DIODE_DIRECTION ROW2COL - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json index 7da0598d91..fa6fa373f9 100644 --- a/keyboards/inett_studio/sqx/universal/info.json +++ b/keyboards/inett_studio/sqx/universal/info.json @@ -8,6 +8,11 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], + "rows": ["F0", "F1", "F4", "B7", "D6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index fdadcd5642..6ebc0f4083 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -39,13 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) -// For some reason, the rows are colums in the schematic, and vice versa -#define MATRIX_ROW_PINS { B2, B3, B18, B19, C0, C9, C10, C11, D0 } -#define MATRIX_COL_PINS { D1, D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Serial config (for communication between halves) */ #define SERIAL_USART_DRIVER SD1 // Only true for the master half #define SERIAL_USART_CONFIG { (SERIAL_USART_SPEED), } // Only field is speed diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index 635355d490..c751cfe3f2 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -6,6 +6,11 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D4", "D5", "D6", "D7"], + "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"] + }, + "diode_direction": "ROW2COL", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h deleted file mode 100644 index c4ec6a4a7d..0000000000 --- a/keyboards/input_club/infinity60/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * 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/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h deleted file mode 100644 index 301003e8b9..0000000000 --- a/keyboards/input_club/infinity60/led/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 } diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/info.json new file mode 100644 index 0000000000..7a9b924a71 --- /dev/null +++ b/keyboards/input_club/infinity60/led/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0"], + "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/input_club/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h deleted file mode 100644 index 1207dffc78..0000000000 --- a/keyboards/input_club/infinity60/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 } - - diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/info.json new file mode 100644 index 0000000000..a5afb37751 --- /dev/null +++ b/keyboards/input_club/infinity60/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B16", "B17", "C4", "C5", "D0"], + "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h index aa7dca86d3..2a4c7d057c 100644 --- a/keyboards/input_club/k_type/config.h +++ b/keyboards/input_club/k_type/config.h @@ -18,22 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 } -#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* * Feature disable options * These options are also useful to firmware size reduction. */ diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json index 60522333d7..c05785ac69 100644 --- a/keyboards/input_club/k_type/info.json +++ b/keyboards/input_club/k_type/info.json @@ -8,6 +8,11 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"], + "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h index 7567d0ef50..067b7f4e59 100644 --- a/keyboards/input_club/whitefox/config.h +++ b/keyboards/input_club/whitefox/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D0, D1, D4, D5, D6, D7, C1, C2 } -#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, C10, C11 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LED_BRIGHTNESS_LO 100 #define LED_BRIGHTNESS_HI 255 diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json index 0cd34f8312..80853b4847 100644 --- a/keyboards/input_club/whitefox/info.json +++ b/keyboards/input_club/whitefox/info.json @@ -7,6 +7,11 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"], + "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", diff --git a/keyboards/io_mini1800/config.h b/keyboards/io_mini1800/config.h deleted file mode 100644 index 95251ca8f8..0000000000 --- a/keyboards/io_mini1800/config.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2022 s8erdude (@jpuerto96) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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 MATRIX_ROW_PINS { D6, D7, B4, B5, D4, E6, B3, D2, D5, D3 } -#define MATRIX_COL_PINS { D1, D0, B7, B2, F0, F1, F7, F6, F4, F5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json index 05b346d793..270da1ea50 100644 --- a/keyboards/io_mini1800/info.json +++ b/keyboards/io_mini1800/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "B7", "B2", "F0", "F1", "F7", "F6", "F4", "F5"], + "rows": ["D6", "D7", "B4", "B5", "D4", "E6", "B3", "D2", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h index eefaa897a1..9386d03e74 100644 --- a/keyboards/irene/config.h +++ b/keyboards/irene/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, F0, C7, B4, B7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B6, B5, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN # define RGBLED_NUM 23 diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index a9e943db5c..9e3a4a220d 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -8,6 +8,11 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B0", "F0", "C7", "B4", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h index 5616f96083..d813c012ef 100644 --- a/keyboards/iriskeyboards/config.h +++ b/keyboards/iriskeyboards/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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) - * - */ - -// 0 1 2 3 4 5 6 7 8 9 A B C D -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* 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/iriskeyboards/info.json b/keyboards/iriskeyboards/info.json index 860d9f21b7..19516e8d6e 100644 --- a/keyboards/iriskeyboards/info.json +++ b/keyboards/iriskeyboards/info.json @@ -8,6 +8,11 @@ "pid": "0x3031", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h index b47b2ccf50..f2d3a3c36f 100644 --- a/keyboards/iron180/config.h +++ b/keyboards/iron180/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 } -#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/iron180/info.json b/keyboards/iron180/info.json index 3c7798508f..e408e5321c 100644 --- a/keyboards/iron180/info.json +++ b/keyboards/iron180/info.json @@ -8,6 +8,11 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"], + "rows": ["B9", "B8", "A15", "B0", "A7", "A5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h deleted file mode 100644 index 47eac652c5..0000000000 --- a/keyboards/j80/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 JER - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, A0 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json index c57e9e3e2a..9231437bd1 100644 --- a/keyboards/j80/info.json +++ b/keyboards/j80/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "A0"], + "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h index 0caf635045..cde00d1c4d 100644 --- a/keyboards/jacky_studio/bear_65/config.h +++ b/keyboards/jacky_studio/bear_65/config.h @@ -3,23 +3,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 MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json index ed5768bf32..c5ae580453 100644 --- a/keyboards/jacky_studio/bear_65/rev1/info.json +++ b/keyboards/jacky_studio/bear_65/rev1/info.json @@ -10,6 +10,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json index 147dc2ade4..26e7ee3f33 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -10,6 +10,11 @@ "pid": "0x0428", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h index d7a8bf543b..7b1324e3f3 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h @@ -16,20 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 } - -/* 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 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json index f2e51f63ac..685504afb1 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h index 1a6e9cea9e..1359eafc9a 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h @@ -16,23 +16,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) - * - * - * 0 1 2 3 4 5 6 7 8 9 A B C D E F */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0, E6 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json index 639b5a3897..dac233ecc1 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 15 diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/jadookb/jkb2/config.h deleted file mode 100644 index 0c4b365932..0000000000 --- a/keyboards/jadookb/jkb2/config.h +++ /dev/null @@ -1,21 +0,0 @@ - /* Copyright 2021 Wizard-GG - * - * 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 <http://www.gnu.org/licenses/>. - */ -#pragma once - -#define MATRIX_ROW_PINS { B1 } -#define MATRIX_COL_PINS { B3 ,B2} - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json index 0a72e6b7bc..b0b1c9792c 100644 --- a/keyboards/jadookb/jkb2/info.json +++ b/keyboards/jadookb/jkb2/info.json @@ -8,6 +8,11 @@ "pid": "0x3225", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B2"], + "rows": ["B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h index 00bc0c3488..2ef7a6cf7b 100644 --- a/keyboards/jadookb/jkb65/config.h +++ b/keyboards/jadookb/jkb65/config.h @@ -16,9 +16,6 @@ #pragma once - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 #define RGB_MATRIX_LED_COUNT 67 diff --git a/keyboards/jadookb/jkb65/r1/config.h b/keyboards/jadookb/jkb65/r1/config.h deleted file mode 100644 index 78f13414c9..0000000000 --- a/keyboards/jadookb/jkb65/r1/config.h +++ /dev/null @@ -1,20 +0,0 @@ - /* Copyright 2022 Wizad-GG - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/info.json index 4bfe3aa763..9cf153f928 100644 --- a/keyboards/jadookb/jkb65/r1/info.json +++ b/keyboards/jadookb/jkb65/r1/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "JKB65 RGB R1", + "matrix_pins": { + "cols": ["F6", "B1", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "B3", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "usb": { "device_version": "0.0.1" } diff --git a/keyboards/jadookb/jkb65/r2/config.h b/keyboards/jadookb/jkb65/r2/config.h deleted file mode 100644 index 5db93f75cb..0000000000 --- a/keyboards/jadookb/jkb65/r2/config.h +++ /dev/null @@ -1,20 +0,0 @@ - /* Copyright 2022 Wizad-GG - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/info.json index 8a23a21d5f..909efbd665 100644 --- a/keyboards/jadookb/jkb65/r2/info.json +++ b/keyboards/jadookb/jkb65/r2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "JKB65 RGB R2", "usb": { "device_version": "0.0.2" - } + }, + "matrix_pins": { + "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["E6", "B7", "F7", "F4", "F5"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h index 8afbaabca0..6b5c1ab3f9 100644 --- a/keyboards/jae/j01/config.h +++ b/keyboards/jae/j01/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS {B2, B1, B3, B0, D0} -#define MATRIX_COL_PINS {D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, 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/jae/j01/info.json b/keyboards/jae/j01/info.json index 6f0b5d485d..74bcf21b47 100644 --- a/keyboards/jae/j01/info.json +++ b/keyboards/jae/j01/info.json @@ -8,6 +8,11 @@ "pid": "0x0143", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B2", "B1", "B3", "B0", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 4, diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h index 163236c90c..96c32b09f2 100644 --- a/keyboards/jagdpietr/drakon/config.h +++ b/keyboards/jagdpietr/drakon/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { C7, B5, B6, B0, B1, F1 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B2, B3, B7, D3, D5, D4, D6, D7, B4 } - -/* 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/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/info.json index 3aab789199..9c28b21336 100644 --- a/keyboards/jagdpietr/drakon/info.json +++ b/keyboards/jagdpietr/drakon/info.json @@ -8,6 +8,11 @@ "pid": "0x7776", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C6", "B2", "B3", "B7", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["C7", "B5", "B6", "B0", "B1", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "F0"} diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h index 62501a05d1..6abe1d446d 100644 --- a/keyboards/jc65/v32a/config.h +++ b/keyboards/jc65/v32a/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json index b9693c8e72..27ee90931d 100644 --- a/keyboards/jc65/v32a/info.json +++ b/keyboards/jc65/v32a/info.json @@ -8,6 +8,11 @@ "pid": "0x5679", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h index eca08d7d92..68e8005dec 100644 --- a/keyboards/jc65/v32u4/config.h +++ b/keyboards/jc65/v32u4/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* QMK JC65 PCB default pin-out */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 } - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING @@ -39,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #endif - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json index e20dccdbfa..e9d3e2b897 100644 --- a/keyboards/jc65/v32u4/info.json +++ b/keyboards/jc65/v32u4/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F5"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h index 11a868ab3e..36c2f16578 100644 --- a/keyboards/jd40/config.h +++ b/keyboards/jd40/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { F0, F1, F5, B4 } -#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json index 9bb96326d3..924122544e 100644 --- a/keyboards/jd40/info.json +++ b/keyboards/jd40/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"], + "rows": ["F0", "F1", "F5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h index 25153db750..9b7700e013 100644 --- a/keyboards/jd45/config.h +++ b/keyboards/jd45/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { F0, F1, F5, B4 } -#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json index 725431c672..c401d179eb 100644 --- a/keyboards/jd45/info.json +++ b/keyboards/jd45/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2", "B0"], + "rows": ["F0", "F1", "F5", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h index b03ceffba8..d78952f261 100644 --- a/keyboards/jels/jels60/config.h +++ b/keyboards/jels/jels60/config.h @@ -16,14 +16,6 @@ #pragma once - -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS {B3, D2, F0, F4, F1} -#define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json index ecca670d1d..418410c3ff 100644 --- a/keyboards/jels/jels60/info.json +++ b/keyboards/jels/jels60/info.json @@ -8,6 +8,11 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"], + "rows": ["B3", "D2", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B7" }, diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h index b655834c02..3eec23b214 100644 --- a/keyboards/jels/jels88/config.h +++ b/keyboards/jels/jels88/config.h @@ -16,13 +16,6 @@ #pragma once - -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS \ - { B3, B2, D1, D0, E6, B0, F0, F1, B5, B4, D7, D6 } -#define MATRIX_COL_PINS \ - { C7, C6, F7, F6, F5, F4, B1, D2, D3 } - /* ws2812b RGB LEDs */ #define RGB_DI_PIN B6 @@ -43,9 +36,6 @@ #define RGBLIGHT_LIMIT_VAL 225 // keep PCB under 500mA #endif -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json index 6324bfb133..6542e29a08 100644 --- a/keyboards/jels/jels88/info.json +++ b/keyboards/jels/jels88/info.json @@ -8,6 +8,11 @@ "pid": "0x0088", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "B1", "D2", "D3"], + "rows": ["B3", "B2", "D1", "D0", "E6", "B0", "F0", "F1", "B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 0] }, diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h deleted file mode 100644 index d968a5bf93..0000000000 --- a/keyboards/jian/handwired/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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 <http://www.gnu.org/licenses/>. -*/ -#pragma once - - -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { D3, D2, B5, B6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json index 712c3d9b01..bd76da9e96 100644 --- a/keyboards/jian/handwired/info.json +++ b/keyboards/jian/handwired/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D3", "D2", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 3e2fa93f31..5eda1a6724 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -#define DIODE_DIRECTION COL2ROW - - -// wiring of each half -#define MATRIX_ROW_PINS { F4, F5, B1, B3, D1, D0, D7, E6 } -#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 } - #define PHYSICAL_LEDS_ENABLE /* ws2812 RGB LED */ diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json index 74121b2fda..e51b65c501 100644 --- a/keyboards/jian/nsrev2/info.json +++ b/keyboards/jian/nsrev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], + "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 5, diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index 083b235a2e..a00830b7f7 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { D3, D2, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - #define USE_I2C /* Select hand configuration */ diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json index fc65cb13b8..9ca0a41785 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D3", "D2", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index 37e8f0458d..92b15fab65 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { F4, F5, B1, B3 } -#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 } - //#define EE_HANDS #define SPLIT_HAND_PIN E6 diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json index 642bf83efc..6cae5556e2 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], + "rows": ["F4", "F5", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 5 diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h index 39ed4bb0c7..16a45b256b 100644 --- a/keyboards/jiran/config.h +++ b/keyboards/jiran/config.h @@ -17,13 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { B4, B5, F4, F5, F6 } -#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define MASTER_LEFT diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json index 9f04243278..6c4e4c397f 100644 --- a/keyboards/jiran/info.json +++ b/keyboards/jiran/info.json @@ -8,6 +8,11 @@ "pid": "0x3735", "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D4", "C6", "D7", "E6"], + "rows": ["B4", "B5", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h index 4967594b55..3b83277d42 100644 --- a/keyboards/jkdlab/binary_monkey/config.h +++ b/keyboards/jkdlab/binary_monkey/config.h @@ -18,10 +18,4 @@ #pragma once - -#define MATRIX_ROW_PINS { D0 } -#define MATRIX_COL_PINS { D1, D2, D3 } - -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json index c5422097ab..b7fcc584f3 100644 --- a/keyboards/jkdlab/binary_monkey/info.json +++ b/keyboards/jkdlab/binary_monkey/info.json @@ -8,6 +8,11 @@ "pid": "0x0101", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3"], + "rows": ["D0"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 2] }, diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h index f8280340e8..a0012f33b5 100644 --- a/keyboards/jkeys_design/gentleman65/config.h +++ b/keyboards/jkeys_design/gentleman65/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, D1, F7, F1 } -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, D5, C7, F0, B2, B1, B3, B0, B7, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json index fff5b9b752..85f73603ae 100644 --- a/keyboards/jkeys_design/gentleman65/info.json +++ b/keyboards/jkeys_design/gentleman65/info.json @@ -8,6 +8,11 @@ "pid": "0x2020", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"], + "rows": ["D3", "D2", "D1", "F7", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F5"} diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h index c80b64ef10..532bf95acb 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/config.h +++ b/keyboards/jkeys_design/gentleman65_se_s/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, B7, B2, B3, D4, D6, D7, C7, C6, B6, B5, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json index 2415eb5c18..3a389231a4 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/info.json +++ b/keyboards/jkeys_design/gentleman65_se_s/info.json @@ -8,6 +8,11 @@ "pid": "0x2322", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h index ca28364f72..4b007cf387 100644 --- a/keyboards/jm60/config.h +++ b/keyboards/jm60/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B11, B10, B2, B1, B0 } -#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, B3, B4, B5, B6, B7, B8, B9, A2, A3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* 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/jm60/info.json b/keyboards/jm60/info.json index 1dbb4c31d9..a39bf9b4b4 100644 --- a/keyboards/jm60/info.json +++ b/keyboards/jm60/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A15", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A2", "A3"], + "rows": ["B11", "B10", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h index abca51f3fa..b53df6cf7f 100644 --- a/keyboards/jolofsor/denial75/config.h +++ b/keyboards/jolofsor/denial75/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { F7, C7, C6, B5, B4, D7, D6, D4, E6, B1, B2, B3, B7, D0, D1, D3 } - -/* 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 diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json index 5bf9c1eda2..7b8a2ad030 100644 --- a/keyboards/jolofsor/denial75/info.json +++ b/keyboards/jolofsor/denial75/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B2", "B3", "B7", "D0", "D1", "D3"], + "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h index 1936d5d256..acf9a541b3 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// Same pins for Round-Robin matrix. -#define MATRIX_ROW_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 } -#define MATRIX_COL_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 } - -#define DIODE_DIRECTION COL2ROW - /* Audio */ #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index 37f0b70087..fc690aa6cd 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x175A", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], + "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"}, diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h index 7e0ef17113..77316af07c 100644 --- a/keyboards/jorne/rev1/config.h +++ b/keyboards/jorne/rev1/config.h @@ -2,12 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_SPLIT { 28, 28 } #define RGBLED_NUM 56 diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index 85df8cc709..dbfa50c358 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/q4z/config.h b/keyboards/q4z/config.h index eea6fcc076..67553a4432 100644 --- a/keyboards/q4z/config.h +++ b/keyboards/q4z/config.h @@ -15,23 +15,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 MATRIX_ROW_PINS { F4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { D1, D0, D4, B6, B2, B3, B1, F7, F6, F5 } - -/* 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/q4z/info.json b/keyboards/q4z/info.json index aed372df94..3e000db2d2 100644 --- a/keyboards/q4z/info.json +++ b/keyboards/q4z/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["F4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h deleted file mode 100644 index eac213400a..0000000000 --- a/keyboards/qpockets/eggman/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Alan Lehners - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -#define MATRIX_ROW_PINS { C4, C5, C2, D0, B5, B6, D6 } -#define MATRIX_COL_PINS { B7, B4, B3, B2, D3, D2, D1 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json index 989402411d..58d2975169 100644 --- a/keyboards/qpockets/eggman/info.json +++ b/keyboards/qpockets/eggman/info.json @@ -8,6 +8,11 @@ "pid": "0x656D", "device_version": "10.0.0" }, + "matrix_pins": { + "cols": ["B7", "B4", "B3", "B2", "D3", "D2", "D1"], + "rows": ["C4", "C5", "C2", "D0", "B5", "B6", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "C7"}, diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h index 22c2bc73de..3caf7fdbcb 100644 --- a/keyboards/qpockets/space_space/rev1/config.h +++ b/keyboards/qpockets/space_space/rev1/config.h @@ -16,14 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { F1, F4, F5, C7 } -#define MATRIX_COL_PINS \ - { D4, B4, B5, B6, C6, F7, F6, F0, B0, E6, B1 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json index cd9dcb56a8..5b4806e832 100644 --- a/keyboards/qpockets/space_space/rev1/info.json +++ b/keyboards/qpockets/space_space/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x7373", "device_version": "30.0.0" }, + "matrix_pins": { + "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"], + "rows": ["F1", "F4", "F5", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2", "resolution": 3}, diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h index 26b85360c4..53e42221c9 100644 --- a/keyboards/qpockets/space_space/rev2/config.h +++ b/keyboards/qpockets/space_space/rev2/config.h @@ -16,16 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS \ - { B1, B0, D5, B6 } -#define MATRIX_COL_PINS \ - { C6, F6, F1, F4, F5, E6, D6, B2, B5, D3, D2 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define RGB_DI_PIN F0 diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index 580ab0a4d5..aa99956be9 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x7373", "device_version": "30.0.2" }, + "matrix_pins": { + "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"], + "rows": ["B1", "B0", "D5", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "D7", "resolution": 3}, diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h deleted file mode 100644 index a811be9a74..0000000000 --- a/keyboards/qpockets/wanten/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2021 qpockets - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 MATRIX_ROW_PINS { F0, F7, B3, D5 } -#define MATRIX_COL_PINS { F4, F1, B5, B6, C6, C7, D4, E6, D2, B1, B2, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * 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/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json index e35237a358..f9c2841a58 100644 --- a/keyboards/qpockets/wanten/info.json +++ b/keyboards/qpockets/wanten/info.json @@ -8,6 +8,11 @@ "pid": "0x7774", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F1", "B5", "B6", "C6", "C7", "D4", "E6", "D2", "B1", "B2", "D3"], + "rows": ["F0", "F7", "B3", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"}, diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h index b3a4bf279e..25ceace965 100644 --- a/keyboards/quad_h/lb75/config.h +++ b/keyboards/quad_h/lb75/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D3, D5, F0, E6 } -#define MATRIX_COL_PINS { D2, D1, D0, F1, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json index 386ba46067..6f6f5a598a 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D3", "D5", "F0", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h index bd74b09133..44c3746d29 100644 --- a/keyboards/quantrik/kyuu/config.h +++ b/keyboards/quantrik/kyuu/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B6, B5, B4, D7, D6 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, F0, B7, D0, D5, D3, D2, D1, B3 } - -/* 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/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json index da19670161..ea8b3da4fa 100644 --- a/keyboards/quantrik/kyuu/info.json +++ b/keyboards/quantrik/kyuu/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "F0", "B7", "D0", "D5", "D3", "D2", "D1", "B3"], + "rows": ["B6", "B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h index 1ca7a35849..feb0b65458 100644 --- a/keyboards/quarkeys/z40/config.h +++ b/keyboards/quarkeys/z40/config.h @@ -14,10 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { E6, B3, C7, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B5, B4, D7, D6, D0, B1, B0 } #define RGB_DI_PIN F1 #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 47 diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json index 57159669a4..fd152e4070 100644 --- a/keyboards/quarkeys/z40/info.json +++ b/keyboards/quarkeys/z40/info.json @@ -8,6 +8,11 @@ "pid": "0x2801", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"], + "rows": ["E6", "B3", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h index b23030ad5c..d6945273ef 100644 --- a/keyboards/quarkeys/z60/hotswap/config.h +++ b/keyboards/quarkeys/z60/hotswap/config.h @@ -14,11 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 } - #define RGB_DI_PIN D6 #define RGBLED_NUM 80 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json index c142c01b7e..82a280e524 100644 --- a/keyboards/quarkeys/z60/hotswap/info.json +++ b/keyboards/quarkeys/z60/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x3C02", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h index a66ebdd550..4f45b2ba12 100644 --- a/keyboards/quarkeys/z60/solder/config.h +++ b/keyboards/quarkeys/z60/solder/config.h @@ -14,12 +14,6 @@ #pragma once - -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 } - #define RGB_DI_PIN D6 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json index e5ec227c7e..bf1cc9230f 100644 --- a/keyboards/quarkeys/z60/solder/info.json +++ b/keyboards/quarkeys/z60/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x3C01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h index 3e3ce2b0a2..74d8d069c7 100644 --- a/keyboards/quarkeys/z67/hotswap/config.h +++ b/keyboards/quarkeys/z67/hotswap/config.h @@ -14,11 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 } - #define RGB_DI_PIN F0 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json index c31a37325d..0431f3bca6 100644 --- a/keyboards/quarkeys/z67/hotswap/info.json +++ b/keyboards/quarkeys/z67/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x4102", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h index 18ed997500..778fa5e07f 100644 --- a/keyboards/quarkeys/z67/solder/config.h +++ b/keyboards/quarkeys/z67/solder/config.h @@ -14,11 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B5, B4 } - #define RGB_DI_PIN F0 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json index af8c81f9d2..d6dbb553ea 100644 --- a/keyboards/quarkeys/z67/solder/info.json +++ b/keyboards/quarkeys/z67/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x4101", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h index 830b5364a5..7ba4700cde 100644 --- a/keyboards/qvex/lynepad/config.h +++ b/keyboards/qvex/lynepad/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Basic matrix config */ -#define MATRIX_ROW_PINS { C7, F7, F6} -#define MATRIX_COL_PINS { F0, F1, F4, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* LEDs */ #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json index f2930137d2..93d2a04323 100644 --- a/keyboards/qvex/lynepad/info.json +++ b/keyboards/qvex/lynepad/info.json @@ -8,6 +8,11 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5"], + "rows": ["C7", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"}, diff --git a/keyboards/qwertlekeys/calice/config.h b/keyboards/qwertlekeys/calice/config.h index 4de51720ea..a15f35c444 100644 --- a/keyboards/qwertlekeys/calice/config.h +++ b/keyboards/qwertlekeys/calice/config.h @@ -16,13 +16,6 @@ #pragma once -/*Define Matrix Pins */ -#define MATRIX_ROW_PINS {F0, F1, F5, F4, C6, C7, B5, B6, D4, D2, D5, D3} -#define MATRIX_COL_PINS {D7, B4, F7, F6, D1, B7, B3, B2} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json index 5a425f97a8..82a33a9559 100644 --- a/keyboards/qwertlekeys/calice/info.json +++ b/keyboards/qwertlekeys/calice/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "B4", "F7", "F6", "D1", "B7", "B3", "B2"], + "rows": ["F0", "F1", "F5", "F4", "C6", "C7", "B5", "B6", "D4", "D2", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h index 346e51a157..916485e60b 100644 --- a/keyboards/qwertykeys/qk65/hotswap/config.h +++ b/keyboards/qwertykeys/qk65/hotswap/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* NKRO */ #define FORCE_NKRO diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json index 9f7664ea51..5cfaaf5767 100644 --- a/keyboards/qwertykeys/qk65/hotswap/info.json +++ b/keyboards/qwertykeys/qk65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x514B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h index 40eddea86f..6561379dbe 100644 --- a/keyboards/qwertykeys/qk65/solder/config.h +++ b/keyboards/qwertykeys/qk65/solder/config.h @@ -17,12 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* NKRO */ #define FORCE_NKRO
\ No newline at end of file diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json index 0e85073f59..399126e10b 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x5153", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h index 5ea65094f9..44ad35a7ca 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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) - * -*/ -// wiring of each half -#define MATRIX_ROW_PINS { B6, B2, B3, B1 } -#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D6 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json index df34cd9fa7..ee61129722 100644 --- a/keyboards/qwertyydox/info.json +++ b/keyboards/qwertyydox/info.json @@ -9,6 +9,11 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"], + "rows": ["B6", "B2", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h index 75551832f1..3922bd8251 100644 --- a/keyboards/ubest/vn/config.h +++ b/keyboards/ubest/vn/config.h @@ -16,22 +16,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 MATRIX_ROW_PINS { E6, B0, B7, D0, D1 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B5, B4, D7, D6, D4, D5, D3 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json index 348a51fc7a..aef7138b64 100644 --- a/keyboards/ubest/vn/info.json +++ b/keyboards/ubest/vn/info.json @@ -8,6 +8,11 @@ "pid": "0x0868", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["E6", "B0", "B7", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h index 3a9e21ea60..da31c3d933 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F3, F2, F1, F0, A0 } -#define MATRIX_COL_PINS { A2, A1, F5, F4, E6, E7, E5, E4, B7, D0, D1, D2, D3, D4, D5, D6, D7, B5, E0 } - -/* 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 diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json index fbbc15609c..a33a558b25 100644 --- a/keyboards/uk78/info.json +++ b/keyboards/uk78/info.json @@ -8,6 +8,11 @@ "pid": "0x004E", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A2", "A1", "F5", "F4", "E6", "E7", "E5", "E4", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "E0"], + "rows": ["F3", "F2", "F1", "F0", "A0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h index dc63dc77bd..d72a8fd06d 100644 --- a/keyboards/ungodly/launch_pad/config.h +++ b/keyboards/ungodly/launch_pad/config.h @@ -15,16 +15,6 @@ */ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { D4, D6, D7, B4, B5 } -#define MATRIX_COL_PINS \ - { B0, B1, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Midi Slider */ #define SLIDER_PIN F6 #define MIDI_ADVANCED diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json index a6e12f3374..e3634bcad0 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/info.json @@ -8,6 +8,11 @@ "pid": "0x4C50", "device_version": "99.9.9" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3"], + "rows": ["D4", "D6", "D7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "B6", "resolution": 2} diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index dee9f85acc..4535371186 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * 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) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index aa28ce85c8..44262e071c 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * 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) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json index f1d47ef1b0..6b8a6cf9c7 100644 --- a/keyboards/unicomp/pc122/info.json +++ b/keyboards/unicomp/pc122/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/config.h b/keyboards/unicomp/pc122/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/config.h +++ b/keyboards/unicomp/pc122/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * 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) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index c484553e89..7afe842b8a 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * 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) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index 249b33fdd2..52d2849e8a 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"], + "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h index 88eb8c2c51..c02ea1f913 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h @@ -18,30 +18,6 @@ #define SERIAL_NUMBER "purdea.ro:overnumpad_controller" -/* - * 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) - * - */ - -// All pins in order from left-to-right, as seen on the keyboard: -// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, -// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible. - -// On this keyboard the right-most pin is not used, so that is A10. -// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom. - -#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 } -#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h index c9a5d49447..b5ed9415d5 100644 --- a/keyboards/unikeyboard/diverge3/config.h +++ b/keyboards/unikeyboard/diverge3/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifndef SELECT_SOFT_SERIAL_SPEED #define SELECT_SOFT_SERIAL_SPEED 3 #endif diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json index c2caaca881..4aac244492 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/info.json @@ -8,6 +8,11 @@ "pid": "0x1257", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "C6", "levels": 5, diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h index 7f8054f183..78d133446e 100644 --- a/keyboards/unikeyboard/divergetm2/config.h +++ b/keyboards/unikeyboard/divergetm2/config.h @@ -17,23 +17,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 MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json index e8a3ac1bb3..d97d10d118 100644 --- a/keyboards/unikeyboard/divergetm2/info.json +++ b/keyboards/unikeyboard/divergetm2/info.json @@ -8,6 +8,11 @@ "pid": "0x1256", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h index a3a667d632..7bc78f68d6 100644 --- a/keyboards/unikeyboard/felix/config.h +++ b/keyboards/unikeyboard/felix/config.h @@ -1,22 +1,5 @@ #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 MATRIX_ROW_PINS { B2, B3, B1, F7, F6 } -#define MATRIX_COL_PINS { B5, B4, E6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* 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/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json index ee74cb134f..d3200e6ed1 100644 --- a/keyboards/unikeyboard/felix/info.json +++ b/keyboards/unikeyboard/felix/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7"], + "rows": ["B2", "B3", "B1", "F7", "F6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "C6", "levels": 5 diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h index fc91f5138f..4c3789155e 100644 --- a/keyboards/unikorn/config.h +++ b/keyboards/unikorn/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 17 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json index b894a98dac..e916cc7674 100644 --- a/keyboards/unikorn/info.json +++ b/keyboards/unikorn/info.json @@ -8,6 +8,11 @@ "pid": "0x556B", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h index 6e3ba625e2..ea285f4082 100644 --- a/keyboards/unison/v04/config.h +++ b/keyboards/unison/v04/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -/* NOTE: With Round-Robin matrix, set same pins for both. */ -#define MATRIX_ROW_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 } -#define MATRIX_COL_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 } - -#define DIODE_DIRECTION COL2ROW - /* Audio */ #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json index a772d344d2..f795fa1c90 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/info.json @@ -8,6 +8,11 @@ "pid": "0x176A", "device_version": "0.4.0" }, + "matrix_pins": { + "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"], + "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"}, diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h index fb911ab60c..39bb20f2a8 100644 --- a/keyboards/uranuma/config.h +++ b/keyboards/uranuma/config.h @@ -1,22 +1,5 @@ #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 MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D2, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // fix iPhone and iPad power adapter issue // iOS device need lessthan 100 #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json index d8bc5b107d..5d3d081f73 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/info.json @@ -8,6 +8,11 @@ "pid": "0x112D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h index 9677a8e262..ad29207062 100644 --- a/keyboards/utd80/config.h +++ b/keyboards/utd80/config.h @@ -15,15 +15,6 @@ */ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B4, D5, D0, B2, B3, B0 } -#define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, C7, C6, D3, E6, D7, D6, D4, D2, D1 } - -/* 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 diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json index cf0b6530ad..ba8451a331 100644 --- a/keyboards/utd80/info.json +++ b/keyboards/utd80/info.json @@ -8,6 +8,11 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D3", "E6", "D7", "D6", "D4", "D2", "D1"], + "rows": ["B4", "D5", "D0", "B2", "B3", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h index 241418bdb7..85be8c0232 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } - -// wiring of each half -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json index 1e5cda2b20..1bcb6ad5f8 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/v4n4g0rth0n/config.h b/keyboards/v4n4g0rth0n/config.h deleted file mode 100644 index 39af6344ef..0000000000 --- a/keyboards/v4n4g0rth0n/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 jpuerto - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/v4n4g0rth0n/v1/config.h b/keyboards/v4n4g0rth0n/v1/config.h deleted file mode 100644 index effd2268db..0000000000 --- a/keyboards/v4n4g0rth0n/v1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 jpuerto - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7} -#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, F0} diff --git a/keyboards/v4n4g0rth0n/v1/info.json b/keyboards/v4n4g0rth0n/v1/info.json index dab37baf04..769c35d8ca 100644 --- a/keyboards/v4n4g0rth0n/v1/info.json +++ b/keyboards/v4n4g0rth0n/v1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "F0"], + "rows": ["C7", "C6", "B6", "B5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/v4n4g0rth0n/v2/config.h b/keyboards/v4n4g0rth0n/v2/config.h deleted file mode 100644 index 2299b791ef..0000000000 --- a/keyboards/v4n4g0rth0n/v2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 jpuerto - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7} -#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, B0} diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json index 65be217368..6959188be9 100644 --- a/keyboards/v4n4g0rth0n/v2/info.json +++ b/keyboards/v4n4g0rth0n/v2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"], + "rows": ["C7", "C6", "B6", "B5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h index 3c76b77bce..8eafa8d7b5 100644 --- a/keyboards/v60_type_r/config.h +++ b/keyboards/v60_type_r/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json index e37ccc9543..f453fa1f5b 100644 --- a/keyboards/v60_type_r/info.json +++ b/keyboards/v60_type_r/info.json @@ -8,6 +8,11 @@ "pid": "0x0658", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "F7", "on_state": 0 diff --git a/keyboards/vagrant_10/config.h b/keyboards/vagrant_10/config.h index e96d154b66..195f3f617c 100755 --- a/keyboards/vagrant_10/config.h +++ b/keyboards/vagrant_10/config.h @@ -25,13 +25,6 @@ SOFTWARE. #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3, B2 } -#define MATRIX_COL_PINS { F4, F6, F5 } - -/* 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 diff --git a/keyboards/vagrant_10/info.json b/keyboards/vagrant_10/info.json index 6c26013f60..56797aac22 100644 --- a/keyboards/vagrant_10/info.json +++ b/keyboards/vagrant_10/info.json @@ -8,6 +8,11 @@ "pid": "0x5E99", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F5"], + "rows": ["F7", "B1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h index fc71e667b8..768474ba26 100644 --- a/keyboards/vertex/angler2/config.h +++ b/keyboards/vertex/angler2/config.h @@ -16,22 +16,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 MATRIX_ROW_PINS { F4, B2, F0, D5, D1, D2 } -#define MATRIX_COL_PINS { F5, F6, F7, E2, C7, C6, B6, F1, B5, B4, D7, D6, D4, D3, D0, B1 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json index 3716ddbede..ebb2609fcc 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/info.json @@ -8,6 +8,11 @@ "pid": "0x408F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "E2", "C7", "C6", "B6", "F1", "B5", "B4", "D7", "D6", "D4", "D3", "D0", "B1"], + "rows": ["F4", "B2", "F0", "D5", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "scroll_lock": "B7", diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h index 633843021f..5cbee6426f 100644 --- a/keyboards/vertex/arc60/config.h +++ b/keyboards/vertex/arc60/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 } -#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 } -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json index bfb8e4fc3a..60758ac3b8 100644 --- a/keyboards/vertex/arc60/info.json +++ b/keyboards/vertex/arc60/info.json @@ -8,6 +8,11 @@ "pid": "0x8370", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"], + "rows": ["B10", "B1", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "on_state": 0 diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h index 1795f9b2ee..650d910089 100644 --- a/keyboards/vertex/arc60h/config.h +++ b/keyboards/vertex/arc60h/config.h @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 } -#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 } -#define DIODE_DIRECTION COL2ROW - #define LED_CAPS_LOCK_PIN C13 #define LED_PIN_ON_STATE 0 diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json index 79146b098c..1032b9880c 100644 --- a/keyboards/vertex/arc60h/info.json +++ b/keyboards/vertex/arc60h/info.json @@ -8,6 +8,11 @@ "pid": "0x9770", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"], + "rows": ["B10", "B1", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h index 3036f0ac8f..97bd940cdc 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16, C17 -#define MATRIX_COL_PINS { C6 , C7 , C8 , C9 , A8 , B3 , B4 , A10, B5 , B8 , B9 , C13, C14, C15, A0 , A1 , A2 , A3 } - // R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { C3 , C2 , C1 , C0 , B14, A7 } -#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/viendi8l/info.json b/keyboards/viendi8l/info.json index 312f97e7f1..667798b4aa 100644 --- a/keyboards/viendi8l/info.json +++ b/keyboards/viendi8l/info.json @@ -8,6 +8,11 @@ "pid": "0x0877", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "C8", "C9", "A8", "B3", "B4", "A10", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"], + "rows": ["C3", "C2", "C1", "C0", "B14", "A7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B10", "pin_b": "B12", "resolution": 2} diff --git a/keyboards/viktus/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h index 9a469e7188..ada0ff6e76 100644 --- a/keyboards/viktus/at101_bh/config.h +++ b/keyboards/viktus/at101_bh/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, D4, F6, F5, F7, B6, B5, D5, C7, C6 } -#define MATRIX_COL_PINS { D1, D0, B7, B3, B2, B1, B0, E6, D2, D3 } - -/* 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 diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json index aebfd08f0f..88b0c78b2d 100644 --- a/keyboards/viktus/at101_bh/info.json +++ b/keyboards/viktus/at101_bh/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"], + "rows": ["F0", "F1", "F4", "D4", "F6", "F5", "F7", "B6", "B5", "D5", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h index 9a399518a1..d035c79a90 100644 --- a/keyboards/viktus/omnikey_bh/config.h +++ b/keyboards/viktus/omnikey_bh/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 } -#define MATRIX_COL_PINS { C2, C3, C4, C7, C1, C0, E1, E0, D7, F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1, B2, B3 } - -/* 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 diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json index e4730b2031..0e29960d94 100644 --- a/keyboards/viktus/omnikey_bh/info.json +++ b/keyboards/viktus/omnikey_bh/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"], + "rows": ["B7", "D0", "D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h index a4789be9b7..bb14ae71b1 100644 --- a/keyboards/viktus/smolka/config.h +++ b/keyboards/viktus/smolka/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7, C7, C6 } -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, D4, B1, B2 } - -/* 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/viktus/smolka/info.json b/keyboards/viktus/smolka/info.json index 3e38c540e6..e9727d48ff 100644 --- a/keyboards/viktus/smolka/info.json +++ b/keyboards/viktus/smolka/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "D4", "B1", "B2"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D1"}, diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 8b7c6fdc7d..c9a1d1cca3 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -18,16 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F0, B5, B4, D7, D6 } -#define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5, NO_PIN } // no B7 on left hand -#define MATRIX_ROW_PINS_RIGHT { F0, B5, B4, D7, D6 } -#define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 } - - -#define DIODE_DIRECTION COL2ROW - /* Split Defines */ #define SPLIT_USB_DETECT #define MASTER_LEFT diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json index 33cc1f6dcb..6b287e9833 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/info.json @@ -8,11 +8,24 @@ "pid": "0x534D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null], + "rows": ["F0", "B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F1", "resolution": 8} ] }, + "split": { + "matrix_pins": { + "right": { + "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"], + "rows": ["F0", "B5", "B4", "D7", "D6"] + } + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/viktus/styrka/config.h b/keyboards/viktus/styrka/config.h index 5c8d52a18b..c0e0f2bef8 100644 --- a/keyboards/viktus/styrka/config.h +++ b/keyboards/viktus/styrka/config.h @@ -17,29 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS {B11, B10, B2, B1, B0, A7, A6, A5, B13, B12} -#define MATRIX_COL_PINS {A0, A1, A2, A3, A4, B14, B15, A8, A9} -//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1} -/* Unused pins, in the default layout, are: -EncA (B6) because it is not used in the default PCB -All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason; -B0, which is unconnected on the PCB -*/ - -/* 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/viktus/styrka/info.json b/keyboards/viktus/styrka/info.json index 6bad0166c0..7e0c7c4c03 100644 --- a/keyboards/viktus/styrka/info.json +++ b/keyboards/viktus/styrka/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"], + "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h index a3555ccd50..d035c79a90 100644 --- a/keyboards/viktus/z150_bh/config.h +++ b/keyboards/viktus/z150_bh/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C3, C2, C1, C0, E1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D7, E0, C7, C6, C5, C4, F0, F1, F2, F3, F4, F5, F6, F7 } - -/* 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 diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json index f1e68dedf1..f622120e9a 100644 --- a/keyboards/viktus/z150_bh/info.json +++ b/keyboards/viktus/z150_bh/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], + "rows": ["C3", "C2", "C1", "C0", "E1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "num_lock": "E7", diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h index cea58affaa..9d63b82b19 100644 --- a/keyboards/vitamins_included/rev1/config.h +++ b/keyboards/vitamins_included/rev1/config.h @@ -23,12 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS -// wiring of each half -#define MATRIX_ROW_PINS { F5, F6, C7, F7 } -#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6} - -#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/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json index e79f940440..7561cb5851 100644 --- a/keyboards/vitamins_included/rev1/info.json +++ b/keyboards/vitamins_included/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "E2", "B6", "D7", "D6"], + "rows": ["F5", "F6", "C7", "F7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h index 40f6312b47..0fa20e9c86 100644 --- a/keyboards/vitamins_included/rev2/config.h +++ b/keyboards/vitamins_included/rev2/config.h @@ -22,12 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SPLIT_HAND_PIN B4 -// wiring of each half -#define MATRIX_ROW_PINS { F5, F6, C7, F7 } -#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6} - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN F0 diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index 894043ef98..0098b22d14 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F1", "F4", "E2", "B6", "D7", "D6"], + "rows": ["F5", "F6", "C7", "F7"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "F5", "esc_output": "F1", diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h index 00ddc347db..8aedbcf715 100644 --- a/keyboards/yampad/config.h +++ b/keyboards/yampad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B1, B3, B2, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Underlight configuration */ #define RGB_DI_PIN F4 #define RGBLED_NUM 9 diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json index 753c952b1d..d0e4b42329 100644 --- a/keyboards/yampad/info.json +++ b/keyboards/yampad/info.json @@ -8,6 +8,11 @@ "pid": "0x8369", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "debounce": 2, diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index fe7045efad..22610f4518 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_COL_PINS { B5, B6, B7, B8, B9, C13, C14, B0, B1, B2, B10, B11, B12, A15, B3 } -#define MATRIX_ROW_PINS { A3, A4, A5, A7, C15 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B4 diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json index 07f7dbbe30..6178272b17 100644 --- a/keyboards/yandrstudio/buff67v3/info.json +++ b/keyboards/yandrstudio/buff67v3/info.json @@ -6,6 +6,11 @@ "pid": "0xAA88", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B5", "B6", "B7", "B8", "B9", "C13", "C14", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3"], + "rows": ["A3", "A4", "A5", "A7", "C15"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h deleted file mode 100644 index 328e3e3852..0000000000 --- a/keyboards/yandrstudio/eau87/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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 <http://www.gnu.org/licenses/>. - */ -#pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B11, B10, B2, B1, B0, A7, A6, A5, A3, A15, B3 } -#define MATRIX_ROW_PINS { B12, B5, B4, A4, B7, B6 } diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json index f09f55c76b..9477067805 100644 --- a/keyboards/yandrstudio/eau87/info.json +++ b/keyboards/yandrstudio/eau87/info.json @@ -6,6 +6,11 @@ "pid": "0xAAEB", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"], + "rows": ["B12", "B5", "B4", "A4", "B7", "B6"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index d1405b2bbf..878ac47bbc 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -15,12 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { B7, A6, B6, B5, B4, B3, A5, A10, B1, B0, A7, A9, B11, B10, B2, A15, B15 } -#define MATRIX_ROW_PINS { A3, B9, B8, A4, C14, C13 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A8 diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json index 74f5dd6e86..4865cecb0b 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/info.json @@ -6,6 +6,11 @@ "pid": "0xAACD", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"], + "rows": ["A3", "B9", "B8", "A4", "C14", "C13"] + }, + "diode_direction": "COL2ROW", "debounce": 8, "layouts": { "LAYOUT": { diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 79f37b9bde..0c091e17af 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -15,12 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { C13, C14, C15, A3, A4, A5, A6, B12, B13, B14, B15, A8, A9, A10, B8 } -#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11, B9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A7 diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json index 4f8105fae8..9c0195618d 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/info.json @@ -6,6 +6,11 @@ "pid": "0xAA87", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"], + "rows": ["B0", "B1", "B2", "B10", "B11", "B9"] + }, + "diode_direction": "ROW2COL", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 06de2f5680..b3bb28e7ae 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -15,13 +15,6 @@ */ #pragma once - -#define MATRIX_COL_PINS { A15, B3, B4, B6, B7, B5, C13, A5, A4, B14, B15, A8, A9, A10 } -#define MATRIX_ROW_PINS { C14, B13, B12, C15, A3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Fix VIA RGB_light */ #define VIA_HAS_BROKEN_KEYCODES diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 5aa0c2ae68..c924055e4e 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -4,6 +4,11 @@ "pid": "0xAAAF", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"], + "rows": ["C14", "B13", "B12", "C15", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index a3d9bb74c5..9a23a64ae2 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_COL_PINS { B9, A3, A4, A5, A6, A7, B0, B2, B10, B11, B12, B13, B14, B15, A8 } -#define MATRIX_ROW_PINS { B3, B4, B6, B7, B8 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 15 /* RGB Matrix */ diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json index ed06374976..90ef04d125 100644 --- a/keyboards/yandrstudio/nz67v2/info.json +++ b/keyboards/yandrstudio/nz67v2/info.json @@ -6,6 +6,11 @@ "pid": "0xAA83", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"], + "rows": ["B3", "B4", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A9", "pin_b": "A10"} diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index d52452e0a2..84c1c2ae8f 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -15,13 +15,6 @@ */ #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_COL_PINS { B2, B10, B11, A8, A9, A10, B5, A15, B3, A2, A3, B4, A4, A5, A6 } -#define MATRIX_ROW_PINS { B0, B6, B1, B7, A1 } - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json index d48809128f..7bc7ea4142 100644 --- a/keyboards/yandrstudio/tg67/info.json +++ b/keyboards/yandrstudio/tg67/info.json @@ -6,6 +6,11 @@ "pid": "0xAA8D", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"], + "rows": ["B0", "B6", "B1", "B7", "A1"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index ec02b66c19..46c0d6005d 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -15,13 +15,6 @@ */ #pragma once - -#define MATRIX_COL_PINS { B6, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4 } -#define MATRIX_ROW_PINS { A1, A3, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B5 diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json index 20a1e86cf4..5fbc7ecf33 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/info.json @@ -6,6 +6,11 @@ "pid": "0xAA0C", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["A1", "A3", "A8", "A9", "A10"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_60_tsangan_split_rshift": { "layout": [ diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 2fa940c63a..66ec91c510 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -15,13 +15,5 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 } -#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* enable the nkro when using the VIA. */ #define FORCE_NKRO diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index d3c36ca852..7a4754cf29 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -4,6 +4,11 @@ "pid": "0xAAAD", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B9", "B6", "B5", "B4", "B3", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14"], + "rows": ["A2", "A1", "B8", "B7", "C15"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "A15", "on_state": 0 diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index e53141a772..5e34888c14 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -16,15 +16,6 @@ #pragma once - -#define MATRIX_COL_PINS \ - { A14, A15, B13, B14, B15, A13, A0, A1, A2, A3, A6, A7 } -#define MATRIX_ROW_PINS \ - { B9, B8, A10, A9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* I2C - required for custom i2c_init */ #define I2C1_SCL_PIN B6 #define I2C1_SDA_PIN B7 diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 85b39abe9b..017f4445b8 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -8,6 +8,11 @@ "pid": "0x0204", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A14", "A15", "B13", "B14", "B15", "A13", "A0", "A1", "A2", "A3", "A6", "A7"], + "rows": ["B9", "B8", "A10", "A9"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B10", "pin_b": "B12"}, diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h index a3fcde472f..305f37ad19 100644 --- a/keyboards/ydkb/chili/config.h +++ b/keyboards/ydkb/chili/config.h @@ -17,18 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right -/* Row pin configuration -*/ -#define MATRIX_ROW_PINS { F5, F4, F1, F0, E6, B0, D5, D3, D2, D1, D0 } -/* Column pin configuration - */ -#define MATRIX_COL_PINS { D4, F6, F7, C7, C6, B6, B5, B4, D7, D6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Underlight configuration */ #define RGB_DI_PIN B3 diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json index 1ef666e69f..2516744ef0 100644 --- a/keyboards/ydkb/chili/info.json +++ b/keyboards/ydkb/chili/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], + "rows": ["F5", "F4", "F1", "F0", "E6", "B0", "D5", "D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h index bc86dc02e5..4ec059e4b5 100644 --- a/keyboards/ydkb/just60/config.h +++ b/keyboards/ydkb/just60/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { E2, C7, B3, B2, B1 } -#define MATRIX_COL_PINS { D6, D7, B4, B6, B5, B7, F7, F6, F5, F4, F1, F0, E6, B0 } -#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/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json index 618f0d8eac..bea9152e0b 100644 --- a/keyboards/ydkb/just60/info.json +++ b/keyboards/ydkb/just60/info.json @@ -8,6 +8,11 @@ "pid": "0x1960", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"], + "rows": ["E2", "C7", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "E2", "esc_output": "D6" diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h index 94c922931b..788e0e02fe 100644 --- a/keyboards/ydkb/yd68/config.h +++ b/keyboards/ydkb/yd68/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B5, C6, C7, D7, B4 } -#define MATRIX_COL_PINS { B6, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json index d8f1439a3f..7b15598735 100644 --- a/keyboards/ydkb/yd68/info.json +++ b/keyboards/ydkb/yd68/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B6", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["B5", "C6", "C7", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D4", "on_state": 0 diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h index 9314f26bea..08303c4b13 100644 --- a/keyboards/ymdk/bface/config.h +++ b/keyboards/ymdk/bface/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3} -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7} - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json index 641fe31543..4cd6356298 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/info.json @@ -8,6 +8,11 @@ "pid": "0x4266", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B7", "B6", "B5", "B4", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 6 diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index 1420387adb..782e711cfd 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index 074e6c0485..4688aee3a2 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -8,6 +8,11 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h index ce2e688bd7..81bfa2e81a 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 5 //#define RGBLIGHT_HUE_STEP 8 //#define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 9d1e375cd9..2a191a4a24 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -7,6 +7,11 @@ "pid": "0x5021", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12, diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index 0524cfd563..cbb4974c09 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 } -#define MATRIX_COL_PINS { F5, F4, D3, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index dd4b532538..98d881cd4d 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -7,6 +7,11 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "matrix_pins": { + "cols": ["F5", "F4", "D3", "D2"], + "rows": ["B3", "B6", "B2", "B1", "D7", "B4"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "levels": 31 diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index 3b21cea4a6..013df9fa12 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -15,23 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 92f019bacb..0bf2f4ca97 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -8,6 +8,11 @@ "pid": "0x2975", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h index 055c93b327..034d338d35 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -13,23 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 80 diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index 8e72d4093a..a4984a81d7 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -8,6 +8,11 @@ "pid": "0x4975", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h index 82d7484aa8..4b44082d9f 100644 --- a/keyboards/ymdk/yd60mq/config.h +++ b/keyboards/ymdk/yd60mq/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 } - -/* 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 diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index 84b42905c7..60ff8f7fe2 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -7,6 +7,11 @@ "vid": "0x594D", "pid": "0x604D" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h index d07a8917df..c55883abd3 100644 --- a/keyboards/ymdk/ym68/config.h +++ b/keyboards/ymdk/ym68/config.h @@ -16,22 +16,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 MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 20 diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json index 5d4d3913f8..e3ec6538f8 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/info.json @@ -8,6 +8,11 @@ "pid": "0xD896", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5, diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h index 4c4ca90583..daf340e4b8 100644 --- a/keyboards/ymdk/ymd09/config.h +++ b/keyboards/ymdk/ymd09/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F5, F4, F1 } -#define MATRIX_COL_PINS { D6, D2, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json index 0e3aaba46b..8d456b3ab7 100644 --- a/keyboards/ymdk/ymd09/info.json +++ b/keyboards/ymdk/ymd09/info.json @@ -8,6 +8,11 @@ "pid": "0x4409", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D2", "D1"], + "rows": ["F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h index 36cbd93891..5f0ff7b52d 100644 --- a/keyboards/ymdk/ymd21/v2/config.h +++ b/keyboards/ymdk/ymd21/v2/config.h @@ -16,22 +16,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 MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 } -#define MATRIX_COL_PINS { F5, F4, D3, D2 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 8 diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json index 84badccc5a..11e85c1e2b 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0110", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "D3", "D2"], + "rows": ["B3", "B6", "B2", "B1", "D7", "B4"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ymdk/ymd40/air40/config.h b/keyboards/ymdk/ymd40/air40/config.h index db792118da..4fcbc8421c 100644 --- a/keyboards/ymdk/ymd40/air40/config.h +++ b/keyboards/ymdk/ymd40/air40/config.h @@ -16,22 +16,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 MATRIX_ROW_PINS { D0, B3, B2, B1 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 51 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json index 3920ff6a29..b334b81717 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/info.json @@ -8,6 +8,11 @@ "pid": "0x0911", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h index 21a027eab4..a0b2e37f8f 100644 --- a/keyboards/ymdk/ymd40/v2/config.h +++ b/keyboards/ymdk/ymd40/v2/config.h @@ -16,22 +16,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 MATRIX_ROW_PINS { D0, B3, B2, B1 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } - -#define DIODE_DIRECTION COL2ROW - #if defined(RGBLIGHT_ENABLE) #define RGB_DI_PIN E2 #define RGBLED_NUM 8 diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index 375f8c8480..37c51da1a5 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x4440", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], + "rows": ["D0", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h index 90f4ffed24..dc7ebdc8bc 100644 --- a/keyboards/ymdk/ymd67/config.h +++ b/keyboards/ymdk/ymd67/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 } - -/* 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 diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index f66e1533dd..89cdd6b258 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/ymdk/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h deleted file mode 100644 index d46c3bc010..0000000000 --- a/keyboards/ymdk/ymd75/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> -Modified 2017 Andrew Novak <ndrw.nvk@gmail.com> -Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json index 967dd3de95..e1c728c19d 100644 --- a/keyboards/ymdk/ymd75/rev1/info.json +++ b/keyboards/ymdk/ymd75/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12 diff --git a/keyboards/ymdk/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h deleted file mode 100644 index 83e075b290..0000000000 --- a/keyboards/ymdk/ymd75/rev2/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3, B0 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json index 56435d5b27..8d71880689 100644 --- a/keyboards/ymdk/ymd75/rev2/info.json +++ b/keyboards/ymdk/ymd75/rev2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B7", "B6", "B5", "B4", "B3", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12 diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h index e3a31b5116..968045a7c9 100644 --- a/keyboards/ymdk/ymd75/rev3/config.h +++ b/keyboards/ymdk/ymd75/rev3/config.h @@ -1,6 +1,3 @@ #pragma once -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define DIODE_DIRECTION ROW2COL #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4 diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json index ce0db873cf..d4abcdd4e1 100644 --- a/keyboards/ymdk/ymd75/rev3/info.json +++ b/keyboards/ymdk/ymd75/rev3/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 12 diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h index f4fc0a99c3..cc4cd0d147 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TOGGLE 3 #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index 7541e62019..f48314cfa5 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12, diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h index fb4155c48d..b8bcd08e27 100644 --- a/keyboards/yncognito/batpad/config.h +++ b/keyboards/yncognito/batpad/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { F4, C7 } -#define MATRIX_COL_PINS { F1, F0, D5, D3 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json index 01d2032d2e..fa1efd40eb 100644 --- a/keyboards/yncognito/batpad/info.json +++ b/keyboards/yncognito/batpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F0", "D5", "D3"], + "rows": ["F4", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h index 73de0d6c42..504d6ba541 100644 --- a/keyboards/yoichiro/lunakey_macro/config.h +++ b/keyboards/yoichiro/lunakey_macro/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Audio support */ #define AUDIO_PIN C6 diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json index f7d032a1d2..ef1402a41e 100644 --- a/keyboards/yoichiro/lunakey_macro/info.json +++ b/keyboards/yoichiro/lunakey_macro/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h index a4ddefb53c..b674473983 100644 --- a/keyboards/yoichiro/lunakey_mini/config.h +++ b/keyboards/yoichiro/lunakey_mini/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D4, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json index 4baa40bda4..d32b1490d1 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h index 39c7907b48..c17ec90d8e 100644 --- a/keyboards/yosino58/rev1/config.h +++ b/keyboards/yosino58/rev1/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json index baf43c47a5..597c4a442e 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x01B8", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/yugo_m/model_m_101/config.h index a132e577bb..2b7fc4d157 100644 --- a/keyboards/yugo_m/model_m_101/config.h +++ b/keyboards/yugo_m/model_m_101/config.h @@ -18,25 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 } - - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* define if matrix has ghost */ #define MATRIX_HAS_GHOST diff --git a/keyboards/yugo_m/model_m_101/info.json b/keyboards/yugo_m/model_m_101/info.json index 35162e1b71..3533bf6142 100644 --- a/keyboards/yugo_m/model_m_101/info.json +++ b/keyboards/yugo_m/model_m_101/info.json @@ -8,6 +8,11 @@ "pid": "0x8E81", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], + "rows": ["B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h index 7f1153299c..4a567f22b1 100644 --- a/keyboards/yushakobo/navpad/10/config.h +++ b/keyboards/yushakobo/navpad/10/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 9 diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h deleted file mode 100644 index 3e65349c87..0000000000 --- a/keyboards/yushakobo/navpad/10/rev0/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2021 yushakobo - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 MATRIX_ROW_PINS { D4, C6, D7, E6, B4, D0 } -#define MATRIX_COL_PINS { F4, F5, F6, B2, B3, B1, F7 } diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json index 5baab67dba..76b579338c 100644 --- a/keyboards/yushakobo/navpad/10/rev0/info.json +++ b/keyboards/yushakobo/navpad/10/rev0/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.0" - } + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "B2", "B3", "B1", "F7"], + "rows": ["D4", "C6", "D7", "E6", "B4", "D0"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h index d2e7829323..4c69a35dea 100644 --- a/keyboards/yushakobo/navpad/10/rev1/config.h +++ b/keyboards/yushakobo/navpad/10/rev1/config.h @@ -17,20 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D4, C6, D7, E6, B4, F4 } -#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7 } - #ifdef RGB_DI_PIN # define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 } #endif diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json index 90ac25f360..5bf5ce1135 100644 --- a/keyboards/yushakobo/navpad/10/rev1/info.json +++ b/keyboards/yushakobo/navpad/10/rev1/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.1" - } + }, + "matrix_pins": { + "cols": ["F5", "F6", "B2", "B3", "B1", "F7"], + "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 5b0e667cc9..ae49a16f3b 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D4, C6, D7, E6, B4, F4 } -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7, NO_PIN } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2 } - #define EE_HANDS #ifdef RGB_DI_PIN @@ -44,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. 34, 35, 36, 37, 38, 39, 40 } #endif -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 9+32 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index 19b8c31efb..5bc055b381 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], + "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"} @@ -21,6 +26,12 @@ {"pin_a": "B6", "pin_b": "B5"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 3df5c25081..1e45541119 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { F4, B3, B6 } -#define MATRIX_COL_PINS { F5, D4, E6, F7, C6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #define RGBLED_NUM 18 diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 7d062aef16..e5eb64db84 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D4", "E6", "F7", "C6", "D7"], + "rows": ["F4", "B3", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h index 4ca22e9b5d..4994ead6bc 100644 --- a/keyboards/yynmt/dozen0/config.h +++ b/keyboards/yynmt/dozen0/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { F4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, B5, B4, E6, D7, C6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json index b32291b052..0c73591326 100644 --- a/keyboards/yynmt/dozen0/info.json +++ b/keyboards/yynmt/dozen0/info.json @@ -8,6 +8,11 @@ "pid": "0xEA4F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h index 4d2fab5ace..e2bf97645b 100644 --- a/keyboards/yynmt/kagamidget/config.h +++ b/keyboards/yynmt/kagamidget/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { D1, D0, F4, F5 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json index 7ffbddfd25..983b09aa79 100644 --- a/keyboards/yynmt/kagamidget/info.json +++ b/keyboards/yynmt/kagamidget/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D1", "D0", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h index 27ef3bfb87..0167811c6a 100644 --- a/keyboards/zfrontier/big_switch/config.h +++ b/keyboards/zfrontier/big_switch/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { F0 } -#define MATRIX_COL_PINS { F1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB light config */ #define RGB_DI_PIN B6 #define RGBLED_NUM 4 diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json index aaf72f61b3..0e52f3a29d 100644 --- a/keyboards/zfrontier/big_switch/info.json +++ b/keyboards/zfrontier/big_switch/info.json @@ -8,6 +8,11 @@ "pid": "0x0A01", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F1"], + "rows": ["F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ziggurat/config.h b/keyboards/ziggurat/config.h deleted file mode 100644 index e532c012ba..0000000000 --- a/keyboards/ziggurat/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 kb-elmo<mail@elmo.space> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { A2, A1, A0, F7, A3 } -#define MATRIX_COL_PINS { F6, F5, F4, F3, F2, F1, B5, B6, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ziggurat/info.json b/keyboards/ziggurat/info.json index 0cd86b049c..c3a4a50326 100644 --- a/keyboards/ziggurat/info.json +++ b/keyboards/ziggurat/info.json @@ -8,6 +8,11 @@ "pid": "0x5258", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F3", "F2", "F1", "B5", "B6", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"], + "rows": ["A2", "A1", "A0", "F7", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h index efbdb02f81..2df5b9daaf 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json index 0c902f2468..70bba664ec 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h index 231ad6d92e..f6311ba013 100755 --- a/keyboards/zlant/config.h +++ b/keyboards/zlant/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, D4, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B7, D1, D2, D3, B3, B2 } - -/* 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 diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json index e69956a96d..9bee3a5016 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"], + "rows": ["B0", "B1", "D4", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index 739358f693..8437e42144 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 MATRIX_ROW_PINS { C13, C14, A5, A4, A3 } -#define MATRIX_COL_PINS { A10, A9, A8, B12, A15, A13, A7, A2, A1, A0, F1, F0, B3, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 74bf17b603..a3693fdad2 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -8,6 +8,11 @@ "pid": "0xE600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B12", "A15", "A13", "A7", "A2", "A1", "A0", "F1", "F0", "B3", "B4", "B5"], + "rows": ["C13", "C14", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "breathing": true diff --git a/keyboards/ztboards/after/config.h b/keyboards/ztboards/after/config.h index 7c0453e3ae..59d91c329d 100644 --- a/keyboards/ztboards/after/config.h +++ b/keyboards/ztboards/after/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, F6, F5, D5, B2 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D7, D6, D4, C7, C6, B6, B5, B4, F7, F0, F4, F1 } - -/* 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 diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/info.json index 875478ec10..72f068d338 100644 --- a/keyboards/ztboards/after/info.json +++ b/keyboards/ztboards/after/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D7", "D6", "D4", "C7", "C6", "B6", "B5", "B4", "F7", "F0", "F4", "F1"], + "rows": ["B3", "F6", "F5", "D5", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0"} diff --git a/keyboards/ztboards/noon/config.h b/keyboards/ztboards/noon/config.h index 58b8096ef8..59d91c329d 100644 --- a/keyboards/ztboards/noon/config.h +++ b/keyboards/ztboards/noon/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, D5, D3, B1, F0 } -#define MATRIX_COL_PINS { D2, D1, D0, D4, D6, B2, D7, B4, B6, C6, C7, F7, F6, F5, F4, F1 } - -/* 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 diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/info.json index c7140de8de..9ebaedef16 100644 --- a/keyboards/ztboards/noon/info.json +++ b/keyboards/ztboards/noon/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "D4", "D6", "B2", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B5", "D5", "D3", "B1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index 2f8984f51a..cda1688944 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -15,25 +15,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 MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6 } -#define MATRIX_ROW_PINS { B15, B14, B13, B12 } -#define MATRIX_COL_PINS_RIGHT { B12, B13, B14, B15, A8, A9 } -#define MATRIX_ROW_PINS_RIGHT { B0, B1, B10, B11 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SPLIT_HAND_PIN B3 diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json index d8245be308..dff0282f16 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/info.json @@ -8,10 +8,21 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6"], + "rows": ["B15", "B14", "B13", "B12"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A9"], + "rows": ["B0", "B1", "B10", "B11"] + } } }, "processor": "STM32F103", diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index 97b0393aab..c643ca5d31 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -15,25 +15,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 MATRIX_COL_PINS { B15, B10, B0, A5, A4, A3 } -#define MATRIX_ROW_PINS { A10, A15, B3, B4 } -#define MATRIX_COL_PINS_RIGHT { B10, B15, A10, A15, B3, B4 } -#define MATRIX_ROW_PINS_RIGHT { B0, A5, A4, A3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SPLIT_HAND_PIN B9 diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index f3519b94f4..4206a3fa6e 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -8,6 +8,11 @@ "pid": "0x0048", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "B10", "B0", "A5", "A4", "A3"], + "rows": ["A10", "A15", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "A2"} @@ -17,6 +22,12 @@ "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B10", "B15", "A10", "A15", "B3", "B4"], + "rows": ["B0", "A5", "A4", "A3"] + } } }, "community_layouts": ["ortho_4x12"], |