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

6 files changed, 101 insertions, 140 deletions

diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json
index d76688bfc1..2a273231d9 100644
--- a/keyboards/3w6/info.json
+++ b/keyboards/3w6/info.json
@@ -6,54 +6,5 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x4658"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "k00", "x": 0, "y": 0.8},
-                {"label": "k01", "x": 1, "y": 0.2},
-                {"label": "k02", "x": 2, "y": 0},
-                {"label": "k03", "x": 3, "y": 0.2},
-                {"label": "k04", "x": 4, "y": 0.4},
-
-                {"label": "k05", "x": 8, "y": 0.4},
-                {"label": "k06", "x": 9, "y": 0.2},
-                {"label": "k07", "x": 10, "y": 0},
-                {"label": "k08", "x": 11, "y": 0.2},
-                {"label": "k09", "x": 12, "y": 0.8},
-
-                {"label": "k10", "x": 0, "y": 1.8},
-                {"label": "k11", "x": 1, "y": 1.2},
-                {"label": "k12", "x": 2, "y": 1},
-                {"label": "k13", "x": 3, "y": 1.2},
-                {"label": "k14", "x": 4, "y": 1.4},
-
-                {"label": "k15", "x": 8, "y": 1.4},
-                {"label": "k16", "x": 9, "y": 1.2},
-                {"label": "k17", "x": 10, "y": 1},
-                {"label": "k18", "x": 11, "y": 1.2},
-                {"label": "k19", "x": 12, "y": 1.8},
-
-                {"label": "k20", "x": 0, "y": 2.8},
-                {"label": "k21", "x": 1, "y": 2.2},
-                {"label": "k22", "x": 2, "y": 2},
-                {"label": "k23", "x": 3, "y": 2.2},
-                {"label": "k24", "x": 4, "y": 2.4},
-
-                {"label": "k25", "x": 8, "y": 2.4},
-                {"label": "k26", "x": 9, "y": 2.2},
-                {"label": "k27", "x": 10, "y": 2},
-                {"label": "k28", "x": 11, "y": 2.2},
-                {"label": "k29", "x": 12, "y": 2.8},
-
-                {"label": "k32", "x": 3.2, "y": 3.6},
-                {"label": "k33", "x": 4.2, "y": 3.6},
-                {"label": "k34", "x": 5.2, "y": 3.8},
-
-                {"label": "k35", "x": 6.8, "y": 3.8},
-                {"label": "k36", "x": 7.8, "y": 3.6},
-                {"label": "k37", "x": 8.8, "y": 3.6}
-            ]
-        }
     }
 }
diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json
index dab37baf04..2db9363564 100644
--- a/keyboards/3w6/rev1/info.json
+++ b/keyboards/3w6/rev1/info.json
@@ -3,5 +3,54 @@
         "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.8},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.2},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+                {"matrix": [4, 0], "x": 8, "y": 0.4},
+                {"matrix": [4, 1], "x": 9, "y": 0.2},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.2},
+                {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.8},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.2},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+                {"matrix": [5, 0], "x": 8, "y": 1.4},
+                {"matrix": [5, 1], "x": 9, "y": 1.2},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.2},
+                {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.8},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+                {"matrix": [6, 0], "x": 8, "y": 2.4},
+                {"matrix": [6, 1], "x": 9, "y": 2.2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.2},
+                {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+            ]
+        }
+    }
 }
diff --git a/keyboards/3w6/rev1/rev1.h b/keyboards/3w6/rev1/rev1.h
deleted file mode 100644
index ba881ca431..0000000000
--- a/keyboards/3w6/rev1/rev1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 weteor
- *
- * 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( \
-      k00, k01, k02, k03, k04,             k05, k06, k07, k08, k09,\
-      k10, k11, k12, k13, k14,             k15, k16, k17, k18, k19,\
-      k20, k21, k22, k23, k24,             k25, k26, k27, k28, k29,\
-                   k32, k33, k34,       k35, k36, k37\
-) { \
-    {   k00,   k01,   k02,   k03,   k04 }, \
-    {   k10,   k11,   k12,   k13,   k14 }, \
-    {   k20,   k21,   k22,   k23,   k24 }, \
-    { KC_NO, KC_NO,   k32,   k33,   k34 }, \
-    \
-    {   k05,   k06,   k07,   k08,   k09 }, \
-    {   k15,   k16,   k17,   k18,   k19 }, \
-    {   k25,   k26,   k27,   k28,   k29 }, \
-    {   k35,   k36,   k37, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json
index 65be217368..70ee0e0fca 100644
--- a/keyboards/3w6/rev2/info.json
+++ b/keyboards/3w6/rev2/info.json
@@ -3,5 +3,54 @@
         "device_version": "0.0.2"
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.8},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.2},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+                {"matrix": [4, 0], "x": 8, "y": 0.4},
+                {"matrix": [4, 1], "x": 9, "y": 0.2},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.2},
+                {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.8},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.2},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+                {"matrix": [5, 0], "x": 8, "y": 1.4},
+                {"matrix": [5, 1], "x": 9, "y": 1.2},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.2},
+                {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.8},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+                {"matrix": [6, 0], "x": 8, "y": 2.4},
+                {"matrix": [6, 1], "x": 9, "y": 2.2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.2},
+                {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+            ]
+        }
+    }
 }
diff --git a/keyboards/3w6/rev2/rev2.c b/keyboards/3w6/rev2/rev2.c
index 224925111e..e68792cfb2 100644
--- a/keyboards/3w6/rev2/rev2.c
+++ b/keyboards/3w6/rev2/rev2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/3w6/rev2/rev2.h b/keyboards/3w6/rev2/rev2.h
deleted file mode 100644
index ba881ca431..0000000000
--- a/keyboards/3w6/rev2/rev2.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 weteor
- *
- * 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( \
-      k00, k01, k02, k03, k04,             k05, k06, k07, k08, k09,\
-      k10, k11, k12, k13, k14,             k15, k16, k17, k18, k19,\
-      k20, k21, k22, k23, k24,             k25, k26, k27, k28, k29,\
-                   k32, k33, k34,       k35, k36, k37\
-) { \
-    {   k00,   k01,   k02,   k03,   k04 }, \
-    {   k10,   k11,   k12,   k13,   k14 }, \
-    {   k20,   k21,   k22,   k23,   k24 }, \
-    { KC_NO, KC_NO,   k32,   k33,   k34 }, \
-    \
-    {   k05,   k06,   k07,   k08,   k09 }, \
-    {   k15,   k16,   k17,   k18,   k19 }, \
-    {   k25,   k26,   k27,   k28,   k29 }, \
-    {   k35,   k36,   k37, KC_NO, KC_NO }, \
-}