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

2 files changed, 115 insertions, 163 deletions

diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/info.json
index 383d7d65e5..6e065eaa73 100644
--- a/keyboards/converter/sun_usb/type3/info.json
+++ b/keyboards/converter/sun_usb/type3/info.json
@@ -1,103 +1,118 @@
 {
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label":"STOP", "x":0, "y":0},
-        {"label":"AGAIN", "x":1, "y":0},
-        {"label":"CAPS LOCK", "x":2.5, "y":0},
-        {"label":"F2", "x":3.5, "y":0},
-        {"label":"F3", "x":4.5, "y":0, "w":2},
-        {"label":"F4", "x":6.5, "y":0, "w":2},
-        {"label":"F5", "x":8.5, "y":0, "w":2},
-        {"label":"F6", "x":10.5, "y":0, "w":2},
-        {"label":"F7", "x":12.5, "y":0, "w":2},
-        {"label":"F8", "x":14.5, "y":0},
-        {"label":"F9", "x":15.5, "y":0},
-        {"label":"BACKSPACE", "x":16.5, "y":0},
-        {"label":"R1", "x":18, "y":0},
-        {"label":"R2", "x":19, "y":0},
-        {"label":"R3", "x":20, "y":0},
-        {"label":"PROPS", "x":0, "y":1},
-        {"label":"UNDO", "x":1, "y":1},
-        {"label":"ESC", "x":2.5, "y":1},
-        {"label":"1", "x":3.5, "y":1},
-        {"label":"2", "x":4.5, "y":1},
-        {"label":"3", "x":5.5, "y":1},
-        {"label":"4", "x":6.5, "y":1},
-        {"label":"5", "x":7.5, "y":1},
-        {"label":"6", "x":8.5, "y":1},
-        {"label":"7", "x":9.5, "y":1},
-        {"label":"8", "x":10.5, "y":1},
-        {"label":"9", "x":11.5, "y":1},
-        {"label":"0", "x":12.5, "y":1},
-        {"label":"MINUS", "x":13.5, "y":1},
-        {"label":"EQUAL", "x":14.5, "y":1},
-        {"label":"BACKSLASH", "x":15.5, "y":1},
-        {"label":"GRAVE", "x":16.5, "y":1},
-        {"label":"R4", "x":18, "y":1},
-        {"label":"R5", "x":19, "y":1},
-        {"label":"R6", "x":20, "y":1},
-        {"label":"FRONT", "x":0, "y":2},
-        {"label":"COPY", "x":1, "y":2},
-        {"label":"TAB", "x":2.5, "y":2, "w":1.5},
-        {"label":"Q", "x":4, "y":2},
-        {"label":"W", "x":5, "y":2},
-        {"label":"E", "x":6, "y":2},
-        {"label":"R", "x":7, "y":2},
-        {"label":"T", "x":8, "y":2},
-        {"label":"Y", "x":9, "y":2},
-        {"label":"U", "x":10, "y":2},
-        {"label":"I", "x":11, "y":2},
-        {"label":"O", "x":12, "y":2},
-        {"label":"P", "x":13, "y":2},
-        {"label":"LBRACKET", "x":14, "y":2},
-        {"label":"RBRACKET", "x":15, "y":2},
-        {"label":"DELETE", "x":16, "y":2, "w":1.5},
-        {"label":"R7", "x":18, "y":2},
-        {"label":"R8", "x":19, "y":2},
-        {"label":"R9", "x":20, "y":2},
-        {"label":"OPEN", "x":0, "y":3},
-        {"label":"PASTE", "x":1, "y":3},
-        {"label":"CONTROL", "x":2.5, "y":3, "w":1.75},
-        {"label":"A", "x":4.25, "y":3},
-        {"label":"S", "x":5.25, "y":3},
-        {"label":"D", "x":6.25, "y":3},
-        {"label":"F", "x":7.25, "y":3},
-        {"label":"G", "x":8.25, "y":3},
-        {"label":"H", "x":9.25, "y":3},
-        {"label":"J", "x":10.25, "y":3},
-        {"label":"K", "x":11.25, "y":3},
-        {"label":"L", "x":12.25, "y":3},
-        {"label":"SEMICOLON", "x":13.25, "y":3},
-        {"label":"QUOTE", "x":14.25, "y":3},
-        {"label":"RETURN", "x":15.25, "y":3, "w":2.25},
-        {"label":"R10", "x":18, "y":3},
-        {"label":"R11", "x":19, "y":3},
-        {"label":"R12", "x":20, "y":3},
-        {"label":"FIND", "x":0, "y":4},
-        {"label":"CUT", "x":1, "y":4},
-        {"label":"LSHIFT", "x":2.5, "y":4, "w":2.25},
-        {"label":"Z", "x":4.75, "y":4},
-        {"label":"X", "x":5.75, "y":4},
-        {"label":"C", "x":6.75, "y":4},
-        {"label":"V", "x":7.75, "y":4},
-        {"label":"B", "x":8.75, "y":4},
-        {"label":"N", "x":9.75, "y":4},
-        {"label":"M", "x":10.75, "y":4},
-        {"label":"COMMA", "x":11.75, "y":4},
-        {"label":"PERIOD", "x":12.75, "y":4},
-        {"label":"SLASH", "x":13.75, "y":4},
-        {"label":"RSHIFT", "x":14.75, "y":4, "w":1.75},
-        {"label":"LINE FEED", "x":16.5, "y":4},
-        {"label":"R13", "x":18, "y":4},
-        {"label":"R14", "x":19, "y":4},
-        {"label":"R15", "x":20, "y":4},
-        {"label":"CAPS", "x":2.5, "y":5, "w":1.25},
-        {"label":"LEFT", "x":3.75, "y":5, "w":1.5},
-        {"label":"SPACE", "x":5.25, "y":5, "w":9},
-        {"label":"RIGHT", "x":14.25, "y":5, "w":1.5},
-        {"label":"ALTERNATE", "x":15.75, "y":5, "w":1.75}
-      ]
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+
+                {"matrix": [0, 5], "x": 2.5, "y": 0},
+                {"matrix": [0, 6], "x": 3.5, "y": 0},
+                {"matrix": [1, 0], "x": 4.5, "y": 0, "w": 2},
+                {"matrix": [1, 2], "x": 6.5, "y": 0, "w": 2},
+                {"matrix": [1, 4], "x": 8.5, "y": 0, "w": 2},
+                {"matrix": [1, 6], "x": 10.5, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 12.5, "y": 0, "w": 2},
+                {"matrix": [2, 1], "x": 14.5, "y": 0},
+                {"matrix": [2, 2], "x": 15.5, "y": 0},
+                {"matrix": [5, 3], "x": 16.5, "y": 0},
+
+                {"matrix": [2, 5], "x": 18, "y": 0},
+                {"matrix": [2, 6], "x": 19, "y": 0},
+                {"matrix": [2, 7], "x": 20, "y": 0},
+
+                {"matrix": [3, 1], "x": 0, "y": 1},
+                {"matrix": [3, 2], "x": 1, "y": 1},
+
+                {"matrix": [3, 5], "x": 2.5, "y": 1},
+                {"matrix": [3, 6], "x": 3.5, "y": 1},
+                {"matrix": [3, 7], "x": 4.5, "y": 1},
+                {"matrix": [4, 0], "x": 5.5, "y": 1},
+                {"matrix": [4, 1], "x": 6.5, "y": 1},
+                {"matrix": [4, 2], "x": 7.5, "y": 1},
+                {"matrix": [4, 3], "x": 8.5, "y": 1},
+                {"matrix": [4, 4], "x": 9.5, "y": 1},
+                {"matrix": [4, 5], "x": 10.5, "y": 1},
+                {"matrix": [4, 6], "x": 11.5, "y": 1},
+                {"matrix": [4, 7], "x": 12.5, "y": 1},
+                {"matrix": [5, 0], "x": 13.5, "y": 1},
+                {"matrix": [5, 1], "x": 14.5, "y": 1},
+                {"matrix": [11, 0], "x": 15.5, "y": 1},
+                {"matrix": [5, 2], "x": 16.5, "y": 1},
+
+                {"matrix": [5, 5], "x": 18, "y": 1},
+                {"matrix": [5, 6], "x": 19, "y": 1},
+                {"matrix": [5, 7], "x": 20, "y": 1},
+
+                {"matrix": [6, 1], "x": 0, "y": 2},
+                {"matrix": [6, 3], "x": 1, "y": 2},
+
+                {"matrix": [6, 5], "x": 2.5, "y": 2, "w": 1.5},
+                {"matrix": [6, 6], "x": 4, "y": 2},
+                {"matrix": [6, 7], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 6, "y": 2},
+                {"matrix": [7, 1], "x": 7, "y": 2},
+                {"matrix": [7, 2], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 6], "x": 12, "y": 2},
+                {"matrix": [7, 7], "x": 13, "y": 2},
+                {"matrix": [8, 0], "x": 14, "y": 2},
+                {"matrix": [8, 1], "x": 15, "y": 2},
+                {"matrix": [8, 2], "x": 16, "y": 2, "w": 1.5},
+
+                {"matrix": [8, 4], "x": 18, "y": 2},
+                {"matrix": [8, 5], "x": 19, "y": 2},
+                {"matrix": [8, 6], "x": 20, "y": 2},
+
+                {"matrix": [9, 0], "x": 0, "y": 3},
+                {"matrix": [9, 1], "x": 1, "y": 3},
+
+                {"matrix": [9, 4], "x": 2.5, "y": 3, "w": 1.75},
+                {"matrix": [9, 5], "x": 4.25, "y": 3},
+                {"matrix": [9, 6], "x": 5.25, "y": 3},
+                {"matrix": [9, 7], "x": 6.25, "y": 3},
+                {"matrix": [10, 0], "x": 7.25, "y": 3},
+                {"matrix": [10, 1], "x": 8.25, "y": 3},
+                {"matrix": [10, 2], "x": 9.25, "y": 3},
+                {"matrix": [10, 3], "x": 10.25, "y": 3},
+                {"matrix": [10, 4], "x": 11.25, "y": 3},
+                {"matrix": [10, 5], "x": 12.25, "y": 3},
+                {"matrix": [10, 6], "x": 13.25, "y": 3},
+                {"matrix": [10, 7], "x": 14.25, "y": 3},
+                {"matrix": [11, 1], "x": 15.25, "y": 3, "w": 2.25},
+
+                {"matrix": [11, 3], "x": 18, "y": 3},
+                {"matrix": [11, 4], "x": 19, "y": 3},
+                {"matrix": [11, 5], "x": 20, "y": 3},
+
+                {"matrix": [11, 7], "x": 0, "y": 4},
+                {"matrix": [12, 1], "x": 1, "y": 4},
+
+                {"matrix": [12, 3], "x": 2.5, "y": 4, "w": 2.25},
+                {"matrix": [12, 4], "x": 4.75, "y": 4},
+                {"matrix": [12, 5], "x": 5.75, "y": 4},
+                {"matrix": [12, 6], "x": 6.75, "y": 4},
+                {"matrix": [12, 7], "x": 7.75, "y": 4},
+                {"matrix": [13, 0], "x": 8.75, "y": 4},
+                {"matrix": [13, 1], "x": 9.75, "y": 4},
+                {"matrix": [13, 2], "x": 10.75, "y": 4},
+                {"matrix": [13, 3], "x": 11.75, "y": 4},
+                {"matrix": [13, 4], "x": 12.75, "y": 4},
+                {"matrix": [13, 5], "x": 13.75, "y": 4},
+                {"matrix": [13, 6], "x": 14.75, "y": 4, "w": 1.75},
+                {"matrix": [13, 7], "x": 16.5, "y": 4},
+
+                {"matrix": [14, 0], "x": 18, "y": 4},
+                {"matrix": [14, 1], "x": 19, "y": 4},
+                {"matrix": [14, 2], "x": 20, "y": 4},
+
+                {"matrix": [14, 7], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [15, 0], "x": 3.75, "y": 5, "w": 1.5},
+                {"matrix": [15, 1], "x": 5.25, "y": 5, "w": 9},
+                {"matrix": [15, 2], "x": 14.25, "y": 5, "w": 1.5},
+                {"matrix": [2, 3], "x": 15.75, "y": 5, "w": 1.75}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/converter/sun_usb/type3/type3.h b/keyboards/converter/sun_usb/type3/type3.h
deleted file mode 100644
index b84a703d6b..0000000000
--- a/keyboards/converter/sun_usb/type3/type3.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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"
-
-#define XXX KC_NO
-
-/* Sun type 3 keyboard
-,-------.  ,-----------------------------------------------------------.  ,-----------.
-| 01| 03|  | 05| 06|     08|     0A|     0C|     0E|     10| 11| 12| 2B|  | 15| 16| 17|
-|-------|  |-----------------------------------------------------------|  |-----------|
-| 19| 1A|  | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A|  | 2D| 2E| 2F|
-|-------|  |-----------------------------------------------------------|  |-----------|
-| 31| 33|  |  35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 42  |  | 44| 45| 46|
-|-------|  |-----------------------------------------------------------|  |-----------|
-| 48| 49|  |  4C  | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57|   59   |  | 5B| 5C| 5D|
-|-------|  |-----------------------------------------------------------|  |-----------|
-| 5F| 61|  |   63   | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D|    6E| 6F|  | 70| 71| 72|
-`-------'  |-----------------------------------------------------------|  `-----------'
-           | 77 | 78  |               79                  | 7A  |   13 |
-           `-----------------------------------------------------------'
-*/
-#define LAYOUT( \
-    k01, k03,  k05, k06,      k08,      k0A,      k0C,      k0E,      k10, k11, k12, k2B,  k15, k16, k17, \
-    k19, k1A,  k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k58, k2A,  k2D, k2E, k2F, \
-    k31, k33,  k35,  k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41,     k42,  k44, k45, k46, \
-    k48, k49,  k4C,   k4D, k4E, k4F, k50, k51, k52, k53, k54, k55, k56, k57,         k59,  k5B, k5C, k5D, \
-    k5F, k61,  k63,    k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D,        k6E, k6F,  k70, k71, k72, \
-               k77, k78,                      k79,                              k7A, k13 \
-) { \
-    { XXX, k01, XXX, k03, XXX, k05, k06, XXX }, \
-    { k08, XXX, k0A, XXX, k0C, XXX, k0E, XXX }, \
-    { k10, k11, k12, k13, XXX, k15, k16, k17 }, \
-    { XXX, k19, k1A, XXX, XXX, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k28, k29, k2A, k2B, XXX, k2D, k2E, k2F }, \
-    { XXX, k31, XXX, k33, XXX, k35, k36, k37 }, \
-    { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, XXX, k44, k45, k46, XXX }, \
-    { k48, k49, XXX, XXX, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k58, k59, XXX, k5B, k5C, k5D, XXX, k5F }, \
-    { XXX, k61, XXX, k63, k64, k65, k66, k67 }, \
-    { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
-    { k70, k71, k72, XXX, XXX, XXX, XXX, k77 }, \
-    { k78, k79, k7A, XXX, XXX, XXX, XXX, XXX } \
-}