Move single `LAYOUT_all`s to data driven (#20430)

3 files changed, 80 insertions, 109 deletions

diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index 0c0078fb5e..d82de523a7 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -59,73 +59,85 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Home", "x": 0, "y": 0 },
-                { "label": "~", "x": 1.25, "y": 0 },
-                { "label": "!", "x": 2.25, "y": 0 },
-                { "label": "@", "x": 3.25, "y": 0 },
-                { "label": "#", "x": 4.25, "y": 0 },
-                { "label": "$", "x": 5.25, "y": 0 },
-                { "label": "%", "x": 6.25, "y": 0 },
-                { "label": "^", "x": 7.25, "y": 0 },
-                { "label": "&", "x": 10.25, "y": 0 },
-                { "label": "*", "x": 11.25, "y": 0 },
-                { "label": "(", "x": 12.25, "y": 0 },
-                { "label": ")", "x": 13.25, "y": 0 },
-                { "label": "_", "x": 14.25, "y": 0 },
-                { "label": "+", "x": 15.25, "y": 0 },
-                { "label": "|", "x": 16.25, "y": 0 },
-                { "label": "~", "x": 17.25, "y": 0 },
-                { "label": "PgUp", "x": 0, "y": 1 },
-                { "label": "Tab", "x": 1.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 2.75, "y": 1 },
-                { "label": "W", "x": 3.75, "y": 1 },
-                { "label": "E", "x": 4.75, "y": 1 },
-                { "label": "R", "x": 5.75, "y": 1 },
-                { "label": "T", "x": 6.75, "y": 1 },
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "{", "x": 14.75, "y": 1 },
-                { "label": "}", "x": 15.75, "y": 1 },
-                { "label": "Backspace", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgDn", "x": 0, "y": 2 },
-                { "label": "Caps Lock", "x": 1.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 3, "y": 2 },
-                { "label": "S", "x": 4, "y": 2 },
-                { "label": "D", "x": 5, "y": 2 },
-                { "label": "F", "x": 6, "y": 2 },
-                { "label": "G", "x": 7, "y": 2 },
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ":", "x": 14, "y": 2 },
-                { "label": "\"", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 1.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 3.5, "y": 3 },
-                { "label": "X", "x": 4.5, "y": 3 },
-                { "label": "C", "x": 5.5, "y": 3 },
-                { "label": "V", "x": 6.5, "y": 3 },
-                { "label": "B", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 9.5, "y": 3 },
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": "<", "x": 12.5, "y": 3 },
-                { "label": ">", "x": 13.5, "y": 3 },
-                { "label": "?", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Fn", "x": 17.25, "y": 3 },
-                { "label": "Ctrl", "x": 1.25, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 4, "y": 4, "w": 1.5 },
-                { "label": "Space", "x": 5.5, "y": 4, "w": 2.25 },
-                { "label": "Space", "x": 7.75, "y": 4 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Space", "x": 11, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 12.25, "y": 4, "w": 1.5 },
-                { "label": "Ctrl", "x": 16.75, "y": 4, "w": 1.5 }
+                {"matrix": [4, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [4, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.75, "y": 1},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.75, "y": 1},
+                {"matrix": [1, 7], "x": 10.75, "y": 1},
+                {"matrix": [1, 8], "x": 11.75, "y": 1},
+                {"matrix": [1, 9], "x": 12.75, "y": 1},
+                {"matrix": [1, 10], "x": 13.75, "y": 1},
+                {"matrix": [1, 11], "x": 14.75, "y": 1},
+                {"matrix": [1, 12], "x": 15.75, "y": 1},
+                {"matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 2], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7, "y": 2},
+
+                {"matrix": [2, 6], "x": 10, "y": 2},
+                {"matrix": [2, 7], "x": 11, "y": 2},
+                {"matrix": [2, 8], "x": 12, "y": 2},
+                {"matrix": [2, 9], "x": 13, "y": 2},
+                {"matrix": [2, 10], "x": 14, "y": 2},
+                {"matrix": [2, 11], "x": 15, "y": 2},
+                {"matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 6], "x": 9.5, "y": 3},
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+
+                {"matrix": [4, 7], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/dyz/synthesis60/synthesis60.c b/keyboards/dyz/synthesis60/synthesis60.c
index e65bbe4697..71819ffdb5 100644
--- a/keyboards/dyz/synthesis60/synthesis60.c
+++ b/keyboards/dyz/synthesis60/synthesis60.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "synthesis60.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/dyz/synthesis60/synthesis60.h b/keyboards/dyz/synthesis60/synthesis60.h
deleted file mode 100644
index 0ad730e128..0000000000
--- a/keyboards/dyz/synthesis60/synthesis60.h
+++ /dev/null
@@ -1,41 +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"
-#define KNO KC_NO
-
-/* 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_all( \
-	K40, K00, K01, K02, K03, K04, K05, K06,     K07, K08, K09, K0A, K0B, K0C, K0D, K4D, \
-    K41, K10, K11, K12, K13, K14, K15,          K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K42, K20, K21, K22, K23, K24, K25,          K26, K27, K28, K29, K2A, K2B, K2C,     \
-         K30, K31, K32, K33, K34, K35,          K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-         K43,           K44, K45, K46,          K47, K48, K49,                     K4C \
-) { \
-	{ K00,  K01,  K02,  K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-	{ K10,  K11,  K12,  K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-	{ K20,  K21,  K22,  K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KNO }, \
-	{ K30,  K31,  K32,  K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-	{ K40,  K41,  K42,  K43, K44, K45, K46, K47, K48, K49, KNO, KNO, K4C, K4D }  \
-}