Move miscellaneous layouts to data driven (#20516)

3 files changed, 95 insertions, 210 deletions

diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json
index 5fb86fecb7..c23f85776b 100644
--- a/keyboards/macro1/info.json
+++ b/keyboards/macro1/info.json
@@ -20,83 +20,99 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "layouts":{
-      "LAYOUT_numpad":{
-        "layout":[
-          {"label":"Mute", "x":0, "y":0}, 
-          {"label":"Play", "x":2, "y":0}, 
-          {"label":"Backspace", "x":3, "y":0}, 
-          {"label":"Numlock", "x":0, "y":1}, 
-          {"label":"/", "x":1, "y":1}, 
-          {"label":"*", "x":2, "y":1},
-          {"label":"-", "x":3, "y":1}, 
-          {"label":"7", "x":0, "y":2}, 
-          {"label":"8", "x":1, "y":2}, 
-          {"label":"9", "x":2, "y":2}, 
-          {"label":"+", "x":3, "y":2, "h":2},
-          {"label":"4", "x":0, "y":3}, 
-          {"label":"5", "x":1, "y":3}, 
-          {"label":"6", "x":2, "y":3}, 
-          {"label":"1", "x":0, "y":4}, 
-          {"label":"2", "x":1, "y":4}, 
-          {"label":"3", "x":2, "y":4}, 
-          {"label":"Enter", "x":3, "y":4, "h":2}, 
-          {"label":"0", "x":0, "y":5, "w":2}, 
-          {"label":".", "x":2, "y":5}
-        ]
-      }, 
-
-      "LAYOUT_southpaw":{
-        "layout":[
-          {"label":"Mute", "x":0, "y":0}, 
-          {"label":"Play", "x":2, "y":0}, 
-          {"label":"Backspace", "x":3, "y":0}, 
-          {"label":"Numlock", "x":0, "y":1}, 
-          {"label":"/", "x":1, "y":1}, 
-          {"label":"*", "x":2, "y":1},
-          {"label":"-", "x":3, "y":1}, 
-          {"label":"+", "x":0, "y":2, "h":2}, 
-          {"label":"7", "x":1, "y":2}, 
-          {"label":"8", "x":2, "y":2}, 
-          {"label":"9", "x":3, "y":2},
-          {"label":"4", "x":1, "y":3}, 
-          {"label":"5", "x":2, "y":3}, 
-          {"label":"6", "x":3, "y":3}, 
-          {"label":"Enter", "x":0, "y":4, "h":2}, 
-          {"label":"1", "x":1, "y":4}, 
-          {"label":"2", "x":2, "y":4}, 
-          {"label":"3", "x":3, "y":4}, 
-          {"label":".", "x":1, "y":5}, 
-          {"label":"0", "x":2, "y":5, "w":2}
-        ]
-      },
-
-      "LAYOUT_macropad":{
-        "layout":[
-          {"label":"Mute", "x":0, "y":0}, 
-          {"label":"F1", "x":2, "y":0}, 
-          {"label":"F2", "x":3, "y":0}, 
-          {"label":"F3", "x":0, "y":1}, 
-          {"label":"F4", "x":1, "y":1}, 
-          {"label":"F5", "x":2, "y":1},
-          {"label":"F6", "x":3, "y":1}, 
-          {"label":"F7", "x":0, "y":2}, 
-          {"label":"F8", "x":1, "y":2}, 
-          {"label":"F9", "x":2, "y":2}, 
-          {"label":"F10", "x":3, "y":2},
-          {"label":"F11", "x":0, "y":3}, 
-          {"label":"F12", "x":1, "y":3}, 
-          {"label":"F13", "x":2, "y":3}, 
-          {"label":"F14", "x":3, "y":3}, 
-          {"label":"F15", "x":0, "y":4}, 
-          {"label":"F16", "x":1, "y":4}, 
-          {"label":"F17", "x":2, "y":4}, 
-          {"label":"F18", "x":3, "y":4}, 
-          {"label":"F19", "x":0, "y":5}, 
-          {"label":"F20", "x":1, "y":5},
-          {"label":"F21", "x":2, "y":5}, 
-          {"label":"F22", "x":3, "y":5}  
-        ]
-      } 
-  }
+    "layouts": {
+        "LAYOUT_numpad": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5}
+            ]
+        },
+        "LAYOUT_southpaw": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "h": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5, "w": 2}
+            ]
+        },
+        "LAYOUT_macropad": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5}
+            ]
+        }
+    }
 }
\ No newline at end of file
diff --git a/keyboards/macro1/macro1.c b/keyboards/macro1/macro1.c
deleted file mode 100644
index a9cba4ecfa..0000000000
--- a/keyboards/macro1/macro1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Laneware Peripherals
- *
- * 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/>.
- */
-#include "macro1.h"
diff --git a/keyboards/macro1/macro1.h b/keyboards/macro1/macro1.h
deleted file mode 100644
index 1066258050..0000000000
--- a/keyboards/macro1/macro1.h
+++ /dev/null
@@ -1,115 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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"
-
-/* KEYMAP_numpad
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K02│K03│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * ├───┼───┼───┤   │ 
- * │K30│K31│K32│   │
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * ├───┴───┼───┤   │ 
- * │K50    │K52│   │
- * └───────┴───┴───┘
- */
-#define LAYOUT_numpad( \
-	K00,      K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32,      \
-	K40, K41, K42, K43, \
-	K50,      K52  \
-) { \
-	{ K00,   KC_NO, K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   KC_NO }, \
-	{ K40,   K41,   K42,   K43 }, \
-	{ K50,   KC_NO, K52,   KC_NO }  \
-}
-
-/* KEYMAP_southpaw
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K02│K03│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * │   ├───┼───┼───┤ 
- * │   │K31│K32│K33│
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * │   ├───┼───┴───┤ 
- * │   │K51│K52    │
- * └───┴───┴───────┘
- */
-#define LAYOUT_southpaw( \
-	K00,      K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	     K31, K32, K33, \
-	K40, K41, K42, K43, \
-	     K51, K52  \
-) { \
-	{ K00,   KC_NO, K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ KC_NO, K31,   K32,   K33 }, \
-	{ K40,   K41,   K42,   K43 }, \
-	{ KC_NO, K51,   K52,   KC_NO }  \
-}
-
-/* KEYMAP_macropad
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K01│K02│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * ├───┼───┼───┼───┤ 
- * │K30│K31│K32│K33│
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * ├───┼───┼───┼───┤ 
- * │K50│K51│K52│K53│
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_macropad( \
-	K00,      K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43, \
-	K50, K51, K52, K53  \
-) { \
-	{ K00,   KC_NO,  K02,  K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }, \
-	{ K40,   K41,   K42,   K43 }, \
-	{ K50,   K51,   K52,   K53 }  \
-}