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

3 files changed, 70 insertions, 104 deletions

diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 8fb3cb2f28..215b47e103 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -33,72 +33,79 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0.5},
-                {"label":"1!", "x":1, "y":0.38},
-                {"label":"2@", "x":2, "y":0.13},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0.13},
-                {"label":"5%", "x":5, "y":0.25},
-                {"label":"6^", "x":9, "y":0.25},
-                {"label":"7&", "x":10, "y":0.13},
-                {"label":"8*", "x":11, "y":0},
-                {"label":"9(", "x":12, "y":0.13},
-                {"label":"0)", "x":13, "y":0.38},
-                {"label":"Backspace", "x":14, "y":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.38},
+                {"matrix": [0, 2], "x": 2, "y": 0.13},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.13},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
 
-                {"label":"Tab", "x":0, "y":1.5},
-                {"label":"Q", "x":1, "y":1.38},
-                {"label":"W", "x":2, "y":1.13},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1.13},
-                {"label":"T", "x":5, "y":1.25},
-                {"label":"Y", "x":9, "y":1.25},
-                {"label":"U", "x":10, "y":1.13},
-                {"label":"I", "x":11, "y":1},
-                {"label":"O", "x":12, "y":1.13},
-                {"label":"P", "x":13, "y":1.38},
-                {"label":"`~", "x":14, "y":1.5},
+                {"matrix": [6, 5], "x": 9, "y": 0.25},
+                {"matrix": [6, 4], "x": 10, "y": 0.13},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0.13},
+                {"matrix": [6, 1], "x": 13, "y": 0.38},
+                {"matrix": [6, 0], "x": 14, "y": 0.5},
 
-                {"label":"Caps Lock", "x":0, "y":2.5},
-                {"label":"A", "x":1, "y":2.38},
-                {"label":"S", "x":2, "y":2.13},
-                {"label":"D", "x":3, "y":2},
-                {"label":"F", "x":4, "y":2.13},
-                {"label":"G", "x":5, "y":2.25},
-                {"label":"H", "x":9, "y":2.25},
-                {"label":"J", "x":10, "y":2.13},
-                {"label":"K", "x":11, "y":2},
-                {"label":"L", "x":12, "y":2.13},
-                {"label":";:", "x":13, "y":2.38},
-                {"label":"'\"", "x":14, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.38},
+                {"matrix": [1, 2], "x": 2, "y": 1.13},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.13},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
 
-                {"label":"Shift", "x":0, "y":3.5},
-                {"label":"Z", "x":1, "y":3.38},
-                {"label":"X", "x":2, "y":3.13},
-                {"label":"C", "x":3, "y":3},
-                {"label":"V", "x":4, "y":3.13},
-                {"label":"B", "x":5, "y":3.25},
-                {"label":"Joystick", "x":6, "y":3.25},
-                {"label":"Encoder", "x":8, "y":3.25},
-                {"label":"N", "x":9, "y":3.25},
-                {"label":"M", "x":10, "y":3.13},
-                {"label":",<", "x":11, "y":3},
-                {"label":".>", "x":12, "y":3.13},
-                {"label":"/?", "x":13, "y":3.38},
-                {"label":"\\|", "x":14, "y":3.5},
+                {"matrix": [7, 5], "x": 9, "y": 1.25},
+                {"matrix": [7, 4], "x": 10, "y": 1.13},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 2], "x": 12, "y": 1.13},
+                {"matrix": [7, 1], "x": 13, "y": 1.38},
+                {"matrix": [7, 0], "x": 14, "y": 1.5},
 
-                {"label":"Lower", "x":0.35, "y":4.5},
-                {"label":"OS", "x":1.35, "y":4.38},
-                {"label":"Alt", "x":2.35, "y":4.13},
-                {"label":"Del", "x":3.35, "y":4.13},
-                {"label":"Ctrl", "x":4.55, "y":4.5},
-                {"label":"Enter", "x":5.75, "y":4.25, "h":1.25},
-                {"label":"Space", "x":8.25, "y":4.25, "h":1.25},
-                {"label":"Raise", "x":9.45, "y":4.5},
-                {"label":"[{", "x":10.65, "y":4.13},
-                {"label":"]}", "x":11.65, "y":4.13},
-                {"label":"-_", "x":12.65, "y":4.38},
-                {"label":"=+", "x":13.65, "y":4.5}
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.38},
+                {"matrix": [2, 2], "x": 2, "y": 2.13},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.13},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [8, 5], "x": 9, "y": 2.25},
+                {"matrix": [8, 4], "x": 10, "y": 2.13},
+                {"matrix": [8, 3], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2.13},
+                {"matrix": [8, 1], "x": 13, "y": 2.38},
+                {"matrix": [8, 0], "x": 14, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.38},
+                {"matrix": [3, 2], "x": 2, "y": 3.13},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.13},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [5, 0], "x": 6, "y": 3.25},
+
+                {"matrix": [11, 5], "x": 8, "y": 3.25},
+
+                {"matrix": [9, 5], "x": 9, "y": 3.25},
+                {"matrix": [9, 4], "x": 10, "y": 3.13},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [9, 2], "x": 12, "y": 3.13},
+                {"matrix": [9, 1], "x": 13, "y": 3.38},
+                {"matrix": [9, 0], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0.35, "y": 4.5},
+                {"matrix": [4, 1], "x": 1.35, "y": 4.38},
+                {"matrix": [4, 2], "x": 2.35, "y": 4.13},
+                {"matrix": [4, 3], "x": 3.35, "y": 4.13},
+                {"matrix": [4, 4], "x": 4.55, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25, "h": 1.25},
+
+                {"matrix": [10, 5], "x": 8.25, "y": 4.25, "h": 1.25},
+                {"matrix": [10, 4], "x": 9.45, "y": 4.5},
+                {"matrix": [10, 3], "x": 10.65, "y": 4.13},
+                {"matrix": [10, 2], "x": 11.65, "y": 4.13},
+                {"matrix": [10, 1], "x": 12.65, "y": 4.38},
+                {"matrix": [10, 0], "x": 13.65, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/lime/rev1/rev1.c b/keyboards/lime/rev1/rev1.c
index 50c2e6dff6..91d00e0d2f 100644
--- a/keyboards/lime/rev1/rev1.c
+++ b/keyboards/lime/rev1/rev1.c
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
-#include "rev1.h"
+#include "quantum.h"
 
 /* Encoders */
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/lime/rev1/rev1.h b/keyboards/lime/rev1/rev1.h
deleted file mode 100644
index 24a3f7212b..0000000000
--- a/keyboards/lime/rev1/rev1.h
+++ /dev/null
@@ -1,41 +0,0 @@
- /* Copyright 2021 HellSingCoder
-  *
-  * 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,           R00, R01, R02, R03, R04, R05,  \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
-    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,  \
-    L30, L31, L32, L33, L34, L35, L50, R50, R30, R31, R32, R33, R34, R35, \
-    L40, L41, L42, L43, L44, L45,           R40, R41, R42, R43, R44, R45  \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { L30, L31, L32, L33, L34, L35 }, \
-        { L40, L41, L42, L43, L44, L45 }, \
-        { L50, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { R35, R34, R33, R32, R31, R30 }, \
-        { R45, R44, R43, R42, R41, R40 }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R50 } \
-    }
-