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

3 files changed, 80 insertions, 345 deletions

diff --git a/keyboards/takashicompany/compacx/compacx.c b/keyboards/takashicompany/compacx/compacx.c
index cf23638920..5a63210c5b 100644
--- a/keyboards/takashicompany/compacx/compacx.c
+++ b/keyboards/takashicompany/compacx/compacx.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "compacx.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/takashicompany/compacx/compacx.h b/keyboards/takashicompany/compacx/compacx.h
deleted file mode 100644
index 61447abeb8..0000000000
--- a/keyboards/takashicompany/compacx/compacx.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    l001, l002, l003, l004, l005, l006, l007, l008, r001, r002, r003, r004, r005, r006, r007, r008, \
-    l201, l009, l010, l011, l012, l013, l901,       r201, r009, r010, r011, r012, r013, r901,       \
-    l301, l014, l015, l016, l017, l018,             r301, r014, r015, r016, r017, r018,             \
-    l401, l019, l020, l021, l022, l023, l024,       r401, r019, r020, r021, r022, r023, r024,       \
-    l025, l101, l102, l026, l103, l104, l027,       r025, r101, r102, r026, r103, r104, r027        \
-) { \
-    { l001, l002, l003, l004, l005, l006, l007 },   \
-    { l201, l009, l010, l011, l012, l013, l008 },   \
-    { l301, l014, l015, l016, l017, l018, l901 },   \
-    { l401, l019, l020, l021, l022, l023, l024 },   \
-    { l025, l101, l102, l026, l103, l104, l027 },   \
-    { r001, r002, r003, r004, r005, r006, r007 },   \
-    { r201, r009, r010, r011, r012, r013, r008 },   \
-    { r301, r014, r015, r016, r017, r018, r901 },   \
-    { r401, r019, r020, r021, r022, r023, r024 },   \
-    { r025, r101, r102, r026, r103, r104, r027 }    \
-}
diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
index f67abdbd3f..edc71222a0 100644
--- a/keyboards/takashicompany/compacx/info.json
+++ b/keyboards/takashicompany/compacx/info.json
@@ -30,304 +30,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "x": 15,
-                    "y": 0
-                },
-                {
-                    "x": 16,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "x": 6.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "x": 9,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "x": 13.5,
-                    "y": 1
-                },
-                {
-                    "x": 14.5,
-                    "y": 1
-                },
-                {
-                    "x": 15.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "x": 9,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "x": 12.75,
-                    "y": 2
-                },
-                {
-                    "x": 13.75,
-                    "y": 2
-                },
-                {
-                    "x": 14.75,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3,
-                    "w": 2
-                },
-                {
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "x": 5,
-                    "y": 3
-                },
-                {
-                    "x": 6,
-                    "y": 3
-                },
-                {
-                    "x": 7,
-                    "y": 3
-                },
-                {
-                    "x": 9,
-                    "y": 3,
-                    "w": 2
-                },
-                {
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "x": 13,
-                    "y": 3
-                },
-                {
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "x": 16,
-                    "y": 3
-                },
-                {
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "x": 1,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 2.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 3.5,
-                    "y": 4
-                },
-                {
-                    "x": 4.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 5.75,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 7,
-                    "y": 4
-                },
-                {
-                    "x": 9,
-                    "y": 4
-                },
-                {
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 11.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 12.5,
-                    "y": 4
-                },
-                {
-                    "x": 13.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 14.75,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 16,
-                    "y": 4
-                }
+                {"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": [1, 6], "x": 7, "y": 0},
+
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+                {"matrix": [6, 6], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5},
+                {"matrix": [6, 1], "x": 10.5, "y": 1},
+                {"matrix": [6, 2], "x": 11.5, "y": 1},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 4], "x": 13.5, "y": 1},
+                {"matrix": [6, 5], "x": 14.5, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2, "w": 1.75},
+                {"matrix": [7, 1], "x": 10.75, "y": 2},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 4], "x": 13.75, "y": 2},
+                {"matrix": [7, 5], "x": 14.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+
+                {"matrix": [8, 0], "x": 9, "y": 3, "w": 2},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 4], "x": 14, "y": 3},
+                {"matrix": [8, 5], "x": 15, "y": 3},
+                {"matrix": [8, 6], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+
+                {"matrix": [9, 0], "x": 9, "y": 4},
+                {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 12.5, "y": 4},
+                {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 16, "y": 4}
             ]
         }
     }