Move single `LAYOUT`s to data driven (#20365)

4 files changed, 161 insertions, 234 deletions

diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 2cc916c7cf..2b7f8fbd71 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -21,85 +21,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.3},
-                {"x": 1, "y": 0.4},
-                {"x": 2, "y": 0.3},
-                {"x": 3, "y": 0.1},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0.1},
-                {"x": 6, "y": 0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.4},
+                {"matrix": [0, 2], "x": 2, "y": 0.3},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
 
-                {"x": 8, "y": 0.25},
-                {"x": 9, "y": 0.1},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0.1},
-                {"x": 12, "y": 0.3},
-                {"x": 13, "y": 0.4},
-                {"x": 14, "y": 0.3},
+                {"matrix": [5, 6], "x": 8, "y": 0.25},
+                {"matrix": [5, 5], "x": 9, "y": 0.1},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0.1},
+                {"matrix": [5, 2], "x": 12, "y": 0.3},
+                {"matrix": [5, 1], "x": 13, "y": 0.4},
+                {"matrix": [5, 0], "x": 14, "y": 0.3},
 
-                {"x": 0, "y": 1.3},
-                {"x": 1, "y": 1.4},
-                {"x": 2, "y": 1.3},
-                {"x": 3, "y": 1.1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1.1},
-                {"x": 6, "y": 1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.4},
+                {"matrix": [1, 2], "x": 2, "y": 1.3},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
 
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1.1},
-                {"x": 12, "y": 1.3},
-                {"x": 13, "y": 1.4},
-                {"x": 14, "y": 1.3},
+                {"matrix": [6, 6], "x": 8, "y": 1.25},
+                {"matrix": [6, 5], "x": 9, "y": 1.1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1.1},
+                {"matrix": [6, 2], "x": 12, "y": 1.3},
+                {"matrix": [6, 1], "x": 13, "y": 1.4},
+                {"matrix": [6, 0], "x": 14, "y": 1.3},
 
-                {"x": 0, "y": 2.3},
-                {"x": 1, "y": 2.4},
-                {"x": 2, "y": 2.3},
-                {"x": 3, "y": 2.1},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2.1},
-                {"x": 6, "y": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.4},
+                {"matrix": [2, 2], "x": 2, "y": 2.3},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
 
-                {"x": 8, "y": 2.25},
-                {"x": 9, "y": 2.1},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2.1},
-                {"x": 12, "y": 2.3},
-                {"x": 13, "y": 2.4},
-                {"x": 14, "y": 2.3},
+                {"matrix": [7, 6], "x": 8, "y": 2.25},
+                {"matrix": [7, 5], "x": 9, "y": 2.1},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2.1},
+                {"matrix": [7, 2], "x": 12, "y": 2.3},
+                {"matrix": [7, 1], "x": 13, "y": 2.4},
+                {"matrix": [7, 0], "x": 14, "y": 2.3},
 
-                {"x": 0, "y": 3.3},
-                {"x": 1, "y": 3.4},
-                {"x": 2, "y": 3.3},
-                {"x": 3, "y": 3.1},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3.1},
-                {"x": 6, "y": 3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.3},
+                {"matrix": [3, 1], "x": 1, "y": 3.4},
+                {"matrix": [3, 2], "x": 2, "y": 3.3},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+                {"matrix": [3, 6], "x": 6, "y": 3.25},
 
-                {"x": 8, "y": 3.25},
-                {"x": 9, "y": 3.1},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3.1},
-                {"x": 12, "y": 3.3},
-                {"x": 13, "y": 3.4},
-                {"x": 14, "y": 3.3},
+                {"matrix": [8, 6], "x": 8, "y": 3.25},
+                {"matrix": [8, 5], "x": 9, "y": 3.1},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3.1},
+                {"matrix": [8, 2], "x": 12, "y": 3.3},
+                {"matrix": [8, 1], "x": 13, "y": 3.4},
+                {"matrix": [8, 0], "x": 14, "y": 3.3},
 
-                {"x": 0, "y": 4.3},
-                {"x": 1, "y": 4.4},
-                {"x": 2, "y": 4.3},
-                {"x": 3, "y": 4.1},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4.1},
-                {"x": 6.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.3},
+                {"matrix": [4, 1], "x": 1, "y": 4.4},
+                {"matrix": [4, 2], "x": 2, "y": 4.3},
+                {"matrix": [4, 3], "x": 3, "y": 4.1},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
 
-                {"x": 7.75, "y": 4.5},
-                {"x": 9, "y": 4.1},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4.1},
-                {"x": 12, "y": 4.3},
-                {"x": 13, "y": 4.4},
-                {"x": 14, "y": 4.3}
+                {"matrix": [9, 6], "x": 7.75, "y": 4.5},
+                {"matrix": [9, 5], "x": 9, "y": 4.1},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4.1},
+                {"matrix": [9, 2], "x": 12, "y": 4.3},
+                {"matrix": [9, 1], "x": 13, "y": 4.4},
+                {"matrix": [9, 0], "x": 14, "y": 4.3}
             ]
         }
     }
diff --git a/keyboards/malevolti/lyra/rev1/rev1.h b/keyboards/malevolti/lyra/rev1/rev1.h
deleted file mode 100644
index 021350f106..0000000000
--- a/keyboards/malevolti/lyra/rev1/rev1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Domanic Calleja
-  * 
-  * 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( \
-	L00, L01, L02, L03, L04, L05, L06,          R00, R01, R02, R03, R04, R05, R06,	\
-	L10, L11, L12, L13, L14, L15, L16,          R10, R11, R12, R13, R14, R15, R16,  \
-	L20, L21, L22, L23, L24, L25, L26,          R20, R21, R22, R23, R24, R25, R26,	\
-	L30, L31, L32, L33, L34, L35, L36,			R30, R31, R32, R33, R34, R35, R36,	\
-	L40, L41, L42, L43, L44, L45, L46,			R40, R41, R42, R43, R44, R45, R46	\
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ L40, L41, L42, L43, L44, L45, L46 }, \
-		{ R06, R05, R04, R03, R02, R01, R00 }, \
-		{ R16, R15, R14, R13, R12, R11, R10 }, \
-		{ R26, R25, R24, R23, R22, R21, R20 }, \
-		{ R36, R35, R34, R33, R32, R31, R30 }, \
-		{ R46, R45, R44, R43, R42, R41, R40 }	\
-	}
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
index 1c0e9c72bc..59cd50af42 100644
--- a/keyboards/malevolti/superlyra/rev1/info.json
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -18,111 +18,111 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 0, "y": 0.3 },
-                { "x": 1, "y": 0.4 },
-                { "x": 2, "y": 0.3 },
-                { "x": 3, "y": 0.1 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0.1 },
-                { "x": 6, "y": 0.25 },				
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.4},
+                {"matrix": [0, 2], "x": 2, "y": 0.3},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
 
-                { "x": 8, "y": 0.25 },
-                { "x": 9, "y": 0.25 },
-                { "x": 10, "y": 0.25 },
-                { "x": 11, "y": 0.25 },
+                {"matrix": [0, 7], "x": 8, "y": 0.25},
+                {"matrix": [0, 8], "x": 9, "y": 0.25},
+                {"matrix": [0, 9], "x": 10, "y": 0.25},
+                {"matrix": [0, 10], "x": 11, "y": 0.25},
 
-                { "x": 13, "y": 0.25 },
-                { "x": 14, "y": 0.1 },
-                { "x": 15, "y": 0 },				
-                { "x": 16, "y": 0.1 },
-                { "x": 17, "y": 0.3 },                
-                { "x": 18, "y": 0.4 },
-                { "x": 19, "y": 0.3 },
+                {"matrix": [0, 11], "x": 13, "y": 0.25},
+                {"matrix": [0, 12], "x": 14, "y": 0.1},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0.1},
+                {"matrix": [0, 15], "x": 17, "y": 0.3},
+                {"matrix": [0, 16], "x": 18, "y": 0.4},
+                {"matrix": [0, 17], "x": 19, "y": 0.3},
 
-                { "x": 0, "y": 1.3 },                
-                { "x": 1, "y": 1.4 },
-                { "x": 2, "y": 1.3 },
-                { "x": 3, "y": 1.1 },                
-                { "x": 4, "y": 1 },
-                { "x": 5, "y": 1.1 },
-                { "x": 6, "y": 1.25 },
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.4},
+                {"matrix": [1, 2], "x": 2, "y": 1.3},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
 
-                { "x": 8, "y": 1.25 },
-                { "x": 9, "y": 1.25 },
-                { "x": 10, "y": 1.25 },
-                { "x": 11, "y": 1.25 },
+                {"matrix": [1, 7], "x": 8, "y": 1.25},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [1, 9], "x": 10, "y": 1.25},
+                {"matrix": [1, 10], "x": 11, "y": 1.25},
 
-                { "x": 13, "y": 1.25 },
-                { "x": 14, "y": 1.1 },
-                { "x": 15, "y": 1 },
-                { "x": 16, "y": 1.1 },
-                { "x": 17, "y": 1.3 },
-                { "x": 18, "y": 1.4 },
-                { "x": 19, "y": 1.3 },
+                {"matrix": [1, 11], "x": 13, "y": 1.25},
+                {"matrix": [1, 12], "x": 14, "y": 1.1},
+                {"matrix": [1, 13], "x": 15, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1.1},
+                {"matrix": [1, 15], "x": 17, "y": 1.3},
+                {"matrix": [1, 16], "x": 18, "y": 1.4},
+                {"matrix": [1, 17], "x": 19, "y": 1.3},
 
-                { "x": 0, "y": 2.3 },
-                { "x": 1, "y": 2.4 },
-                { "x": 2, "y": 2.3 },
-                { "x": 3, "y": 2.1 },
-                { "x": 4, "y": 2 },
-                { "x": 5, "y": 2.1 },
-                { "x": 6, "y": 2.25 },
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.4},
+                {"matrix": [2, 2], "x": 2, "y": 2.3},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
 
-                { "x": 8, "y": 2.25 },
-                { "x": 9, "y": 2.25 },
-                { "x": 10, "y": 2.25 },
-                { "x": 11, "y": 2.25 },
+                {"matrix": [2, 7], "x": 8, "y": 2.25},
+                {"matrix": [2, 8], "x": 9, "y": 2.25},
+                {"matrix": [2, 9], "x": 10, "y": 2.25},
+                {"matrix": [2, 10], "x": 11, "y": 2.25},
 
-                { "x": 13, "y": 2.25 },
-                { "x": 14, "y": 2.1 },
-                { "x": 15, "y": 2 },
-                { "x": 16, "y": 2.1 },
-                { "x": 17, "y": 2.3 },
-                { "x": 18, "y": 2.4 },
-                { "x": 19, "y": 2.3 },
+                {"matrix": [2, 11], "x": 13, "y": 2.25},
+                {"matrix": [2, 12], "x": 14, "y": 2.1},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2.1},
+                {"matrix": [2, 15], "x": 17, "y": 2.3},
+                {"matrix": [2, 16], "x": 18, "y": 2.4},
+                {"matrix": [2, 17], "x": 19, "y": 2.3},
 
-                { "x": 0, "y": 3.3 },
-                { "x": 1, "y": 3.4 },
-                { "x": 2, "y": 3.3 },
-                { "x": 3, "y": 3.1 },
-                { "x": 4, "y": 3 },
-                { "x": 5, "y": 3.1 },
-                { "x": 6, "y": 3.25 },
+                {"matrix": [3, 0], "x": 0, "y": 3.3},
+                {"matrix": [3, 1], "x": 1, "y": 3.4},
+                {"matrix": [3, 2], "x": 2, "y": 3.3},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+                {"matrix": [3, 6], "x": 6, "y": 3.25},
 
-                { "x": 8, "y": 3.25 },
-                { "x": 9, "y": 3.25 },
-                { "x": 10, "y": 3.25 },
-                { "x": 11, "y": 3.25 },	
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
 
-                { "x": 13, "y": 3.25 },
-                { "x": 14, "y": 3.1 },				
-                { "x": 15, "y": 3 },
-                { "x": 16, "y": 3.1 },
-                { "x": 17, "y": 3.3 },
-                { "x": 18, "y": 3.4 },
-                { "x": 19, "y": 3.3 },
+                {"matrix": [3, 11], "x": 13, "y": 3.25},
+                {"matrix": [3, 12], "x": 14, "y": 3.1},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+                {"matrix": [3, 14], "x": 16, "y": 3.1},
+                {"matrix": [3, 15], "x": 17, "y": 3.3},
+                {"matrix": [3, 16], "x": 18, "y": 3.4},
+                {"matrix": [3, 17], "x": 19, "y": 3.3},
 
-                { "x": 0, "y": 4.3 },
-                { "x": 1, "y": 4.4 },
-                { "x": 2, "y": 4.3 },
-                { "x": 3, "y": 4.1 },
-                { "x": 4, "y": 4 },
-                { "x": 5, "y": 4.1 },
-                { "x": 6.25, "y": 4.5, "w": 1.5 },
+                {"matrix": [4, 0], "x": 0, "y": 4.3},
+                {"matrix": [4, 1], "x": 1, "y": 4.4},
+                {"matrix": [4, 2], "x": 2, "y": 4.3},
+                {"matrix": [4, 3], "x": 3, "y": 4.1},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5, "w": 1.5},
 
-                { "x": 8, "y": 4.25 },
-                { "x": 9, "y": 4.25 },
-                { "x": 10, "y": 4.25 },
-                { "x": 11, "y": 4.25 },
-				
-                { "x": 12.25, "y": 4.5, "w": 1.5 },
-                { "x": 14, "y": 4.1 },                
-                { "x": 15, "y": 4 },
-                { "x": 16, "y": 4.1 },
-                { "x": 17, "y": 4.3 },
-                { "x": 18, "y": 4.4 },
-                { "x": 19, "y": 4.3 }
+                {"matrix": [4, 7], "x": 8, "y": 4.25},
+                {"matrix": [4, 8], "x": 9, "y": 4.25},
+                {"matrix": [4, 9], "x": 10, "y": 4.25},
+                {"matrix": [4, 10], "x": 11, "y": 4.25},
 
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 14, "y": 4.1},
+                {"matrix": [4, 13], "x": 15, "y": 4},
+                {"matrix": [4, 14], "x": 16, "y": 4.1},
+                {"matrix": [4, 15], "x": 17, "y": 4.3},
+                {"matrix": [4, 16], "x": 18, "y": 4.4},
+                {"matrix": [4, 17], "x": 19, "y": 4.3}
             ]
         }
     }
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.h b/keyboards/malevolti/superlyra/rev1/rev1.h
deleted file mode 100644
index fd3c819e11..0000000000
--- a/keyboards/malevolti/superlyra/rev1/rev1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Domanic Calleja
-  * 
-  * 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, K16, K17,	\
-    K18, K19, K20, K21, K22, K23, K24,   K25, K26, K27, K28,   K29, K30, K31, K32, K33, K34, K35,   \
-    K36, K37, K38, K39, K40, K41, K42,   K43, K44, K45, K46,   K47, K48, K49, K50, K51, K52, K53,   \
-    K54, K55, K56, K57, K58, K59, K60,   K61, K62, K63, K64,   K65, K66, K67, K68, K69, K70, K71,   \
-    K72, K73, K74, K75, K76, K77, K78,   K79, K80, K81, K82,   K83, K84, K85, K86, K87, K88, K89   \
-	) \
-	{ \
-        { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17 },	\
-        { K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35 },   \
-        { K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53 },   \
-        { K54, K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71 },   \
-        { K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 }   \
-	}