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

3 files changed, 69 insertions, 107 deletions

diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json
index c78a1532a7..351731a613 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/info.json
@@ -32,65 +32,74 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"label":"!", "x":0.5, "y":0},
-            {"label":"@", "x":1.5, "y":0},
-            {"label":"#", "x":2.5, "y":0},
-            {"label":"$", "x":3.5, "y":0},
-            {"label":"%", "x":4.5, "y":0},
-            {"label":"^", "x":5.5, "y":0},
-            {"label":"&", "x":9.5, "y":0},
-            {"label":"*", "x":10.5, "y":0},
-            {"label":"(", "x":11.5, "y":0},
-            {"label":")", "x":12.5, "y":0},
-            {"label":"_", "x":13.5, "y":0},
-            {"label":"+", "x":14.5, "y":0},
-            {"label":"TAB", "x":0, "y":1},
-            {"label":"Q", "x":1, "y":1},
-            {"label":"W", "x":2, "y":1},
-            {"label":"E", "x":3, "y":1},
-            {"label":"R", "x":4, "y":1},
-            {"label":"T", "x":5, "y":1},
-            {"label":"Y", "x":9, "y":1},
-            {"label":"U", "x":10, "y":1},
-            {"label":"I", "x":11, "y":1},
-            {"label":"O", "x":12, "y":1},
-            {"label":"P", "x":13, "y":1},
-            {"label":"{", "x":14, "y":1},
-            {"label":"Caps Lock", "x":0.25, "y":2},
-            {"label":"A", "x":1.25, "y":2},
-            {"label":"S", "x":2.25, "y":2},
-            {"label":"D", "x":3.25, "y":2},
-            {"label":"F", "x":4.25, "y":2},
-            {"label":"G", "x":5.25, "y":2},
-            {"label":"H", "x":9.25, "y":2},
-            {"label":"J", "x":10.25, "y":2},
-            {"label":"K", "x":11.25, "y":2},
-            {"label":"L", "x":12.25, "y":2},
-            {"label":":", "x":13.25, "y":2},
-            {"label":"\"", "x":14.25, "y":2},
-            {"label":"}", "x":15, "y":1},
-            {"label":"SHIFT", "x":0.75, "y":3},
-            {"label":"Z", "x":1.75, "y":3},
-            {"label":"X", "x":2.75, "y":3},
-            {"label":"C", "x":3.75, "y":3},
-            {"label":"V", "x":4.75, "y":3},
-            {"label":"B", "x":5.75, "y":3},
-            {"label":"Encoder Mode", "x":8.75, "y":3},
-            {"label":"N", "x":9.75, "y":3},
-            {"label":"M", "x":10.75, "y":3},
-            {"label":"<", "x":11.75, "y":3},
-            {"label":">", "x":12.75, "y":3},
-            {"label":"?", "x":13.75, "y":3},
-            {"label":"Esc", "x":2.25, "y":4},
-            {"label":"Super", "x":3.25, "y":4},
-            {"label":"Alt", "x":4.25, "y":4.25},
-            {"label":"Space", "x":5.25, "y":4.5},
-            {"label":"Shift", "x":6.25, "y":4.75},
-            {"label":"BS", "x":8.25, "y":4.75},
-            {"label":"Enter", "x":9.25, "y":4.5},
-            {"label":"Fn", "x":10.25, "y":4.25},
-            {"label":"|", "x":11.25, "y":4},
-            {"label":"~", "x":12.25, "y":4}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.5, "y": 0},
+                {"matrix": [5, 1], "x": 10.5, "y": 0},
+                {"matrix": [5, 2], "x": 11.5, "y": 0},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 4], "x": 13.5, "y": 0},
+                {"matrix": [5, 5], "x": 14.5, "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": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+
+                {"matrix": [8, 5], "x": 0.25, "y": 2},
+                {"matrix": [2, 0], "x": 1.25, "y": 2},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+
+                {"matrix": [2, 5], "x": 9.25, "y": 2},
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 1},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"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": [9, 0], "x": 8.75, "y": 3},
+                {"matrix": [8, 0], "x": 9.75, "y": 3},
+                {"matrix": [8, 1], "x": 10.75, "y": 3},
+                {"matrix": [8, 2], "x": 11.75, "y": 3},
+                {"matrix": [8, 3], "x": 12.75, "y": 3},
+                {"matrix": [8, 4], "x": 13.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4},
+                {"matrix": [4, 1], "x": 3.25, "y": 4},
+                {"matrix": [4, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4.75},
+
+                {"matrix": [9, 1], "x": 8.25, "y": 4.75},
+                {"matrix": [9, 2], "x": 9.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4},
+                {"matrix": [9, 5], "x": 12.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/tsubasa/tsubasa.c b/keyboards/handwired/tsubasa/tsubasa.c
index 78d27b57a8..75bb92dc17 100644
--- a/keyboards/handwired/tsubasa/tsubasa.c
+++ b/keyboards/handwired/tsubasa/tsubasa.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tsubasa.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 static void render_scrl(void) {
diff --git a/keyboards/handwired/tsubasa/tsubasa.h b/keyboards/handwired/tsubasa/tsubasa.h
deleted file mode 100644
index ff7bfa75a4..0000000000
--- a/keyboards/handwired/tsubasa/tsubasa.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 @kuriatsu
- *
- * 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,            R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,            R10, R11, R12, R13, R14, R15, R35, \
-   L20, L21, L22, L23, L24, L25,            R20, R21, R22, R23, R24, R25, \
-     L30, L31, L32, L33, L34, L35,       R40, R30, R31, R32, R33, R34, \
-      L40, L41, L42, L43, L44,            R41, R42, R43, R44, R45 \
-) { \
-  { L00, L01, L02, L03, L04, L05 }, \
-  { L10, L11, L12, L13, L14, L15 }, \
-  { L20, L21, L22, L23, L24, L25 }, \
-  { L30, L31, L32, L33, L34, L35 }, \
-  { L40, L41, L42, L43, L44, KC_NO }, \
-  { R00, R01, R02, R03, R04, R05 }, \
-  { R10, R11, R12, R13, R14, R15 }, \
-  { R20, R21, R22, R23, R24, R25 }, \
-  { R30, R31, R32, R33, R34, R35 }, \
-  { R40, R41, R42, R43, R44, R45 } \
-}
-