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

3 files changed, 76 insertions, 112 deletions

diff --git a/keyboards/handwired/symmetric70_proto/info.json b/keyboards/handwired/symmetric70_proto/info.json
index 36828784c4..9be776f41c 100644
--- a/keyboards/handwired/symmetric70_proto/info.json
+++ b/keyboards/handwired/symmetric70_proto/info.json
@@ -10,80 +10,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-		{"label":"L00", "x":0, "y":0, "w":1.25},
-		{"label":"L01", "x":1.25, "y":0},
-		{"label":"L02", "x":2.25, "y":0},
-		{"label":"L03", "x":3.25, "y":0},
-		{"label":"L04", "x":4.25, "y":0},
-		{"label":"L05", "x":5.25, "y":0},
-		{"label":"L06", "x":6.25, "y":0},
-		{"label":"R06", "x":8.75, "y":0},
-		{"label":"R05", "x":9.75, "y":0},
-		{"label":"R04", "x":10.75, "y":0},
-		{"label":"R03", "x":11.75, "y":0},
-		{"label":"R02", "x":12.75, "y":0},
-		{"label":"R01", "x":13.75, "y":0},
-		{"label":"R00", "x":14.75, "y":0, "w":1.25},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
 
-		{"label":"L10", "x":0, "y":1, "w":1.5},
-		{"label":"L11", "x":1.5, "y":1},
-		{"label":"L12", "x":2.5, "y":1},
-		{"label":"L13", "x":3.5, "y":1},
-		{"label":"L14", "x":4.5, "y":1},
-		{"label":"L15", "x":5.5, "y":1},
-		{"label":"L16", "x":6.5, "y":1},
-		{"label":"R16", "x":8.5, "y":1},
-		{"label":"R15", "x":9.5, "y":1},
-		{"label":"R14", "x":10.5, "y":1},
-		{"label":"R13", "x":11.5, "y":1},
-		{"label":"R12", "x":12.5, "y":1},
-		{"label":"R11", "x":13.5, "y":1},
-		{"label":"R10", "x":14.5, "y":1, "w":1.5},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 13.75, "y": 0},
+                {"matrix": [0, 15], "x": 14.75, "y": 0, "w": 1.25},
 
-		{"label":"L20", "x":0, "y":2, "w":1.25},
-		{"label":"L21", "x":1.25, "y":2},
-		{"label":"L22", "x":2.25, "y":2},
-		{"label":"L23", "x":3.25, "y":2},
-		{"label":"L24", "x":4.25, "y":2},
-		{"label":"L25", "x":5.25, "y":2},
-		{"label":"L26", "x":6.25, "y":2},
-		{"label":"R26", "x":8.75, "y":2},
-		{"label":"R25", "x":9.75, "y":2},
-		{"label":"R24", "x":10.75, "y":2},
-		{"label":"R23", "x":11.75, "y":2},
-		{"label":"R22", "x":12.75, "y":2},
-		{"label":"R21", "x":13.75, "y":2},
-		{"label":"R20", "x":14.75, "y":2, "w":1.25},
+                {"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": [1, 6], "x": 6.5, "y": 1},
 
-		{"label":"L30", "x":0, "y":3},
-		{"label":"L31", "x":1, "y":3},
-		{"label":"L32", "x":2, "y":3},
-		{"label":"L33", "x":3, "y":3},
-		{"label":"L34", "x":4, "y":3},
-		{"label":"L35", "x":5, "y":3},
-		{"label":"L36", "x":6, "y":3},
-		{"label":"L37", "x":7, "y":3},
-		{"label":"R37", "x":8, "y":3},
-		{"label":"R36", "x":9, "y":3},
-		{"label":"R35", "x":10, "y":3},
-		{"label":"R34", "x":11, "y":3},
-		{"label":"R33", "x":12, "y":3},
-		{"label":"R32", "x":13, "y":3},
-		{"label":"R31", "x":14, "y":3},
-		{"label":"R30", "x":15, "y":3},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1},
+                {"matrix": [1, 15], "x": 14.5, "y": 1, "w": 1.5},
 
-		{"label":"L40", "x":0, "y":4, "w":1.75},
-		{"label":"L42", "x":1.75, "y":4, "w":1.25},
-		{"label":"L43", "x":3, "y":4, "w":1.25},
-		{"label":"L44", "x":4.25, "y":4},
-		{"label":"L45", "x":5.25, "y":4, "w":1.25},
-		{"label":"L47", "x":6.5, "y":4, "w":1.5},
-		{"label":"R47", "x":8, "y":4, "w":1.5},
-		{"label":"R45", "x":9.5, "y":4, "w":1.25},
-		{"label":"R44", "x":10.75, "y":4},
-		{"label":"R43", "x":11.75, "y":4, "w":1.25},
-		{"label":"R42", "x":13, "y":4, "w":1.25},
-		{"label":"R40", "x":14.25, "y":4, "w":1.75}
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2},
+                {"matrix": [2, 15], "x": 14.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 6.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 15], "x": 14.25, "y": 4, "w": 1.75}
             ]
         }
     }
diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
index daab4f0993..f954a388b5 100644
--- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
+++ b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "symmetric70_proto.h"
+#include "quantum.h"
 
 __attribute__((weak)) void keyboard_post_init_user(void) {
   // Customise these values to desired behaviour
diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h b/keyboards/handwired/symmetric70_proto/symmetric70_proto.h
deleted file mode 100644
index 4a8539b50c..0000000000
--- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 mtei
- *
- * 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( \
-     L00, L01, L02, L03, L04, L05, L06,            R06, R05, R04, R03, R02, R01, R00, \
-      L10, L11, L12, L13, L14, L15, L16,          R16, R15, R14, R13, R12, R11, R10, \
-     L20, L21, L22, L23, L24, L25, L26,            R26, R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35, L36, L37,    R37, R36, R35, R34, R33, R32, R31, R30, \
-    L40,      L42, L43, L44, L45,      L47,    R47,      R45, R44, R43, R42,      R40  \
-) { \
-    { L00, L01,   L02, L03, L04, L05, L06,   KC_NO,   KC_NO, R06, R05, R04, R03, R02, R01,   R00 }, \
-    { L10, L11,   L12, L13, L14, L15, L16,   KC_NO,   KC_NO, R16, R15, R14, R13, R12, R11,   R10 }, \
-    { L20, L21,   L22, L23, L24, L25, L26,   KC_NO,   KC_NO, R26, R25, R24, R23, R22, R21,   R20 }, \
-    { L30, L31,   L32, L33, L34, L35, L36,   L37,     R37,   R36, R35, R34, R33, R32, R31,   R30 }, \
-    { L40, KC_NO, L42, L43, L44, L45, KC_NO, L47,     R47, KC_NO, R45, R44, R43, R42, KC_NO, R40 }  \
-}