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

2 files changed, 58 insertions, 98 deletions

diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json
index 9978f4dd55..78794cbddb 100644
--- a/keyboards/clickety_split/leeloo/info.json
+++ b/keyboards/clickety_split/leeloo/info.json
@@ -33,73 +33,73 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0.5},
-        {"label":"1", "x":1, "y":0.4},
-        {"label":"2", "x":2, "y":0.2},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0.2},
-        {"label":"5", "x":5, "y":0.4},
+        {"matrix": [0, 0], "x": 0, "y": 0.5},
+        {"matrix": [0, 1], "x": 1, "y": 0.4},
+        {"matrix": [0, 2], "x": 2, "y": 0.2},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.2},
+        {"matrix": [0, 5], "x": 5, "y": 0.4},
 
-        {"label":"6", "x":9, "y":0.4},
-        {"label":"7", "x":10, "y":0.2},
-        {"label":"8", "x":11, "y":0},
-        {"label":"9", "x":12, "y":0.2},
-        {"label":"0", "x":13, "y":0.4},
-        {"label":"Back Slash", "x":14, "y":0.5},
+        {"matrix": [5, 5], "x": 9, "y": 0.4},
+        {"matrix": [5, 4], "x": 10, "y": 0.2},
+        {"matrix": [5, 3], "x": 11, "y": 0},
+        {"matrix": [5, 2], "x": 12, "y": 0.2},
+        {"matrix": [5, 1], "x": 13, "y": 0.4},
+        {"matrix": [5, 0], "x": 14, "y": 0.5},
 
-        {"label":"TAB", "x":0, "y":1.5},
-        {"label":"Q", "x":1, "y":1.4},
-        {"label":"W", "x":2, "y":1.2},
-        {"label":"E", "x":3, "y":1},
-        {"label":"R", "x":4, "y":1.2},
-        {"label":"T", "x":5, "y":1.4},
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.4},
+        {"matrix": [1, 2], "x": 2, "y": 1.2},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.2},
+        {"matrix": [1, 5], "x": 5, "y": 1.4},
 
-        {"label":"Y", "x":9, "y":1.4},
-        {"label":"U", "x":10, "y":1.2},
-        {"label":"I", "x":11, "y":1},
-        {"label":"O", "x":12, "y":1.2},
-        {"label":"P", "x":13, "y":1.4},
-        {"label":"GRV", "x":14, "y":1.5},
+        {"matrix": [6, 5], "x": 9, "y": 1.4},
+        {"matrix": [6, 4], "x": 10, "y": 1.2},
+        {"matrix": [6, 3], "x": 11, "y": 1},
+        {"matrix": [6, 2], "x": 12, "y": 1.2},
+        {"matrix": [6, 1], "x": 13, "y": 1.4},
+        {"matrix": [6, 0], "x": 14, "y": 1.5},
 
-        {"label":"CAPS", "x":0, "y":2.5},
-        {"label":"A", "x":1, "y":2.4},
-        {"label":"S", "x":2, "y":2.2},
-        {"label":"D", "x":3, "y":2},
-        {"label":"F", "x":4, "y":2.2},
-        {"label":"G", "x":5, "y":2.4},
+        {"matrix": [2, 0], "x": 0, "y": 2.5},
+        {"matrix": [2, 1], "x": 1, "y": 2.4},
+        {"matrix": [2, 2], "x": 2, "y": 2.2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.2},
+        {"matrix": [2, 5], "x": 5, "y": 2.4},
 
-        {"label":"H", "x":9, "y":2.4},
-        {"label":"J", "x":10, "y":2.2},
-        {"label":"K", "x":11, "y":2},
-        {"label":"L", "x":12, "y":2.2},
-        {"label":";", "x":13, "y":2.4},
-        {"label":"'", "x":14, "y":2.5},
+        {"matrix": [7, 5], "x": 9, "y": 2.4},
+        {"matrix": [7, 4], "x": 10, "y": 2.2},
+        {"matrix": [7, 3], "x": 11, "y": 2},
+        {"matrix": [7, 2], "x": 12, "y": 2.2},
+        {"matrix": [7, 1], "x": 13, "y": 2.4},
+        {"matrix": [7, 0], "x": 14, "y": 2.5},
 
-        {"label":"Shift", "x":0, "y":3.5},
-        {"label":"Z", "x":1, "y":3.4},
-        {"label":"X", "x":2, "y":3.2},
-        {"label":"C", "x":3, "y":3},
-        {"label":"V", "x":4, "y":3.2},
-        {"label":"B", "x":5, "y":3.4},
-        {"label":"GUI", "x":6.25, "y":3.4},
+        {"matrix": [3, 0], "x": 0, "y": 3.5},
+        {"matrix": [3, 1], "x": 1, "y": 3.4},
+        {"matrix": [3, 2], "x": 2, "y": 3.2},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.2},
+        {"matrix": [3, 5], "x": 5, "y": 3.4},
+        {"matrix": [4, 5], "x": 6.25, "y": 3.4},
 
-        {"label":"GUI", "x":7.75, "y":3.4},
-        {"label":"N", "x":9, "y":3.4},
-        {"label":"M", "x":10, "y":3.2},
-        {"label":",", "x":11, "y":3},
-        {"label":".", "x":12, "y":3.2},
-        {"label":"/", "x":13, "y":3.4},
-        {"label":"Shift", "x":14, "y":3.5},
+        {"matrix": [9, 5], "x": 7.75, "y": 3.4},
+        {"matrix": [8, 5], "x": 9, "y": 3.4},
+        {"matrix": [8, 4], "x": 10, "y": 3.2},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 2], "x": 12, "y": 3.2},
+        {"matrix": [8, 1], "x": 13, "y": 3.4},
+        {"matrix": [8, 0], "x": 14, "y": 3.5},
 
-        {"label":"Alt", "x":2.7, "y":4.6},
-        {"label":"Ctrl", "x":3.8, "y":4.5},
-        {"label":"Enter", "x":4.9, "y":4.55},
-        {"label":"MINS", "x":6.1, "y":4.65},
+        {"matrix": [4, 1], "x": 2.7, "y": 4.6},
+        {"matrix": [4, 2], "x": 3.8, "y": 4.5},
+        {"matrix": [4, 3], "x": 4.9, "y": 4.55},
+        {"matrix": [4, 4], "x": 6.1, "y": 4.65},
 
-        {"label":"EQL", "x":7.9, "y":4.65},
-        {"label":"Space", "x":9.1, "y":4.55},
-        {"label":"Back Space", "x":10.2, "y":4.5},
-        {"label":"Delete", "x":11.3, "y":4.6}
+        {"matrix": [9, 4], "x": 7.9, "y": 4.65},
+        {"matrix": [9, 3], "x": 9.1, "y": 4.55},
+        {"matrix": [9, 2], "x": 10.2, "y": 4.5},
+        {"matrix": [9, 1], "x": 11.3, "y": 4.6}
       ]
     }
   }
diff --git a/keyboards/clickety_split/leeloo/rev1/rev1.h b/keyboards/clickety_split/leeloo/rev1/rev1.h
deleted file mode 100644
index 7469cc2d83..0000000000
--- a/keyboards/clickety_split/leeloo/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2022 Clickety Split Ltd.
- *                https://clicketysplit.ca
- *
- * 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,           R05, R04, R03, R02, R01, R00, \
-	L10, L11, L12, L13, L14, L15,           R15, R14, R13, R12, R11, R10, \
-	L20, L21, L22, L23, L24, L25,           R25, R24, R23, R22, R21, R20, \
-	L30, L31, L32, L33, L34, L35, L45, R45, R35, R34, R33, R32, R31, R30, \
-	               L41, L42, L43, L44, R44, R43, R42, R41 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ KC_NO, L41, L42, L43, L44, L45 }, \
-		{ R00, R01, R02, R03, R04, R05 }, \
-		{ R10, R11, R12, R13, R14, R15 }, \
-		{ R20, R21, R22, R23, R24, R25 }, \
-		{ R30, R31, R32, R33, R34, R35 }, \
-		{ KC_NO, R41, R42, R43, R44, R45 } \
-	}