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

2 files changed, 76 insertions, 52 deletions

diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index a4731bae00..bacca0ef6d 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -26,7 +26,82 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":2, "y":0}, {"label":"1", "x":3, "y":0}, {"label":"2", "x":4, "y":0}, {"label":"3", "x":5, "y":0}, {"label":"4", "x":6, "y":0}, {"label":"5", "x":7, "y":0}, {"label":"_", "x":8, "y":0}, {"label":"+", "x":9.5, "y":0}, {"label":"6", "x":10.5, "y":0}, {"label":"7", "x":11.5, "y":0}, {"label":"8", "x":12.5, "y":0}, {"label":"9", "x":13.5, "y":0}, {"label":"0", "x":14.5, "y":0}, {"label":"\\", "x":15.5, "y":0}, {"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":"{", "x":7.75, "y":1}, {"label":"}", "x":9.75, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"Backace", "x":15.75, "y":1, "w":1.5}, {"label":"Control", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"~", "x":7.5, "y":2}, {"label":"\"", "x":10, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"Return", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"Caps", "x":7.25, "y":3}, {"label":"Del", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":1.75}, {"label":"Fn", "x":18, "y":3}, {"label":"", "x":2.75, "y":4, "w":1.25}, {"label":"", "x":4, "y":4, "w":1.25}, {"label":"Fn", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2}, {"x":10, "y":4, "w":2}, {"label":"Fn", "x":12, "y":4, "w":1.25}, {"label":"", "x":13.25, "y":4, "w":1.25}, {"label":"", "x":14.5, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 6, "y": 0},
+                {"matrix": [0, 5], "x": 7, "y": 0},
+                {"matrix": [0, 6], "x": 8, "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": [5, 6], "x": 15.5, "y": 0},
+
+                {"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": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.25, "y": 3},
+                {"matrix": [8, 1], "x": 11.25, "y": 3},
+                {"matrix": [8, 2], "x": 12.25, "y": 3},
+                {"matrix": [8, 3], "x": 13.25, "y": 3},
+                {"matrix": [8, 4], "x": 14.25, "y": 3},
+                {"matrix": [8, 5], "x": 15.25, "y": 3},
+                {"matrix": [8, 6], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [9, 6], "x": 18, "y": 3},
+
+                {"matrix": [4, 0], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 4, "w": 2},
+
+                {"matrix": [9, 0], "x": 10, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 12, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 14.5, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kagizaraya/scythe/scythe.h b/keyboards/kagizaraya/scythe/scythe.h
deleted file mode 100644
index c13c63fdd0..0000000000
--- a/keyboards/kagizaraya/scythe/scythe.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT( \
-        L01, L02, L03, L04, L05, L06, L07, R01, R02, R03, R04, R05, R06, R07, \
-        L08, L09, L10, L11, L12, L13, L14, R08, R09, R10, R11, R12, R13, R14, \
-        L15, L16, L17, L18, L19, L20, L21, R15, R16, R17, R18, R19, R20, R21, \
-        L22, L23, L24, L25, L26, L27, L28, R22, R23, R24, R25, R26, R27, R28, R33, \
-                       L29, L30, L31, L32, R29, R30, R31, R32 \
-    ) \
-    { \
-        { L01, L02, L03, L04, L05, L06, L07 }, \
-        { L08, L09, L10, L11, L12, L13, L14 }, \
-        { L15, L16, L17, L18, L19, L20, L21 }, \
-        { L22, L23, L24, L25, L26, L27, L28 }, \
-        { L29, L30, L31, L32, ___, ___, ___ }, \
-        { R01, R02, R03, R04, R05, R06, R07 }, \
-        { R08, R09, R10, R11, R12, R13, R14 }, \
-        { R15, R16, R17, R18, R19, R20, R21 }, \
-        { R22, R23, R24, R25, R26, R27, R28 }, \
-        { R29, R30, R31, R32, ___, ___, R33 }  \
-    }
-