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

4 files changed, 17 insertions, 70 deletions

diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json
index a5db1935cb..fe20e701ba 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/info.json
@@ -27,16 +27,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.5, "y":0, "w":1.25, "h":2},
+                {"matrix": [2, 1], "x": 0, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1}
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [2, 0], "x": 4.5, "y": 0, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 2], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1}
             ]
         }
     }
diff --git a/keyboards/merge/iso_macro/iso_macro.h b/keyboards/merge/iso_macro/iso_macro.h
deleted file mode 100644
index dfa9386449..0000000000
--- a/keyboards/merge/iso_macro/iso_macro.h
+++ /dev/null
@@ -1,29 +0,0 @@
- /* Copyright 2021 duoshock 
-  * 
-  * 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( \
-      k21, k00, k01, k02, k20, \
-      k22, k10, k11, k12 \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }  \
-} 
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index 983d4e61fc..807a8ed980 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -22,11 +22,12 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout":   [
-        {"label":"0", "x":0, "y":0},
-        {"label":"1", "x":1.25, "y":0},
-        {"label":"2", "x":2.25, "y":0},
-        {"label":"3", "x":3.25, "y":0}
+      "layout": [
+        {"matrix": [1, 1], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [1, 0], "x": 3.25, "y": 0}
       ]
     }
   }
diff --git a/keyboards/merge/uc1/uc1.h b/keyboards/merge/uc1/uc1.h
deleted file mode 100644
index 84e655d1b9..0000000000
--- a/keyboards/merge/uc1/uc1.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 duoshock 
-  * 
-  * 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( \
-      k11, k00, k01, k10 \
-) \
-{ \
-    { k00, k01 }, \
-    { k10, k11 }  \
-}