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

2 files changed, 63 insertions, 93 deletions

diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/info.json
index c5449eab0b..6a1347cdf6 100644
--- a/keyboards/ffkeebs/siris/info.json
+++ b/keyboards/ffkeebs/siris/info.json
@@ -24,66 +24,73 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0.375},
-                {"label":"0,1", "x":1, "y":0.375},
-                {"label":"0,2", "x":2, "y":0.125},
-                {"label":"0,3", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0.125},
-                {"label":"0,5", "x":5, "y":0.25},
-                {"label":"0,6", "x":10, "y":0.25},
-                {"label":"0,7", "x":11, "y":0.125},
-                {"label":"0,8", "x":12, "y":0},
-                {"label":"0,9", "x":13, "y":0.125},
-                {"label":"0,10", "x":14, "y":0.375},
-                {"label":"0,11", "x":15, "y":0.375},
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
 
-                {"label":"1,0", "x":0, "y":1.375},
-                {"label":"1,1", "x":1, "y":1.375},
-                {"label":"1,2", "x":2, "y":1.125},
-                {"label":"1,3", "x":3, "y":1},
-                {"label":"1,4", "x":4, "y":1.125},
-                {"label":"1,5", "x":5, "y":1.25},
-                {"label":"1,6", "x":10, "y":1.25},
-                {"label":"1,7", "x":11, "y":1.125},
-                {"label":"1,8", "x":12, "y":1},
-                {"label":"1,9", "x":13, "y":1.125},
-                {"label":"1,10", "x":14, "y":1.375},
-                {"label":"1,11", "x":15, "y":1.375},
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.125},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [0, 9], "x": 13, "y": 0.125},
+                {"matrix": [0, 10], "x": 14, "y": 0.375},
+                {"matrix": [0, 11], "x": 15, "y": 0.375},
 
-                {"label":"2,0", "x":0, "y":2.375},
-                {"label":"2,1", "x":1, "y":2.375},
-                {"label":"2,2", "x":2, "y":2.125},
-                {"label":"2,3", "x":3, "y":2},
-                {"label":"2,4", "x":4, "y":2.125},
-                {"label":"2,5", "x":5, "y":2.25},
-                {"label":"4,5", "x":6.25, "y":2.625},
-                {"label":"4,6", "x":8.75, "y":2.625},
-                {"label":"2,6", "x":10, "y":2.25},
-                {"label":"2,7", "x":11, "y":2.125},
-                {"label":"2,8", "x":12, "y":2},
-                {"label":"2,9", "x":13, "y":2.125},
-                {"label":"2,10", "x":14, "y":2.375},
-                {"label":"2,11", "x":15, "y":2.375},
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
 
-                {"label":"3,0", "x":0, "y":3.375},
-                {"label":"3,1", "x":1, "y":3.375},
-                {"label":"3,2", "x":2, "y":3.125},
-                {"label":"3,3", "x":3, "y":3},
-                {"label":"3,4", "x":4, "y":3.125},
-                {"label":"3,5", "x":5, "y":3.25},
-                {"label":"3,6", "x":10, "y":3.25},
-                {"label":"3,7", "x":11, "y":3.125},
-                {"label":"3,8", "x":12, "y":3},
-                {"label":"3,9", "x":13, "y":3.125},
-                {"label":"3,10", "x":14, "y":3.375},
-                {"label":"3,11", "x":15, "y":3.375},
+                {"matrix": [1, 6], "x": 10, "y": 1.25},
+                {"matrix": [1, 7], "x": 11, "y": 1.125},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1.125},
+                {"matrix": [1, 10], "x": 14, "y": 1.375},
+                {"matrix": [1, 11], "x": 15, "y": 1.375},
 
-                {"label":"4,2", "x":3.75, "y":4.15},
-                {"label":"4,3", "x":4.75, "y":4.25},
-                {"x":6, "y":4.5, "w":1.5},
-                {"x":8.5, "y":4.5, "w":1.5},
-                {"label":"4,8", "x":10.25, "y":4.25},
-                {"label":"4,0", "x":11.25, "y":4.15}
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 2.625},
+
+                {"matrix": [4, 6], "x": 8.75, "y": 2.625},
+                {"matrix": [2, 6], "x": 10, "y": 2.25},
+                {"matrix": [2, 7], "x": 11, "y": 2.125},
+                {"matrix": [2, 8], "x": 12, "y": 2},
+                {"matrix": [2, 9], "x": 13, "y": 2.125},
+                {"matrix": [2, 10], "x": 14, "y": 2.375},
+                {"matrix": [2, 11], "x": 15, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 10, "y": 3.25},
+                {"matrix": [3, 7], "x": 11, "y": 3.125},
+                {"matrix": [3, 8], "x": 12, "y": 3},
+                {"matrix": [3, 9], "x": 13, "y": 3.125},
+                {"matrix": [3, 10], "x": 14, "y": 3.375},
+                {"matrix": [3, 11], "x": 15, "y": 3.375},
+
+                {"matrix": [4, 2], "x": 3.75, "y": 4.15},
+                {"matrix": [4, 3], "x": 4.75, "y": 4.25},
+
+                {"matrix": [4, 4], "x": 6, "y": 4.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 8.5, "y": 4.5, "w": 1.5},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4.15}
             ]
         }
     }
diff --git a/keyboards/ffkeebs/siris/siris.h b/keyboards/ffkeebs/siris/siris.h
deleted file mode 100644
index 13956bcceb..0000000000
--- a/keyboards/ffkeebs/siris/siris.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05,           K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K45, K46, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34, K35,           K36, K37, K38, K39, K3A, K3B, \
-                        K42, K43, K44, K47, K48, K49                      \
-) { \
-    { K00, K01, K02, K03, K04, K05,     K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15,     K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25,     K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, K34, K35,     K36, K37, K38, K39, K3A, K3B }, \
-    { XXX, XXX, K42, K43, K44, K45,     K46, K47, K48, K49, XXX, XXX }  \
-}