Move miscellaneous layouts to data driven (#20516)

3 files changed, 116 insertions, 45 deletions

diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index 9b7e73b2da..fb2b86f9b1 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -28,7 +28,121 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_rspace_split_bksp": {
-            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"F1", "x":2.75, "y":0}, {"label":"F2", "x":3.75, "y":0}, {"label":"F3", "x":4.75, "y":0}, {"label":"F4", "x":5.75, "y":0}, {"label":"F5", "x":7, "y":0}, {"label":"F6", "x":8, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.5, "y":0}, {"label":"F10", "x":13.5, "y":0}, {"label":"F11", "x":14.5, "y":0}, {"label":"F12", "x":15.5, "y":0}, {"label":"Del", "x":16.75, "y":0}, {"label":"Encoder", "x":18.25, "y":0}, {"label":"~", "x":1.5, "y":1.25}, {"label":"!", "x":2.5, "y":1.25}, {"label":"@", "x":3.5, "y":1.25}, {"label":"#", "x":4.5, "y":1.25}, {"label":"$", "x":5.5, "y":1.25}, {"label":"%", "x":6.5, "y":1.25}, {"label":"^", "x":7.5, "y":1.25}, {"label":"&", "x":9.75, "y":1.25}, {"label":"*", "x":10.75, "y":1.25}, {"label":"(", "x":11.75, "y":1.25}, {"label":")", "x":12.75, "y":1.25}, {"label":"_", "x":13.75, "y":1.25}, {"label":"+", "x":14.75, "y":1.25}, {"label":"~", "x":15.75, "y":1.25}, {"label":"Bksp", "x":16.75, "y":1.25}, {"label":"Home", "x":18.25, "y":1.25}, {"label":"M0", "x":0, "y":2.25}, {"label":"Tab", "x":1.5, "y":2.25, "w":1.5}, {"label":"Q", "x":3, "y":2.25}, {"label":"W", "x":4, "y":2.25}, {"label":"E", "x":5, "y":2.25}, {"label":"R", "x":6, "y":2.25}, {"label":"T", "x":7, "y":2.25}, {"label":"Y", "x":9.25, "y":2.25}, {"label":"U", "x":10.25, "y":2.25}, {"label":"I", "x":11.25, "y":2.25}, {"label":"O", "x":12.25, "y":2.25}, {"label":"P", "x":13.25, "y":2.25}, {"label":"{", "x":14.25, "y":2.25}, {"label":"}", "x":15.25, "y":2.25}, {"label":"|", "x":16.25, "y":2.25, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2.25}, {"label":"M1", "x":0, "y":3.25}, {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75}, {"label":"A", "x":3.25, "y":3.25}, {"label":"S", "x":4.25, "y":3.25}, {"label":"D", "x":5.25, "y":3.25}, {"label":"F", "x":6.25, "y":3.25}, {"label":"G", "x":7.25, "y":3.25}, {"label":"H", "x":9.5, "y":3.25}, {"label":"J", "x":10.5, "y":3.25}, {"label":"K", "x":11.5, "y":3.25}, {"label":"L", "x":12.5, "y":3.25}, {"label":":", "x":13.5, "y":3.25}, {"label":"\"", "x":14.5, "y":3.25}, {"label":"Enter", "x":15.5, "y":3.25, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3.25}, {"label":"M2", "x":0, "y":4.25}, {"label":"Shift", "x":1.5, "y":4.25, "w":2.25}, {"label":"Z", "x":3.75, "y":4.25}, {"label":"X", "x":4.75, "y":4.25}, {"label":"C", "x":5.75, "y":4.25}, {"label":"V", "x":6.75, "y":4.25}, {"label":"B", "x":7.75, "y":4.25}, {"label":"N", "x":10, "y":4.25}, {"label":"M", "x":11, "y":4.25}, {"label":"<", "x":12, "y":4.25}, {"label":">", "x":13, "y":4.25}, {"label":"?", "x":14, "y":4.25}, {"label":"Shift", "x":15, "y":4.25, "w":1.75}, {"label":"\u2191", "x":17, "y":4.5}, {"label":"M3", "x":0, "y":5.25}, {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25}, {"label":"Win", "x":2.75, "y":5.25, "w":1.25}, {"label":"Alt", "x":4, "y":5.25, "w":1.25}, {"x":5.25, "y":5.25, "w":1.25}, {"x":6.5, "y":5.25, "w":2.25}, {"x":10, "y":5.25, "w":2.75}, {"label":"Alt", "x":12.75, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":14.25, "y":5.25, "w":1.5}, {"label":"\u2190", "x":16, "y":5.5}, {"label":"\u2193", "x":17, "y":5.5}, {"label":"\u2192", "x":18, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 7, "y": 0},
+                {"matrix": [0, 6], "x": 8, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+
+                {"matrix": [6, 2], "x": 12.5, "y": 0},
+                {"matrix": [6, 3], "x": 13.5, "y": 0},
+                {"matrix": [6, 4], "x": 14.5, "y": 0},
+                {"matrix": [6, 5], "x": 15.5, "y": 0},
+
+                {"matrix": [6, 6], "x": 16.75, "y": 0},
+
+                {"matrix": [6, 7], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 1.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 1.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 1.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 1.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 1.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 1.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 1.25},
+
+                {"matrix": [9, 7], "x": 18.25, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 0, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [2, 2], "x": 4, "y": 2.25},
+                {"matrix": [2, 3], "x": 5, "y": 2.25},
+                {"matrix": [2, 4], "x": 6, "y": 2.25},
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 9.25, "y": 2.25},
+                {"matrix": [8, 1], "x": 10.25, "y": 2.25},
+                {"matrix": [8, 2], "x": 11.25, "y": 2.25},
+                {"matrix": [8, 3], "x": 12.25, "y": 2.25},
+                {"matrix": [8, 4], "x": 13.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 14.25, "y": 2.25},
+                {"matrix": [8, 6], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 7], "x": 16.25, "y": 2.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 18.25, "y": 2.25},
+
+                {"matrix": [3, 7], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 3.25},
+                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 12.5, "y": 3.25},
+                {"matrix": [9, 4], "x": 13.5, "y": 3.25},
+                {"matrix": [9, 5], "x": 14.5, "y": 3.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 3.25, "w": 2.25},
+
+                {"matrix": [11, 7], "x": 18.25, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 7.75, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 4.25},
+                {"matrix": [10, 1], "x": 11, "y": 4.25},
+                {"matrix": [10, 2], "x": 12, "y": 4.25},
+                {"matrix": [10, 3], "x": 13, "y": 4.25},
+                {"matrix": [10, 4], "x": 14, "y": 4.25},
+                {"matrix": [10, 5], "x": 15, "y": 4.25, "w": 1.75},
+
+                {"matrix": [11, 6], "x": 17, "y": 4.5},
+
+                {"matrix": [5, 7], "x": 0, "y": 5.25},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 5.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6.5, "y": 5.25, "w": 2.25},
+
+                {"matrix": [11, 0], "x": 10, "y": 5.25, "w": 2.75},
+                {"matrix": [11, 1], "x": 12.75, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 2], "x": 14.25, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 3], "x": 16, "y": 5.5},
+                {"matrix": [11, 4], "x": 17, "y": 5.5},
+                {"matrix": [11, 5], "x": 18, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/merge/um80/um80.c b/keyboards/merge/um80/um80.c
index 557197c89d..d13f34562c 100644
--- a/keyboards/merge/um80/um80.c
+++ b/keyboards/merge/um80/um80.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "um80.h"
+#include "quantum.h"
 
 #ifndef WPM_ENABLE
 #    define get_current_wpm() 0
diff --git a/keyboards/merge/um80/um80.h b/keyboards/merge/um80/um80.h
deleted file mode 100644
index 9e17b70021..0000000000
--- a/keyboards/merge/um80/um80.h
+++ /dev/null
@@ -1,43 +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 XXX KC_NO
-
-#define LAYOUT_rspace_split_bksp( \
-            L00,   L01, L02, L03, L04,   L05, L06,            R00, R01,   R02, R03, R04, R05,    R06,   R07, \
-            L10, L11, L12, L13, L14, L15, L16,              R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
-    L27,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26, R27,     R47, \
-    L37,    L30, L31, L32, L33, L34, L35,                   R30, R31, R32, R33, R34, R35, R36,          R57, \
-    L47,    L40, L41, L42, L43, L44, L45,                   R40, R41, R42, R43, R44, R45,                    R56,\
-    L57,    L50, L51, L52, L53, L54,                        R50, R51, R52,                              R53, R54, R55 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, L16, XXX }, \
-    { L20, L21, L22, L23, L24, L25, XXX, L27 }, \
-    { L30, L31, L32, L33, L34, L35, XXX, L37 }, \
-    { L40, L41, L42, L43, L44, L45, XXX, L47 }, \
-    { L50, L51, L52, L53, L54, XXX, XXX, L57 }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, R44, R45, XXX, R47 }, \
-    { R50, R51, R52, R53, R54, R55, R56, R57 } \
-}