Move layouts for direct_pins boards to data driven (#19872)

3 files changed, 19 insertions, 51 deletions

diff --git a/keyboards/makeymakey/info.json b/keyboards/makeymakey/info.json
index c3114dd744..19e3f7e858 100644
--- a/keyboards/makeymakey/info.json
+++ b/keyboards/makeymakey/info.json
@@ -21,24 +21,24 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1, "y":0},
-          {"x":2, "y":0},
-          {"x":3, "y":0},
-          {"x":4, "y":0},
-          {"x":5, "y":0},
-          {"x":0, "y":1},
-          {"x":1, "y":1},
-          {"x":2, "y":1},
-          {"x":3, "y":1},
-          {"x":4, "y":1},
-          {"x":5, "y":1},
-          {"x":0, "y":2},
-          {"x":1, "y":2},
-          {"x":2, "y":2},
-          {"x":3, "y":2},
-          {"x":4, "y":2},
-          {"x":5, "y":2}
+          {"x":0, "y":0, "matrix": [0, 0]},
+          {"x":1, "y":0, "matrix": [0, 1]},
+          {"x":2, "y":0, "matrix": [0, 2]},
+          {"x":3, "y":0, "matrix": [0, 3]},
+          {"x":4, "y":0, "matrix": [0, 4]},
+          {"x":5, "y":0, "matrix": [0, 5]},
+          {"x":0, "y":1, "matrix": [1, 0]},
+          {"x":1, "y":1, "matrix": [1, 1]},
+          {"x":2, "y":1, "matrix": [1, 2]},
+          {"x":3, "y":1, "matrix": [1, 3]},
+          {"x":4, "y":1, "matrix": [1, 4]},
+          {"x":5, "y":1, "matrix": [1, 5]},
+          {"x":0, "y":2, "matrix": [2, 0]},
+          {"x":1, "y":2, "matrix": [2, 1]},
+          {"x":2, "y":2, "matrix": [2, 2]},
+          {"x":3, "y":2, "matrix": [2, 3]},
+          {"x":4, "y":2, "matrix": [2, 4]},
+          {"x":5, "y":2, "matrix": [2, 5]}
         ]
       }
     }
diff --git a/keyboards/makeymakey/makeymakey.c b/keyboards/makeymakey/makeymakey.c
index ade9200de4..5b8edd4655 100644
--- a/keyboards/makeymakey/makeymakey.c
+++ b/keyboards/makeymakey/makeymakey.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "makeymakey.h"
+#include "quantum.h"
 
 static pin_t pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
 static pin_t led_pins[LED_PINS] = LED_PINS_HW;
diff --git a/keyboards/makeymakey/makeymakey.h b/keyboards/makeymakey/makeymakey.h
deleted file mode 100644
index 9b8c273d86..0000000000
--- a/keyboards/makeymakey/makeymakey.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@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
-
-#include "quantum.h"
-
-// clang-format off
- #define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, \
-    K10, K11, K12, K13, K14, K15, \
-    K20, K21, K22, K23, K24, K25  \
- ) \
- { \
-    { K00, K01, K02, K03, K04, K05 }, \
-    { K10, K11, K12, K13, K14, K15 }, \
-    { K20, K21, K22, K23, K24, K25 }  \
- }
-// clang-format on