Move small macropad-ish layouts to data driven (#20341)

2 files changed, 26 insertions, 28 deletions

diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json
index e6677abc7b..869d4f16a1 100644
--- a/keyboards/tender/macrowo_pad/info.json
+++ b/keyboards/tender/macrowo_pad/info.json
@@ -17,7 +17,32 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 7.25, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 0, "y": 0.5},
+                {"matrix": [0, 5], "x": 2, "y": 0.5},
+                {"matrix": [0, 6], "x": 8.5, "y": 0.5},
+                {"matrix": [0, 7], "x": 10.5, "y": 0.5},
+
+                {"matrix": [0, 8], "x": 3.75, "y": 1},
+                {"matrix": [0, 9], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 0], "x": 5.25, "y": 1.25},
+
+                {"matrix": [1, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 10.5, "y": 1.5},
+
+                {"matrix": [1, 5], "x": 1, "y": 2},
+                {"matrix": [1, 7], "x": 4.25, "y": 2},
+                {"matrix": [1, 8], "x": 6.25, "y": 2},
+                {"matrix": [1, 9], "x": 9.5, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.h b/keyboards/tender/macrowo_pad/macrowo_pad.h
deleted file mode 100644
index b095c037a7..0000000000
--- a/keyboards/tender/macrowo_pad/macrowo_pad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 swiftrax
- *
- * 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 LAYOUT( \
-	K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,  \
-	K10,   K11,   K12,   K13,   K14,   K15,          K17,   K18,   K19   \
-) \
-{ \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09  }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   KC_NO, K17,   K18,   K19  }  \
-}