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

2 files changed, 98 insertions, 130 deletions

diff --git a/keyboards/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json
index 68dc3c4a6f..85551af773 100644
--- a/keyboards/ai03/quasar/info.json
+++ b/keyboards/ai03/quasar/info.json
@@ -18,91 +18,104 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-				{"label":"Esc", "x":0, "y":0},
-				{"label":"F1", "x":2, "y":0},
-				{"label":"F2", "x":3, "y":0},
-				{"label":"F3", "x":4, "y":0},
-				{"label":"F4", "x":5, "y":0},
-				{"label":"F5", "x":6.5, "y":0},
-				{"label":"F6", "x":7.5, "y":0},
-				{"label":"F7", "x":8.5, "y":0},
-				{"label":"F8", "x":9.5, "y":0},
-				{"label":"F9", "x":11, "y":0},
-				{"label":"F10", "x":12, "y":0},
-				{"label":"F11", "x":13, "y":0},
-				{"label":"F12", "x":14, "y":0},
-				{"label":"PrtSc", "x":15.5, "y":0},
-				{"label":"Scroll Lock", "x":16.5, "y":0},
-				{"label":"Pause", "x":17.5, "y":0},
-				{"label":"~", "x":0, "y":1.75},
-				{"label":"!", "x":1, "y":1.75},
-				{"label":"@", "x":2, "y":1.75},
-				{"label":"#", "x":3, "y":1.75},
-				{"label":"$", "x":4, "y":1.75},
-				{"label":"%", "x":5, "y":1.75},
-				{"label":"^", "x":6, "y":1.75},
-				{"label":"&", "x":7, "y":1.75},
-				{"label":"*", "x":8, "y":1.75},
-				{"label":"(", "x":9, "y":1.75},
-				{"label":")", "x":10, "y":1.75},
-				{"label":"_", "x":11, "y":1.75},
-				{"label":"+", "x":12, "y":1.75},
-				{"label":"Backspace", "x":13, "y":1.75, "w":2},
-				{"label":"Insert", "x":15.5, "y":1.75},
-				{"label":"Home", "x":16.5, "y":1.75},
-				{"label":"PgUp", "x":17.5, "y":1.75},
-				{"label":"Tab", "x":0, "y":2.75, "w":1.5},
-				{"label":"Q", "x":1.5, "y":2.75},
-				{"label":"W", "x":2.5, "y":2.75},
-				{"label":"E", "x":3.5, "y":2.75},
-				{"label":"R", "x":4.5, "y":2.75},
-				{"label":"T", "x":5.5, "y":2.75},
-				{"label":"Y", "x":6.5, "y":2.75},
-				{"label":"U", "x":7.5, "y":2.75},
-				{"label":"I", "x":8.5, "y":2.75},
-				{"label":"O", "x":9.5, "y":2.75},
-				{"label":"P", "x":10.5, "y":2.75},
-				{"label":"{", "x":11.5, "y":2.75},
-				{"label":"}", "x":12.5, "y":2.75},
-				{"label":"|", "x":13.5, "y":2.75, "w":1.5},
-				{"label":"Delete", "x":15.5, "y":2.75},
-				{"label":"End", "x":16.5, "y":2.75},
-				{"label":"PgDn", "x":17.5, "y":2.75},
-				{"label":"Caps Lock", "x":0, "y":3.75, "w":1.25},
-				{"label":"A", "x":1.75, "y":3.75},
-				{"label":"S", "x":2.75, "y":3.75},
-				{"label":"D", "x":3.75, "y":3.75},
-				{"label":"F", "x":4.75, "y":3.75},
-				{"label":"G", "x":5.75, "y":3.75},
-				{"label":"H", "x":6.75, "y":3.75},
-				{"label":"J", "x":7.75, "y":3.75},
-				{"label":"K", "x":8.75, "y":3.75},
-				{"label":"L", "x":9.75, "y":3.75},
-				{"label":":", "x":10.75, "y":3.75},
-				{"label":"\"", "x":11.75, "y":3.75},
-				{"label":"Enter", "x":12.75, "y":3.75, "w":2.25},
-				{"label":"Shift", "x":0, "y":4.75, "w":2.25},
-				{"label":"Z", "x":2.25, "y":4.75},
-				{"label":"X", "x":3.25, "y":4.75},
-				{"label":"C", "x":4.25, "y":4.75},
-				{"label":"V", "x":5.25, "y":4.75},
-				{"label":"B", "x":6.25, "y":4.75},
-				{"label":"N", "x":7.25, "y":4.75},
-				{"label":"M", "x":8.25, "y":4.75},
-				{"label":"<", "x":9.25, "y":4.75},
-				{"label":">", "x":10.25, "y":4.75},
-				{"label":"?", "x":11.25, "y":4.75},
-				{"label":"Shift", "x":12.25, "y":4.75, "w":2.75},
-				{"label":"\u2191", "x":16.5, "y":4.75},
-				{"label":"Ctrl", "x":0, "y":5.75, "w":1.5},
-				{"label":"Alt", "x":2.5, "y":5.75, "w":1.5},
-				{"x":4, "y":5.75, "w":7},
-				{"label":"Alt", "x":11, "y":5.75, "w":1.5},
-				{"label":"Ctrl", "x":13.5, "y":5.75, "w":1.5},
-				{"label":"\u2190", "x":15.5, "y":5.75},
-				{"label":"\u2193", "x":16.5, "y":5.75},
-				{"label":"\u2192", "x":17.5, "y":5.75}
-			]
+                {"matrix": [7, 2], "x": 0, "y": 0},
+
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [6, 4], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+
+                {"matrix": [7, 6], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [6, 9], "x": 8.5, "y": 0},
+                {"matrix": [5, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [5, 6], "x": 11, "y": 0},
+                {"matrix": [4, 6], "x": 12, "y": 0},
+                {"matrix": [4, 11], "x": 13, "y": 0},
+                {"matrix": [4, 12], "x": 14, "y": 0},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 0},
+                {"matrix": [3, 15], "x": 16.5, "y": 0},
+                {"matrix": [1, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [5, 2], "x": 0, "y": 1.75},
+                {"matrix": [4, 2], "x": 1, "y": 1.75},
+                {"matrix": [4, 3], "x": 2, "y": 1.75},
+                {"matrix": [4, 4], "x": 3, "y": 1.75},
+                {"matrix": [4, 5], "x": 4, "y": 1.75},
+                {"matrix": [5, 5], "x": 5, "y": 1.75},
+                {"matrix": [5, 7], "x": 6, "y": 1.75},
+                {"matrix": [4, 7], "x": 7, "y": 1.75},
+                {"matrix": [4, 8], "x": 8, "y": 1.75},
+                {"matrix": [4, 9], "x": 9, "y": 1.75},
+                {"matrix": [4, 10], "x": 10, "y": 1.75},
+                {"matrix": [5, 10], "x": 11, "y": 1.75},
+                {"matrix": [5, 8], "x": 12, "y": 1.75},
+                {"matrix": [6, 6], "x": 13, "y": 1.75, "w": 2},
+
+                {"matrix": [5, 12], "x": 15.5, "y": 1.75},
+                {"matrix": [5, 14], "x": 16.5, "y": 1.75},
+                {"matrix": [5, 13], "x": 17.5, "y": 1.75},
+
+                {"matrix": [6, 2], "x": 0, "y": 2.75, "w": 1.5},
+                {"matrix": [3, 2], "x": 1.5, "y": 2.75},
+                {"matrix": [3, 3], "x": 2.5, "y": 2.75},
+                {"matrix": [3, 4], "x": 3.5, "y": 2.75},
+                {"matrix": [3, 5], "x": 4.5, "y": 2.75},
+                {"matrix": [6, 5], "x": 5.5, "y": 2.75},
+                {"matrix": [6, 7], "x": 6.5, "y": 2.75},
+                {"matrix": [3, 7], "x": 7.5, "y": 2.75},
+                {"matrix": [3, 8], "x": 8.5, "y": 2.75},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.75},
+                {"matrix": [3, 10], "x": 10.5, "y": 2.75},
+                {"matrix": [6, 10], "x": 11.5, "y": 2.75},
+                {"matrix": [6, 8], "x": 12.5, "y": 2.75},
+                {"matrix": [2, 6], "x": 13.5, "y": 2.75, "w": 1.5},
+
+                {"matrix": [5, 11], "x": 15.5, "y": 2.75},
+                {"matrix": [4, 14], "x": 16.5, "y": 2.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 2.75},
+
+                {"matrix": [6, 3], "x": 0, "y": 3.75, "w": 1.25},
+                {"matrix": [2, 2], "x": 1.75, "y": 3.75},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.75},
+                {"matrix": [2, 4], "x": 3.75, "y": 3.75},
+                {"matrix": [2, 5], "x": 4.75, "y": 3.75},
+                {"matrix": [7, 5], "x": 5.75, "y": 3.75},
+                {"matrix": [7, 7], "x": 6.75, "y": 3.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 3.75},
+                {"matrix": [2, 8], "x": 8.75, "y": 3.75},
+                {"matrix": [2, 9], "x": 9.75, "y": 3.75},
+                {"matrix": [2, 10], "x": 10.75, "y": 3.75},
+                {"matrix": [7, 10], "x": 11.75, "y": 3.75},
+                {"matrix": [1, 6], "x": 12.75, "y": 3.75, "w": 2.25},
+
+                {"matrix": [6, 1], "x": 0, "y": 4.75, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4.75},
+                {"matrix": [1, 3], "x": 3.25, "y": 4.75},
+                {"matrix": [1, 4], "x": 4.25, "y": 4.75},
+                {"matrix": [1, 5], "x": 5.25, "y": 4.75},
+                {"matrix": [0, 5], "x": 6.25, "y": 4.75},
+                {"matrix": [0, 7], "x": 7.25, "y": 4.75},
+                {"matrix": [1, 7], "x": 8.25, "y": 4.75},
+                {"matrix": [1, 8], "x": 9.25, "y": 4.75},
+                {"matrix": [1, 9], "x": 10.25, "y": 4.75},
+                {"matrix": [0, 10], "x": 11.25, "y": 4.75},
+                {"matrix": [1, 1], "x": 12.25, "y": 4.75, "w": 2.75},
+
+                {"matrix": [7, 14], "x": 16.5, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.75, "w": 1.5},
+                {"matrix": [7, 15], "x": 2.5, "y": 5.75, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 5.75, "w": 7},
+                {"matrix": [0, 15], "x": 11, "y": 5.75, "w": 1.5},
+                {"matrix": [1, 0], "x": 13.5, "y": 5.75, "w": 1.5},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 5.75},
+                {"matrix": [0, 11], "x": 16.5, "y": 5.75},
+                {"matrix": [0, 12], "x": 17.5, "y": 5.75}
+            ]
         }
     }
 }
diff --git a/keyboards/ai03/quasar/quasar.h b/keyboards/ai03/quasar/quasar.h
deleted file mode 100644
index 4125f81b5a..0000000000
--- a/keyboards/ai03/quasar/quasar.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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 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( \
-    K702,       K503, K504, K604, K704,    K706, K708, K609, K509,    K506, K406, K411, K412,    K415, K315, K114, \
-	K502, K402, K403, K404, K405, K505, K507, K407, K408, K409, K410, K510, K508,       K606,    K512, K514, K513, \
-	K602, K302, K303, K304, K305, K605, K607, K307, K308, K309, K310, K610, K608,       K206,    K511, K414, K413, \
-	K603, K202, K203, K204, K205, K705, K707, K207, K208, K209, K210, K710,             K106,                      \
-	K601,       K102, K103, K104, K105, K005, K007, K107, K108, K109, K010,             K101,          K714,       \
-	K500,       K715,                         K006,                         K015,       K100,    K014, K011, K012  \
-) \
-{ \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K005,  K006,  K007,  KC_NO, KC_NO, K010,  K011,  K012,  KC_NO, K014,  K015  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO, KC_NO, KC_NO, KC_NO, K114,  KC_NO }, \
-	{ KC_NO, KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ KC_NO, KC_NO, K302,  K303,  K304,  K305,  KC_NO, K307,  K308,  K309,  K310,  KC_NO, KC_NO, KC_NO, KC_NO, K315  }, \
-	{ KC_NO, KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415  }, \
-	{ K500,  KC_NO, K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  K512,  K513,  K514,  KC_NO }, \
-	{ KC_NO, K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ KC_NO, KC_NO, K702,  KC_NO, K704,  K705,  K706,  K707,  K708,  KC_NO, K710,  KC_NO, KC_NO, KC_NO, K714,  K715  }  \
-}