Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 198 insertions, 242 deletions

diff --git a/keyboards/kin80/info.json b/keyboards/kin80/info.json
index 86a805519e..4a90872f78 100644
--- a/keyboards/kin80/info.json
+++ b/keyboards/kin80/info.json
@@ -10,190 +10,208 @@
     "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":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-
-                {"x":0, "y":1.25, "w":1.25},
-                {"x":1.25, "y":1.25},
-                {"x":2.25, "y":1.25},
-                {"x":3.25, "y":1.25},
-                {"x":4.25, "y":1.25},
-                {"x":5.25, "y":1.25},
-                {"x":11.25, "y":1.25},
-                {"x":12.25, "y":1.25},
-                {"x":13.25, "y":1.25},
-                {"x":14.25, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25, "w":1.25},
-
-                {"x":0, "y":2.25, "w":1.25},
-                {"x":1.25, "y":2.25},
-                {"x":2.25, "y":2.25},
-                {"x":3.25, "y":2.25},
-                {"x":4.25, "y":2.25},
-                {"x":5.25, "y":2.25},
-                {"x":11.25, "y":2.25},
-                {"x":12.25, "y":2.25},
-                {"x":13.25, "y":2.25},
-                {"x":14.25, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25, "w":1.25},
-
-                {"x":0, "y":3.25, "w":1.25},
-                {"x":1.25, "y":3.25},
-                {"x":2.25, "y":3.25},
-                {"x":3.25, "y":3.25},
-                {"x":4.25, "y":3.25},
-                {"x":5.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25},
-                {"x":13.25, "y":3.25},
-                {"x":14.25, "y":3.25},
-                {"x":15.25, "y":3.25},
-                {"x":16.25, "y":3.25, "w":1.25},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25},
-                {"x":13.25, "y":4.25},
-                {"x":14.25, "y":4.25},
-                {"x":15.25, "y":4.25},
-                {"x":16.25, "y":4.25, "w":1.25},
-
-                {"x":1.25, "y":5.25},
-                {"x":2.25, "y":5.25},
-                {"x":3.25, "y":5.25},
-                {"x":4.25, "y":5.25},
-                {"x":12.25, "y":5.25},
-                {"x":13.25, "y":5.25},
-                {"x":14.25, "y":5.25},
-                {"x":15.25, "y":5.25},
-
-                {"x":6.25, "y":6},
-                {"x":7.25, "y":6},
-                {"x":9.25, "y":6},
-                {"x":10.25, "y":6},
-
-                {"x":7.25, "y":7},
-                {"x":9.25, "y":7},
-
-                {"x":5.25, "y":7, "h":2},
-                {"x":6.25, "y":7, "h":2},
-                {"x":7.25, "y":8},
-                {"x":9.25, "y":8},
-                {"x":10.25, "y":7, "h":2},
-                {"x":11.25, "y":7, "h":2}
+                {"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": 11.5, "y": 0},
+                {"matrix": [0, 7], "x": 12.5, "y": 0},
+                {"matrix": [0, 8], "x": 13.5, "y": 0},
+                {"matrix": [0, 9], "x": 14.5, "y": 0},
+                {"matrix": [0, 10], "x": 15.5, "y": 0},
+                {"matrix": [0, 11], "x": 16.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 16.25, "y": 1.25, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 13.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 14.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 16.25, "y": 2.25, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 16.25, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 16.25, "y": 4.25, "w": 1.25},
+
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.25},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25},
+
+                {"matrix": [5, 7], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+
+                {"matrix": [6, 2], "x": 6.25, "y": 6},
+                {"matrix": [6, 3], "x": 7.25, "y": 6},
+
+                {"matrix": [6, 9], "x": 9.25, "y": 6},
+                {"matrix": [6, 8], "x": 10.25, "y": 6},
+
+                {"matrix": [6, 4], "x": 7.25, "y": 7},
+
+                {"matrix": [6, 10], "x": 9.25, "y": 7},
+
+                {"matrix": [6, 0], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [6, 1], "x": 6.25, "y": 7, "h": 2},
+                {"matrix": [6, 5], "x": 7.25, "y": 8},
+
+                {"matrix": [6, 11], "x": 9.25, "y": 8},
+                {"matrix": [6, 7], "x": 10.25, "y": 7, "h": 2},
+                {"matrix": [6, 6], "x": 11.25, "y": 7, "h": 2}
             ]
         },
         "LAYOUT_all": {
             "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":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-
-                {"x":0, "y":1.25, "w":1.25},
-                {"x":1.25, "y":1.25},
-                {"x":2.25, "y":1.25},
-                {"x":3.25, "y":1.25},
-                {"x":4.25, "y":1.25},
-                {"x":5.25, "y":1.25},
-                {"x":11.25, "y":1.25},
-                {"x":12.25, "y":1.25},
-                {"x":13.25, "y":1.25},
-                {"x":14.25, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25, "w":1.25},
-
-                {"x":0, "y":2.25, "w":1.25},
-                {"x":1.25, "y":2.25},
-                {"x":2.25, "y":2.25},
-                {"x":3.25, "y":2.25},
-                {"x":4.25, "y":2.25},
-                {"x":5.25, "y":2.25},
-                {"x":11.25, "y":2.25},
-                {"x":12.25, "y":2.25},
-                {"x":13.25, "y":2.25},
-                {"x":14.25, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25, "w":1.25},
-
-                {"x":0, "y":3.25, "w":1.25},
-                {"x":1.25, "y":3.25},
-                {"x":2.25, "y":3.25},
-                {"x":3.25, "y":3.25},
-                {"x":4.25, "y":3.25},
-                {"x":5.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25},
-                {"x":13.25, "y":3.25},
-                {"x":14.25, "y":3.25},
-                {"x":15.25, "y":3.25},
-                {"x":16.25, "y":3.25, "w":1.25},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25},
-                {"x":13.25, "y":4.25},
-                {"x":14.25, "y":4.25},
-                {"x":15.25, "y":4.25},
-                {"x":16.25, "y":4.25, "w":1.25},
-
-                {"x":0.25, "y":5.25},
-                {"x":1.25, "y":5.25},
-                {"x":2.25, "y":5.25},
-                {"x":3.25, "y":5.25},
-                {"x":4.25, "y":5.25},
-                {"x":5.25, "y":5.25},
-                {"x":11.25, "y":5.25},
-                {"x":12.25, "y":5.25},
-                {"x":13.25, "y":5.25},
-                {"x":14.25, "y":5.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-
-                {"x":6.25, "y":6},
-                {"x":7.25, "y":6},
-                {"x":9.25, "y":6},
-                {"x":10.25, "y":6},
-
-                {"x":7.25, "y":7},
-                {"x":9.25, "y":7},
-
-                {"x":5.25, "y":7, "h":2},
-                {"x":6.25, "y":7, "h":2},
-                {"x":7.25, "y":8},
-                {"x":9.25, "y":8},
-                {"x":10.25, "y":7, "h":2},
-                {"x":11.25, "y":7, "h":2}
+                {"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": 11.5, "y": 0},
+                {"matrix": [0, 7], "x": 12.5, "y": 0},
+                {"matrix": [0, 8], "x": 13.5, "y": 0},
+                {"matrix": [0, 9], "x": 14.5, "y": 0},
+                {"matrix": [0, 10], "x": 15.5, "y": 0},
+                {"matrix": [0, 11], "x": 16.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 16.25, "y": 1.25, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 13.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 14.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 16.25, "y": 2.25, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 16.25, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 16.25, "y": 4.25, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 0.25, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.25},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25},
+                {"matrix": [5, 5], "x": 5.25, "y": 5.25},
+
+                {"matrix": [5, 6], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 16.25, "y": 5.25},
+
+                {"matrix": [6, 2], "x": 6.25, "y": 6},
+                {"matrix": [6, 3], "x": 7.25, "y": 6},
+
+                {"matrix": [6, 9], "x": 9.25, "y": 6},
+                {"matrix": [6, 8], "x": 10.25, "y": 6},
+
+                {"matrix": [6, 4], "x": 7.25, "y": 7},
+
+                {"matrix": [6, 10], "x": 9.25, "y": 7},
+
+                {"matrix": [6, 0], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [6, 1], "x": 6.25, "y": 7, "h": 2},
+                {"matrix": [6, 5], "x": 7.25, "y": 8},
+
+                {"matrix": [6, 11], "x": 9.25, "y": 8},
+                {"matrix": [6, 7], "x": 10.25, "y": 7, "h": 2},
+                {"matrix": [6, 6], "x": 11.25, "y": 7, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kin80/kin80.h b/keyboards/kin80/kin80.h
deleted file mode 100644
index 2bda24d19a..0000000000
--- a/keyboards/kin80/kin80.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * 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"
-
-/* readability */
-#define XXX KC_NO
-
-#define LAYOUT(                                                               \
-    k00, k01, k02, k03, k04, k05,               k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15,               k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25,               k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35,               k36, k37, k38, k39, k3A, k3B, \
-    k40, k41, k42, k43, k44, k45,               k46, k47, k48, k49, k4A, k4B, \
-         k51, k52, k53, k54,                         k57, k58, k59, k5A,      \
-                             k62, k63,     k69, k68,                          \
-                                  k64,     k6A,                               \
-                        k60, k61, k65,     k6B, k67, k66                      \
-) {                                                                 \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B }, \
-    { XXX, k51, k52, k53, k54, XXX, XXX, k57, k58, k59, k5A, XXX }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B }  \
-}
-
-#define LAYOUT_all(                                                          \
-    k00, k01, k02, k03, k04, k05,               k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15,               k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25,               k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35,               k36, k37, k38, k39, k3A, k3B, \
-    k40, k41, k42, k43, k44, k45,               k46, k47, k48, k49, k4A, k4B, \
-    k50, k51, k52, k53, k54, k55,               k56, k57, k58, k59, k5A, k5B, \
-                             k62, k63,     k69, k68,                          \
-                                  k64,     k6A,                               \
-                        k60, k61, k65,     k6B, k67, k66                      \
-) {                                                                 \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B }  \
-}