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

3 files changed, 14 insertions, 52 deletions

diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 824419580c..4986a5974f 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -25,19 +25,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":2, "y":0},
-                {"label":"Enter", "x":0, "y":1},
-                {"label":"KC_0", "x":1, "y":1},
-                {"label":"BackSpace", "x":2, "y":1},
-                {"label":"KC_7", "x":0, "y":2},
-                {"label":"KC_8", "x":1, "y":2},
-                {"label":"KC_9", "x":2, "y":2},
-                {"label":"KC_4", "x":0, "y":3},
-                {"label":"KC_5", "x":1, "y":3},
-                {"label":"KC_6", "x":2, "y":3},
-                {"label":"KC_1", "x":0, "y":4},
-                {"label":"KC_2", "x":1, "y":4},
-                {"label":"KC_3", "x":2, "y":4}
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":0, "y":4, "matrix": [4, 0]},
+                {"x":1, "y":4, "matrix": [4, 1]},
+                {"x":2, "y":4, "matrix": [4, 2]}
             ]
         }
     }
diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c
index a82a2dabb1..5cffdc6c97 100644
--- a/keyboards/adafruit/macropad/macropad.c
+++ b/keyboards/adafruit/macropad/macropad.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "macropad.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/adafruit/macropad/macropad.h b/keyboards/adafruit/macropad/macropad.h
deleted file mode 100644
index 6e2e3524b7..0000000000
--- a/keyboards/adafruit/macropad/macropad.h
+++ /dev/null
@@ -1,38 +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"
-
-#define ___ KC_NO
-
-// clang-format off
- #define LAYOUT(  \
-             K02, \
-   K10, K11, K12, \
-   K20, K21, K22, \
-   K30, K31, K32, \
-   K40, K41, K42  \
- ) \
- { \
-   { ___, ___, K02 }, \
-   { K10, K11, K12 }, \
-   { K20, K21, K22 }, \
-   { K30, K31, K32 }, \
-   { K40, K41, K42 }  \
- }
-// clang-format on