Migrate `DIRECT_PINS` to data driven (#19826)

keyboards/0xcb/1337/config.h

@@ -18,16 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // clang-format off
 
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D2, D4, F4 }, \
-    { D7, B1, B3 }, \
-    { E6, B4, B2 } \
-}
 #define TAP_CODE_DELAY 10
 #define ENCODER_RESOLUTION 4
 #define ENCODERS_PAD_A { F6 }

keyboards/0xcb/1337/info.json

@@ -10,6 +10,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "qmk-dfu",
+  "matrix_pins": {
+    "direct": [
+      ["D2", "D4", "F4"],
+      ["D7", "B1", "B3"],
+      ["E6", "B4", "B2"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/0xcb/tutelpad/config.h

@@ -16,27 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { E6, D7, B1, B3 }, \
-    { B5, B4, B2, B6 } \
-}
-
 #define RGB_DI_PIN D3                   // LED data pin on controller
 #define RGBLED_NUM 4                    // Number of LEDs connected
 

keyboards/0xcb/tutelpad/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["E6", "D7", "B1", "B3"],
+            ["B5", "B4", "B2", "B6"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/1k/config.h

@@ -15,18 +15,6 @@
  */
 #pragma once
 
-
-/* matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/*
- * Keyboard Matrix Assignments
- *
- * On this board we have direct connection: no diodes.
- */
-#define DIRECT_PINS {{ B0 }}
-
 #define RGBLED_NUM 1
 #define RGB_DI_PIN B2
 

keyboards/1k/info.json

@@ -8,6 +8,11 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "direct": [
+      ["B0"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_1x1": {
       "layout": [

keyboards/25keys/cassette42/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 6
-
-#define DIRECT_PINS {{ B4, F6, F5, F4, B5, F7 }}
-
 #define ENCODERS_PAD_A { B6, B3 }
 #define ENCODERS_PAD_B { B2, B1 }
 #define ENCODER_RESOLUTION 4

keyboards/25keys/cassette42/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["B4", "F6", "F5", "F4", "B5", "F7"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}]

keyboards/40percentclub/4pack/config.h

@@ -17,30 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-// #define MATRIX_ROW_PINS { B0 } // B0 equivalents the ground pin
-// #define MATRIX_COL_PINS { E6, D7, C6, D4 }
-#define DIRECT_PINS { \
-    { E6, D7, C6, D4 } \
-}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_LED_COUNT 2
 #undef BACKLIGHT_PIN
 #define BACKLIGHT_PINS { F6, F7 }

keyboards/40percentclub/4pack/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["E6", "D7", "C6", "D4"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]

keyboards/40percentclub/nano/config.h

@@ -17,29 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-// #define MATRIX_ROW_PINS { D0, D5 }
-// #define MATRIX_COL_PINS { F1, F0, B0 }
-#define DIRECT_PINS {   \
-    { F4, F5, F6, F7 }, \
-    { D1, D0, D4, C6 }, \
-}
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #    define RGBLIGHT_EFFECT_BREATHING

keyboards/40percentclub/nano/info.json

@@ -10,6 +10,12 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["F4", "F5", "F6", "F7"],
+      ["D1", "D0", "D4", "C6"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]

keyboards/40percentclub/nein/config.h

@@ -16,18 +16,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { F4, F5, F6 }, \
-    { F7, B1, B3 }, \
-    { B2, B6, B5 }  \
-}
-
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
 //   #define RGBLED_NUM 16

keyboards/40percentclub/nein/info.json

@@ -10,6 +10,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["F4", "F5", "F6"],
+      ["F7", "B1", "B3"],
+      ["B2", "B6", "B5"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [

keyboards/40percentclub/sixpack/config.h

@@ -17,29 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define DIRECT_PINS { \
-    { D4, C6, D7 }, \
-    { E6, B4, B5 }  \
-}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight */
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 6

keyboards/40percentclub/sixpack/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+      "direct": [
+        ["D4", "C6", "D7"],
+        ["E6", "B4", "B5"]
+      ]
+    },
     "community_layouts": ["ortho_2x3"],
     "layouts": {
         "LAYOUT_ortho_2x3": {

keyboards/8pack/config.h

@@ -1,23 +1,11 @@
 #pragma once
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/* key matrix pins */
-
-#define DIRECT_PINS { { F4, F5, F6, F7 }, { B1, B3, B2, B6 } }
-
 #define BACKLIGHT_LED_COUNT 8
 #undef BACKLIGHT_PIN
 #define BACKLIGHT_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }

keyboards/8pack/info.json

@@ -9,6 +9,12 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["F4", "F5", "F6", "F7"],
+      ["B1", "B3", "B2", "B6"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/a_dux/config.h

@@ -16,36 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-#define DIRECT_PINS { \
-    { C6, D2, F7, B2, F4 }, \
-    { D7, D0, F6, B3, F5 }, \
-    { E6, D4, D3, B1, B6 }, \
-    { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-#define DIRECT_PINS_RIGHT { \
-    { F4, B2, F7, D2, C6 }, \
-    { F5, B3, F6, D0, D7 }, \
-    { B6, B1, D3, D4, E6 }, \
-    { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
-}
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

keyboards/a_dux/info.json

@@ -10,6 +10,26 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D2", "F7", "B2", "F4"],
+            ["D7", "D0", "F6", "B3", "F5"],
+            ["E6", "D4", "D3", "B1", "B6"],
+            ["B4", "B5", null, null, null]
+        ]
+    },
+    "split": {
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["F4", "B2", "F7", "D2", "C6"],
+                    ["F5", "B3", "F6", "D0", "D7"],
+                    ["B6", "B1", "D3", "D4", "E6"],
+                    ["B5", "B4", null, null, null]
+                ]
+            }
+        }
+    },
     "community_layouts": ["split_3x5_2"],
     "layouts": {
         "LAYOUT_split_3x5_2": {

keyboards/adafruit/macropad/config.h

@@ -16,22 +16,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-// clang-format off
-#define DIRECT_PINS { \
-    { NO_PIN, NO_PIN, GP0  }, \
-    { GP1,    GP2,    GP3  }, \
-    { GP4,    GP5,    GP6  }, \
-    { GP7,    GP8,    GP9  }, \
-    { GP10,   GP11,   GP12 }  \
-}
-// clang-format on
-
 /* OLED SPI Defines */
 #define OLED_DISPLAY_128X64
 #define OLED_IC OLED_IC_SH1106

keyboards/adafruit/macropad/info.json

@@ -10,6 +10,15 @@
     },
     "processor": "RP2040",
     "bootloader": "rp2040",
+    "matrix_pins": {
+        "direct": [
+            [null, null, "GP0"],
+            ["GP1", "GP2", "GP3"],
+            ["GP4", "GP5", "GP6"],
+            ["GP7", "GP8", "GP9"],
+            ["GP10", "GP11", "GP12"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/anavi/knob1/config.h

@@ -3,17 +3,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Keyboard Matrix Assignments */
-// clang-format off
-#define DIRECT_PINS { \
-    { GP26 }  \
-}
-
 #define RGBLIGHT_DEFAULT_MODE 9
 
 /* Double tap reset button to enter bootloader */

keyboards/anavi/knob1/info.json

@@ -44,6 +44,11 @@
 	    }
         ]
     },
+    "matrix_pins": {
+        "direct": [
+            ["GP26"]
+        ]
+    },
     "layouts": {
         "LAYOUT_k1": {
             "layout": [

keyboards/anavi/macropad8/config.h

@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-#define DIRECT_PINS {   \
-    { D4, F6, B5, E6 }, \
-    { F5, F7, B4, C6 } \
-}
-
 #define BACKLIGHT_PIN D7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3

keyboards/anavi/macropad8/info.json

@@ -10,6 +10,12 @@
     },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["D4", "F6", "B5", "E6"],
+      ["F5", "F7", "B4", "C6"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]

keyboards/arrayperipherals/1x4p1/config.h

@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 5
-
-
-#define DIRECT_PINS {   \
-    { C7, B7, D6, F5, F7} \
-}
-
 /* rotary encoder*/
 #define ENCODERS_PAD_A {F0}
 #define ENCODERS_PAD_B {F1}

keyboards/arrayperipherals/1x4p1/info.json

@@ -10,6 +10,11 @@
     },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["C7", "B7", "D6", "F5", "F7"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [

keyboards/beekeeb/piantor/config.h

@@ -11,23 +11,5 @@
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
-#define DIRECT_PINS { \
-    { GP5, GP4, GP11, GP15, GP3, GP2}, \
-    { GP22, GP20, GP10, GP14, GP9, GP8}, \
-    { GP21, GP19, GP6, GP7, GP13, GP12}, \
-    { GP17, GP18, GP16, NO_PIN, NO_PIN, NO_PIN} \
-}
-
-#define DIRECT_PINS_RIGHT { \
-    { GP22, GP21, GP2, GP5, GP8, GP11}, \
-    { GP20, GP19, GP3, GP6, GP9, GP12}, \
-    { GP18, GP17, GP4, GP7, GP10, GP13}, \
-    { GP15, GP14, GP16, NO_PIN, NO_PIN, NO_PIN} \
-}
-
 #define BOOTMAGIC_LITE_ROW    0
 #define BOOTMAGIC_LITE_COLUMN 5

keyboards/beekeeb/piantor/info.json

@@ -18,8 +18,26 @@
         "pid": "0x0001",
         "vid": "0xBEEB"
     },
+    "matrix_pins": {
+        "direct": [
+            ["GP5", "GP4", "GP11", "GP15", "GP3", "GP2"],
+            ["GP22", "GP20", "GP10", "GP14", "GP9", "GP8"],
+            ["GP21", "GP19", "GP6", "GP7", "GP13", "GP12"],
+            ["GP17", "GP18", "GP16", null, null, null]
+        ]
+    },
     "split": {
-        "enabled": true
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["GP22", "GP21", "GP2", "GP5", "GP8", "GP11"],
+                    ["GP20", "GP19", "GP3", "GP6", "GP9", "GP12"],
+                    ["GP18", "GP17", "GP4", "GP7", "GP10", "GP13"],
+                    ["GP15", "GP14", "GP16", null, null, null]
+                ]
+            }
+        }
     },
     "community_layouts": ["split_3x6_3"],
     "layouts": {

keyboards/botanicalkeyboards/fm2u/config.h

@@ -1,45 +0,0 @@
-/*
-Copyright 2020 mechmerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { C4 } \
-}
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-

keyboards/botanicalkeyboards/fm2u/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["C4"]
+        ]
+    },
     "layouts": {
         "LAYOUT_1u": {
             "layout": [

keyboards/bpiphany/sixshooter/config.h

@@ -1,28 +0,0 @@
-#pragma once
-
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { F7, F6, F1 }, \
-    { F5, F4, F0 } \
-}
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/bpiphany/sixshooter/info.json

@@ -10,6 +10,12 @@
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",
+  "matrix_pins": {
+    "direct": [
+      ["F7", "F6", "F1"],
+      ["F5", "F4", "F0"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}]

keyboards/cantor/config.h

@@ -3,20 +3,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
-#define DIRECT_PINS {{B1, B10, A8, B15, B14, B13}, \
-                     {B9, B8, B5, B4, B3, A15}, \
-                     {A3, A4, A5, A6, A7, B0}, \
-                     {A2, A1, A0, NO_PIN, NO_PIN, NO_PIN}}
-#define DIRECT_PINS_RIGHT {{B13, B14, B15, A8, B10, B1}, \
-                           {A15, B3, B4, B5, B8, B9}, \
-                           {B0, A7, A6, A5, A4, A3}, \
-                           {A0, A1, A2, NO_PIN, NO_PIN, NO_PIN}}
-
 #define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
 #define SERIAL_USART_TX_PIN B6     // USART TX pin
 #define SERIAL_USART_RX_PIN B7     // USART RX pin

keyboards/cantor/info.json

@@ -19,6 +19,26 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "matrix_pins": {
+        "direct": [
+            ["B1", "B10", "A8", "B15", "B14", "B13"],
+            ["B9", "B8", "B5", "B4", "B3", "A15"],
+            ["A3", "A4", "A5", "A6", "A7", "B0"],
+            ["A2", "A1", "A0", null, null, null]
+        ]
+    },
+    "split": {
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["B13", "B14", "B15", "A8", "B10", "B1"],
+                    ["A15", "B3", "B4", "B5", "B8", "B9"],
+                    ["B0", "A7", "A6", "A5", "A4", "A3"],
+                    ["A0", "A1", "A2", null, null, null]
+                ]
+            }
+        }
+    },
     "community_layouts": ["split_3x6_3"],
     "layouts": {
         "LAYOUT_split_3x6_3": {

keyboards/crypt_macro/config.h

@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-#define DIRECT_PINS { \
-    { B12,    B6, B7    }, \
-    { NO_PIN, B5, NO_PIN}  \
-}
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 

keyboards/crypt_macro/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["B12", "B6", "B7"],
+            [null, "B5", null]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}]

keyboards/dailycraft/owl8/config.h

@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 16
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define DIRECT_PINS { \
-    { F4, F7, B3, B6, F5, F6, B1, B2, D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 //#define LED_NUM_LOCK_PIN B0
 //#define LED_CAPS_LOCK_PIN B1
 //#define LED_SCROLL_LOCK_PIN B2

keyboards/dailycraft/owl8/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6", null, null, null, null]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dailycraft/stickey4/config.h

@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 8
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define DIRECT_PINS { \
-    { D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 //#define LED_NUM_LOCK_PIN B0
 //#define LED_CAPS_LOCK_PIN B1
 //#define LED_SCROLL_LOCK_PIN B2

keyboards/dailycraft/stickey4/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "C6", "D7", "E6", null, null, null, null]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/dekunukem/duckypad/config.h

@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 17
-
-#define DIRECT_PINS {{ B13, B14, B15, A8, A15, B3, B4, B5, B6, B7, C13, C14, C15, F0, F1, A1, A2 }}
-
 #define RGB_DI_PIN A10
 #define RGBLED_NUM 15
 #define RGB_MATRIX_LED_COUNT 15

keyboards/dekunukem/duckypad/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B6", "B7", "C13", "C14", "C15", "F0", "F1", "A1", "A2"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ferris/sweep/config.h

@@ -19,25 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
-#define DIRECT_PINS { \
-    { E6, F7, F6, F5, F4 }, \
-    { B1, B3, B2, B6, D3 }, \
-    { D1, D0, D4, C6, D7 }, \
-    { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-#define DIRECT_PINS_RIGHT { \
-    { F4, F5, F6, F7, E6 }, \
-    { D3, B6, B2, B3, B1 }, \
-    { D7, C6, D4, D0, D1 }, \
-    { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
-}
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 

keyboards/ferris/sweep/info.json

@@ -7,5 +7,25 @@
         "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["E6", "F7", "F6", "F5", "F4"],
+            ["B1", "B3", "B2", "B6", "D3"],
+            ["D1", "D0", "D4", "C6", "D7"],
+            ["B4", "B5", null, null, null]
+        ]
+    },
+    "split": {
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["F4", "F5", "F6", "F7", "E6"],
+                    ["D3", "B6", "B2", "B3", "B1"],
+                    ["D7", "C6", "D4", "D0", "D1"],
+                    ["B5", "B4", null, null, null]
+                ]
+            }
+        }
+    }
 }

keyboards/geekboards/macropad_v2/config.h

@@ -14,12 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-#define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}}
-
 #define RGBLED_NUM 42
 #define RGB_MATRIX_LED_COUNT 42
 #define RGB_DI_PIN A7

keyboards/geekboards/macropad_v2/info.json

@@ -10,6 +10,12 @@
   },
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
+  "matrix_pins": {
+    "direct": [
+      ["B13", "B15", "B3", "B5"],
+      ["B12", "B14", "A13", "B7"]
+    ]
+  },
   "debounce": 3,
   "layouts": {
     "LAYOUT_ortho_2x4": {

keyboards/handwired/aball/config.h

@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-#define DIRECT_PINS {{NO_PIN}}
-
 #define ADNS9800_CS_PIN F7
 #define POINTING_DEVICE_INVERT_X

keyboards/handwired/aball/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            [null]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/bdn9_ble/config.h

@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D1, D0, C6 }, \
-    { D7, B5, B6 }, \
-    { B7, D6, F7 } \
-}
-
 #define BACKLIGHT_PIN F6
 #define BACKLIGHT_LEVELS 5
 

keyboards/handwired/bdn9_ble/info.json

@@ -10,6 +10,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["D1", "D0", "C6"],
+      ["D7", "B5", "B6"],
+      ["B7", "D6", "F7"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/handwired/bento/rev1/config.h

@@ -16,17 +16,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D7, B1, D2 }, \
-    { E6, B4, B2 } \
-}
-
 #define ENCODERS_PAD_A { D1 }
 #define ENCODERS_PAD_B { D0 }
 

keyboards/handwired/bento/rev1/info.json

@@ -10,6 +10,12 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["D7", "B1", "D2"],
+      ["E6", "B4", "B2"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/handwired/dc/mc/001/config.h

@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
-    BUTTON_MUTE           = _BV(4),
-    BUTTON_STOP           = _BV(0),
-    BUTTON_TRACK_PREVIOUS = _BV(1),
-    BUTTON_TRACK_NEXT     = _BV(2),
-    BUTTON_PLAY_PAUSE     = _BV(3),
-*/
-#define DIRECT_PINS            \
-    {                          \
-        { B4, B0, B1, B2, B3 } \
-    }
-
 /*
     RE_CHANNEL_A          = _BV(6),
     RE_CHANNEL_B          = _BV(5),

keyboards/handwired/dc/mc/001/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["B4", "B0", "B1", "B2", "B3"]
+        ]
+    },
     "debounce": 50,
     "layouts": {
         "LAYOUT": {

keyboards/handwired/lemonpad/config.h

@@ -16,27 +16,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define DIRECT_PINS { 	\
-    { E6, D7, C6 }, 	\
-    { B4, B5, D4 }  	\
-}
-
 //#define RGB_DI_PIN E2
 //#ifdef RGB_DI_PIN
 //#    define RGBLED_NUM 16

keyboards/handwired/lemonpad/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["E6", "D7", "C6"],
+            ["B4", "B5", "D4"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/handwired/stream_cheap/2x3/config.h

@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/* define direct pins used */
-#define DIRECT_PINS { { D1,C6,B4}, { D0,D4,D7} }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

keyboards/handwired/stream_cheap/2x3/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D1", "C6", "B4"],
+            ["D0", "D4", "D7"]
+        ]
+    },
     "community_layouts": ["ortho_2x3"],
     "layouts": {
         "LAYOUT_ortho_2x3": {

keyboards/handwired/stream_cheap/2x4/config.h

@@ -1,16 +1,5 @@
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/* define direct pins used */
-#define DIRECT_PINS                          \
-    {                                        \
-        {D1, D0, D4, C6}, { D7, E6, B4, B5 } \
-    }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

keyboards/handwired/stream_cheap/2x4/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D1", "D0", "D4", "C6"],
+            ["D7", "E6", "B4", "B5"]
+        ]
+    },
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "layout": [

keyboards/handwired/stream_cheap/2x5/config.h

@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 5
-
-/* define direct pins used */
-#define DIRECT_PINS { { D1,C6,B4,B5,B2}, { D0,D4,D7,E6,B6} }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

keyboards/handwired/stream_cheap/2x5/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D1", "C6", "B4", "B5", "B2"],
+            ["D0", "D4", "D7", "E6", "B6"]
+        ]
+    },
     "layouts": {
         "LAYOUT_ortho_2x5": {
             "layout": [

keyboards/ianklug/grooveboard/config.h

@@ -17,30 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-//#define MATRIX_ROW_PINS { D0, D5 }
-//#define MATRIX_COL_PINS { F1, F0, B0 }
-#define DIRECT_PINS { \
-    { F7, F6, D1, D2 } \
-}
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
-
 //#define LED_NUM_LOCK_PIN B0
 //#define LED_CAPS_LOCK_PIN B1
 //#define LED_SCROLL_LOCK_PIN B2

keyboards/ianklug/grooveboard/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["F7", "F6", "D1", "D2"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/kb_elmo/isolation/config.h

@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* direct key pin */
-#define DIRECT_PINS {{ B0 }}
-
 /* RGB backlight */
 #define RGB_DI_PIN B2
 #ifdef RGB_DI_PIN

keyboards/kb_elmo/isolation/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
+    "matrix_pins": {
+        "direct": [
+            ["B0"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/keebio/bamfk1/config.h

@@ -3,19 +3,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- */
-
-#define DIRECT_PINS { \
-    { E6, B6, D6, NO_PIN }, \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
-}
 #define AUDIO_PIN C6
 #ifdef AUDIO_ENABLE
 #    define STARTUP_SONG SONG(STARTUP_SOUND)

keyboards/keebio/bamfk1/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["E6", "B6", "D6", null],
+            [null, null, null, null]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/keebio/bdn9/rev1/config.h

@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D2, D4, F4 }, \
-    { D7, B1, B3 }, \
-    { E6, B4, B2 } \
-}
-
 #define ENCODERS_PAD_A { D0, F6, B6 }
 #define ENCODERS_PAD_B { D1, F5, F7 }
 

keyboards/keebio/bdn9/rev1/info.json

@@ -5,5 +5,12 @@
         "device_version": "1.0.0"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D2", "D4", "F4"],
+            ["D7", "B1", "B3"],
+            ["E6", "B4", "B2"]
+        ]
+    }
 }

keyboards/keebio/bdn9/rev2/config.h

@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { B12, B5, B6 }, \
-    { B14, B4, B7 }, \
-    { A3, F1, F0 } \
-}
-
 // Left, Right, Middle
 #define ENCODERS_PAD_A { A8, B3, A10 }
 #define ENCODERS_PAD_B { A4, A15, A9 }

keyboards/keebio/bdn9/rev2/info.json

@@ -5,5 +5,12 @@
         "device_version": "2.0.0"
     },
     "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["B12", "B5", "B6"],
+            ["B14", "B4", "B7"],
+            ["A3", "F1", "F0"]
+        ]
+    }
 }

keyboards/keebio/choconum/config.h

@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-#define DIRECT_PINS { \
-    { B2, B10, B3, B4 }, \
-    { B1, B11, A15, B5 }, \
-    { B0, A5, B7, F0 }, \
-    { A7, A6, B8, B6 }, \
-    { A4, A3, B9, F1 } \
-}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/keebio/choconum/info.json

@@ -10,6 +10,15 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["B2", "B10", "B3", "B4"],
+            ["B1", "B11", "A15", "B5"],
+            ["B0", "A5", "B7", "F0"],
+            ["A7", "A6", "B8", "B6"],
+            ["A4", "A3", "B9", "F1"]
+        ]
+    },
     "community_layouts": ["ortho_5x4", "numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {

keyboards/keebio/stick/config.h

@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 12
-
-/* key matrix pins */
-#define DIRECT_PINS { \
-    { F4, B6, B5, B4, E6, D7, F6, F7, B1, B3, B2, F5 } \
-}
-
 #define ENCODERS_PAD_A { D1, D4 }
 #define ENCODERS_PAD_B { D0, C6 }
 
@@ -103,7 +93,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 #endif
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200

keyboards/keebio/stick/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["F4", "B6", "B5", "B4", "E6", "D7", "F6", "F7", "B1", "B3", "B2", "F5"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/keebio/tukey/config.h

@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 2
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { { D4, F6 } }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 8

keyboards/keebio/tukey/info.json

@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+      "direct": [
+        ["D4", "F6"]
+      ]
+    },
     "layouts": {
       "LAYOUT": {
         "layout": [

keyboards/keyhive/uno/rev1/config.h

@@ -18,15 +18,6 @@
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Uno default pinout */
-#define DIRECT_PINS { \
-    { B6 } \
-}
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN F6
 #define RGBLED_NUM 1

keyboards/keyhive/uno/rev1/info.json

@@ -4,5 +4,10 @@
         "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["B6"]
+        ]
+    }
 }

keyboards/keyhive/uno/rev2/config.h

@@ -22,15 +22,6 @@
 #define ENCODERS_PAD_A { B2 }
 #define ENCODERS_PAD_B { B3 }
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Uno default pinout */
-#define DIRECT_PINS { \
-    { D0 } \
-}
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D1
 #define RGBLED_NUM 1

keyboards/keyhive/uno/rev2/info.json

@@ -4,5 +4,10 @@
         "device_version": "0.0.2"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D0"]
+        ]
+    }
 }

keyboards/ktec/staryu/config.h

@@ -16,17 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/* key matrix pins */
-#define DIRECT_PINS { \
-    { NO_PIN, D0,     D1 }, \
-    { D4,     D3,     D2 }, \
-}
-
 #define RGB_DI_PIN C6
 #define RGBLED_NUM 1     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING

keyboards/ktec/staryu/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u2",
     "bootloader": "lufa-dfu",
+    "matrix_pins": {
+        "direct": [
+            [null, "D0", "D1"],
+            ["D4", "D3", "D2"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}]

keyboards/leafcutterlabs/bigknob/config.h

@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 5
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-
-// Srating with closest to USB port
-#define DIRECT_PINS {   \
-    { B7, D4, D6, F6, F7} \
-}
-
 /* rotary encoder 1,2,3 closest to usb port is 0*/
 #define ENCODERS_PAD_A { D0}
 #define ENCODERS_PAD_B { D2}

keyboards/leafcutterlabs/bigknob/info.json

@@ -10,6 +10,11 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["B7", "D4", "D6", "F6", "F7"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}]

keyboards/littlealby/mute/config.h

@@ -17,19 +17,6 @@
 
 #define USB_MAX_POWER_CONSUMPTION 100
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Default pinout */
-/* See arduino micro pinout: https://content.arduino.cc/assets/Pinout-Micro_latest.png
- * for pins e.g.
- * PB5 = digital pin 9 / analog pin 9
- */
-#define DIRECT_PINS { \
-    {B5} \
-}
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 1

keyboards/littlealby/mute/info.json

@@ -10,6 +10,11 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["B5"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [ {"x": 0, "y": 0 }]

keyboards/macro3/config.h

@@ -5,15 +5,5 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/* key matrix pins */
-#define DIRECT_PINS {   \
-    { D7, C6, D4, D1 }, \
-    { B1, B4, B5, B3 }  \
-}
-
 #define ENCODERS_PAD_A { D2, F7 }
 #define ENCODERS_PAD_B { D3, F6 }

keyboards/macro3/info.json

@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["D7", "C6", "D4", "D1"],
+            ["B1", "B4", "B5", "B3"]
+        ]
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_2x4"
     },

keyboards/makeymakey/config.h

@@ -16,18 +16,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 6
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D6, B4, C7, B1, E6, D7 }, \
-    { C6, D4, D0, D1, D2, D2 }, \
-    { F0, F1, F5, F5, F6, F7 }  \
-}
-
 /* LEDs Pins */
 #define LED_PINS 5
 #define LED_PINS_HW {B5, B6, B7, B3, B2}

keyboards/makeymakey/info.json

@@ -10,6 +10,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+      "direct": [
+        ["D6", "B4", "C7", "B1", "E6", "D7"],
+        ["C6", "D4", "D0", "D1", "D2", "D2"],
+        ["F0", "F1", "F5", "F5", "F6", "F7"]
+      ]
+    },
     "debounce": 10,
     "layouts": {
       "LAYOUT": {

keyboards/miniaxe/config.h

@@ -17,34 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-// #define MATRIX_ROW_PINS { D0, D5 }
-// #define MATRIX_COL_PINS { F1, F0, B0 }
-#define DIRECT_PINS { \
-    { F1, E6, B0, B2, B3 }, \
-    { F5, F0, B1, B7, D2 }, \
-    { F6, F7, C7, D5, D3 }, \
-    { B5, C6, B6, NO_PIN, NO_PIN } \
-}
-
-/* COL2ROW, ROW2COL*/
-////#define DIODE_DIRECTION
-
 /* Uncomment below if use underglow */
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN

keyboards/miniaxe/info.json

@@ -10,6 +10,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["F1", "E6", "B0", "B2", "B3"],
+            ["F5", "F0", "B1", "B7", "D2"],
+            ["F6", "F7", "C7", "D5", "D3"],
+            ["B5", "C6", "B6", null, null]
+        ]
+    },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {

keyboards/minimacro5/config.h

@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 5
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-// #define MATRIX_ROW_PINS { D0, D5 }
-// #define MATRIX_COL_PINS { F1, F0, B0 }
-#define DIRECT_PINS {   \
-    { F4, B6, B2, D7, B4 } \
-}
 //speed for double tap
 #define TAPPING_TERM 200
 

keyboards/minimacro5/info.json

@@ -10,6 +10,11 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["F4", "B6", "B2", "D7", "B4"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0}]

keyboards/mixi/config.h

@@ -1,17 +1,5 @@
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D1, D4, F4 }, \
-    { D0, B4, F5 }, \
-    { C6, F7, B6 } \
-}
-
 #define ENCODERS_PAD_A { D7, B1 }
 #define ENCODERS_PAD_B { E6, B3 }
 

keyboards/mixi/info.json

@@ -10,6 +10,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D1", "D4", "F4"],
+            ["D0", "B4", "F5"],
+            ["C6", "F7", "B6"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [