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

3 files changed, 53 insertions, 97 deletions

diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index 1413fd2add..ade1731d94 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -21,56 +21,61 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0, "w":1.5},
-                {"label":"Q", "x":1.5, "y":0},
-                {"label":"W", "x":2.5, "y":0},
-                {"label":"E", "x":3.5, "y":0},
-                {"label":"R", "x":4.5, "y":0},
-                {"label":"T", "x":5.5, "y":0},
-                {"label":"Y", "x":8.25, "y":0},
-                {"label":"U", "x":9.25, "y":0},
-                {"label":"I", "x":10.25, "y":0},
-                {"label":"O", "x":11.25, "y":0},
-                {"label":"P", "x":12.25, "y":0},
-                {"label":"`~", "x":13.25, "y":0},
-                {"label":"Backspace", "x":14.25, "y":0, "w":1.25},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":1, "w":1.75},
-                {"label":"A", "x":1.75, "y":1},
-                {"label":"S", "x":2.75, "y":1},
-                {"label":"D", "x":3.75, "y":1},
-                {"label":"F", "x":4.75, "y":1},
-                {"label":"G", "x":5.75, "y":1},
-                {"label":"H", "x":8.5, "y":1},
-                {"label":"J", "x":9.5, "y":1},
-                {"label":"K", "x":10.5, "y":1},
-                {"label":"L", "x":11.5, "y":1},
-                {"label":"\\|", "x":12.5, "y":1},
-                {"label":"Enter", "x":13.5, "y":1, "w":2},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [4, 0], "x": 9.25, "y": 0},
+                {"matrix": [4, 1], "x": 10.25, "y": 0},
+                {"matrix": [4, 2], "x": 11.25, "y": 0},
+                {"matrix": [4, 3], "x": 12.25, "y": 0},
+                {"matrix": [4, 4], "x": 13.25, "y": 0},
+                {"matrix": [4, 5], "x": 14.25, "y": 0, "w": 1.25},
 
-                {"label":"Shift", "x":0, "y":2, "w":2.25},
-                {"label":"Z", "x":2.25, "y":2},
-                {"label":"X", "x":3.25, "y":2},
-                {"label":"C", "x":4.25, "y":2},
-                {"label":"V", "x":5.25, "y":2},
-                {"label":"B", "x":6.25, "y":2},
-                {"label":"N", "x":8, "y":2},
-                {"label":"M", "x":9, "y":2},
-                {"label":",<", "x":10, "y":2},
-                {"label":".>", "x":11, "y":2},
-                {"label":"/?", "x":12.25, "y":2},
-                {"label":"\u2191", "x":13.25, "y":2},
-                {"label":"Shift", "x":14.25, "y":2, "w":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
-                {"label":"Win", "x":1.25, "y":3, "w":1.25},
-                {"label":"Alt", "x":3.25, "y":3, "w":1.25},
-                {"label":"Space", "x":4.5, "y":3, "w":2.75},
-                {"label":"Space", "x":8, "y":3, "w":2.25},
-                {"label":"Fn", "x":10.25, "y":3, "w":1.25},
-                {"label":"\u2190", "x":12.25, "y":3},
-                {"label":"\u2193", "x":13.25, "y":3},
-                {"label":"\u2192", "x":14.25, "y":3}
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [5, 0], "x": 9.5, "y": 1},
+                {"matrix": [5, 1], "x": 10.5, "y": 1},
+                {"matrix": [5, 2], "x": 11.5, "y": 1},
+                {"matrix": [5, 3], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [6, 0], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12.25, "y": 2},
+                {"matrix": [6, 4], "x": 13.25, "y": 2},
+                {"matrix": [6, 5], "x": 14.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.75},
+
+                {"matrix": [7, 0], "x": 8, "y": 3, "w": 2.25},
+                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 3], "x": 12.25, "y": 3},
+                {"matrix": [7, 4], "x": 13.25, "y": 3},
+                {"matrix": [7, 5], "x": 14.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/horrortroll/lemon40/lemon40.c b/keyboards/horrortroll/lemon40/lemon40.c
index ccb7f15546..75321f41b3 100644
--- a/keyboards/horrortroll/lemon40/lemon40.c
+++ b/keyboards/horrortroll/lemon40/lemon40.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lemon40.h"
+#include "quantum.h"
 
 // OLED animation
 #include "lib/bongocat.h"
diff --git a/keyboards/horrortroll/lemon40/lemon40.h b/keyboards/horrortroll/lemon40/lemon40.h
deleted file mode 100644
index a4845a8595..0000000000
--- a/keyboards/horrortroll/lemon40/lemon40.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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
-
-/* ┌─────┬───┬───┬───┬───┬───┐      ┌───┬───┬───┬───┬───┬───┬────┐
- * │00   │01 │02 │03 │04 │05 │      │06 │40 │41 │42 │43 │44 │45  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐     └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴────┤
- * │10    │11 │12 │13 │14 │15 │      │16 │50 │51 │52 │53 │55     │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬┬┴──┬┴──┬────┤
- * │20      │21 │22 │23 │24 │25 │  │26 │60 │61 │62 ││63 │64 │65  │
- * └┬────┬──┴─┬─┼───┴┬──┴───┴───┤  ├───┴───┴┬──┴─┬─┘├───┼───┼───┬┘
- *  │30  │31  │ │32  │34        │  │70      │72  │  │73 │74 │75 │
- *  └────┴────┘ └────┴──────────┘  └────────┴────┘  └───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05,      K06, K40, K41, K42, K43, K44, K45, \
-    K10, K11, K12, K13, K14, K15,      K16, K50, K51, K52, K53,      K55, \
-    K20, K21, K22, K23, K24, K25,      K26, K60, K61, K62, K63, K64, K65, \
-    K30, K31, K32,      K34,                K70,      K72, K73, K74, K75  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { K30, K31, K32, XXX, K34, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, XXX }, \
-    { K50, K51, K52, K53, XXX, K55, XXX }, \
-    { K60, K61, K62, K63, K64, K65, XXX }, \
-    { K70, XXX, K72, K73, K74, K75, XXX }  \
-}
-