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

3 files changed, 96 insertions, 124 deletions

diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index db5912e381..21a8c1fbd9 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -20,93 +20,103 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "layouts": {
+   "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1, "y": 0 },
-                { "label": "F2", "x": 2, "y": 0 },
-                { "label": "F3", "x": 3, "y": 0 },
-                { "label": "F4", "x": 4, "y": 0 },
-                { "label": "F5", "x": 5, "y": 0 },
-                { "label": "F6", "x": 6, "y": 0 },
-                { "label": "F7", "x": 7, "y": 0 },
-                { "label": "F8", "x": 8, "y": 0 },
-                { "label": "F9", "x": 9, "y": 0 },
-                { "label": "F10", "x": 10, "y": 0 },
-                { "label": "F11", "x": 11, "y": 0 },
-                { "label": "F12", "x": 12, "y": 0 },
-                { "label": "Del", "x": 13, "y": 0, "w": 1.5 },
-                { "label": "Home", "x": 14.75, "y": 0 },
-                { "label": "`", "x": 0, "y": 1 },
-                { "label": "1", "x": 1, "y": 1 },
-                { "label": "2", "x": 2, "y": 1 },
-                { "label": "3", "x": 3, "y": 1 },
-                { "label": "4", "x": 4, "y": 1 },
-                { "label": "5", "x": 5, "y": 1 },
-                { "label": "6", "x": 6, "y": 1 },
-                { "label": "7", "x": 7, "y": 1 },
-                { "label": "8", "x": 8, "y": 1 },
-                { "label": "9", "x": 9, "y": 1 },
-                { "label": "0", "x": 10, "y": 1 },
-                { "label": "-", "x": 11, "y": 1 },
-                { "label": "=", "x": 12, "y": 1 },
-                { "label": "Bksp", "x": 13, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 14.75, "y": 1 },
-                { "label": "Tab", "x": 0, "y": 2, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2 },
-                { "label": "W", "x": 2.5, "y": 2 },
-                { "label": "E", "x": 3.5, "y": 2 },
-                { "label": "R", "x": 4.5, "y": 2 },
-                { "label": "T", "x": 5.5, "y": 2 },
-                { "label": "Y", "x": 6.5, "y": 2 },
-                { "label": "U", "x": 7.5, "y": 2 },
-                { "label": "I", "x": 8.5, "y": 2 },
-                { "label": "O", "x": 9.5, "y": 2 },
-                { "label": "P", "x": 10.5, "y": 2 },
-                { "label": "[", "x": 11.5, "y": 2 },
-                { "label": "]", "x": 12.5, "y": 2 },
-                { "label": "\\", "x": 13.5, "y": 2 },
-                { "label": "PgDn", "x": 14.75, "y": 2 },
-                { "label": "Caps", "x": 0.25, "y": 3, "w": 1.5 },
-                { "label": "A", "x": 1.75, "y": 3 },
-                { "label": "S", "x": 2.75, "y": 3 },
-                { "label": "D", "x": 3.75, "y": 3 },
-                { "label": "F", "x": 4.75, "y": 3 },
-                { "label": "G", "x": 5.75, "y": 3 },
-                { "label": "H", "x": 6.75, "y": 3 },
-                { "label": "J", "x": 7.75, "y": 3 },
-                { "label": "K", "x": 8.75, "y": 3 },
-                { "label": "L", "x": 9.75, "y": 3 },
-                { "label": ";", "x": 10.75, "y": 3 },
-                { "label": "'", "x": 11.75, "y": 3 },
-                { "label": "Enter", "x": 12.75, "y": 3, "w": 1.5 },
-                { "label": "End", "x": 14.75, "y": 3 },
-                { "label": "LShift", "x": 0.25, "y": 4, "w": 2 },
-                { "label": "Z", "x": 2.25, "y": 4 },
-                { "label": "X", "x": 3.25, "y": 4 },
-                { "label": "C", "x": 4.25, "y": 4 },
-                { "label": "V", "x": 5.25, "y": 4 },
-                { "label": "B", "x": 6.25, "y": 4 },
-                { "label": "N", "x": 7.25, "y": 4 },
-                { "label": "M", "x": 8.25, "y": 4 },
-                { "label": ",", "x": 9.25, "y": 4 },
-                { "label": ".", "x": 10.25, "y": 4 },
-                { "label": "/", "x": 11.25, "y": 4 },
-                { "label": "RShift", "x": 12.25, "y": 4, "w": 1.5 },
-                { "label": "Up", "x": 13.75, "y": 4 },
-                { "label": "LCtrl", "x": 0.25, "y": 5, "w": 1.5 },
-                { "label": "LAlt", "x": 1.75, "y": 5 },
-                { "label": "LFn", "x": 2.75, "y": 5 },
-                { "label": "Super", "x": 3.75, "y": 5 },
-                { "label": "Space", "x": 4.75, "y": 5, "w": 2 },
-                { "label": "Space", "x": 6.75, "y": 5, "w": 2 },
-                { "label": "RCtrl", "x": 8.75, "y": 5 },
-                { "label": "RAlt", "x": 9.75, "y": 5 },
-                { "label": "RFn", "x": 10.75, "y": 5, "w": 1.5 },
-                { "label": "Left", "x": 12.75, "y": 5 },
-                { "label": "Down", "x": 13.75, "y": 5 },
-                { "label": "Right", "x": 14.75, "y": 5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 14.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 14.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+                {"matrix": [5, 13], "x": 14.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.5},
+
+                {"matrix": [5, 5], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 2},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13.75, "y": 4},
+
+                {"matrix": [5, 0], "x": 0.25, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.75, "y": 5},
+                {"matrix": [5, 2], "x": 2.75, "y": 5},
+                {"matrix": [5, 3], "x": 3.75, "y": 5},
+                {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2},
+                {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 2},
+                {"matrix": [5, 7], "x": 8.75, "y": 5},
+                {"matrix": [5, 8], "x": 9.75, "y": 5},
+                {"matrix": [5, 9], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 10], "x": 12.75, "y": 5},
+                {"matrix": [5, 11], "x": 13.75, "y": 5},
+                {"matrix": [5, 12], "x": 14.75, "y": 5}
             ]
         }
     }
diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c
index fd780f6fee..7a5000d9ba 100644
--- a/keyboards/system76/launch_1/launch_1.c
+++ b/keyboards/system76/launch_1/launch_1.c
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "launch_1.h"
+#include "quantum.h"
 
 #include "usb_mux.h"
 
diff --git a/keyboards/system76/launch_1/launch_1.h b/keyboards/system76/launch_1/launch_1.h
deleted file mode 100644
index 335b8ecbdf..0000000000
--- a/keyboards/system76/launch_1/launch_1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (C) 2021  System76
- *
- *  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 3 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 <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, \
-  K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, \
-   K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, \
-   K40,   K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,    K4B,  K4C,      \
-   K50,  K51, K52, K53, K54,      K55,      K56, K57, K58,      K59, K5A, K5B  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K0E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K1E }, \
-    { K50, K51, K52, K53, K54, K3D, K55, K56, K57, K58, K59, K5A, K5B, K2E }, \
-}
-// clang-format on