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

2 files changed, 67 insertions, 116 deletions

diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json
index 62e9d019c3..f15b769649 100644
--- a/keyboards/sparrow62/info.json
+++ b/keyboards/sparrow62/info.json
@@ -21,72 +21,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "`~", "x": 0, "y": 0.5 },
-                { "label": "1!", "x": 1, "y": 0.38 },
-                { "label": "2@", "x": 2, "y": 0.13 },
-                { "label": "3#", "x": 3, "y": 0 },
-                { "label": "4$", "x": 4, "y": 0.13 },
-                { "label": "5%", "x": 5, "y": 0.25 },
-                { "label": "7&", "x": 9, "y": 0.25 },
-                { "label": "8*", "x": 10, "y": 0.13 },
-                { "label": "9(", "x": 11, "y": 0 },
-                { "label": "0)", "x": 12, "y": 0.13 },
-                { "label": "-_", "x": 13, "y": 0.38 },
-                { "label": "=+", "x": 14, "y": 0.5 },
+                {"matrix": [0, 6], "x": 0, "y": 0.5},
+                {"matrix": [0, 5], "x": 1, "y": 0.38},
+                {"matrix": [0, 4], "x": 2, "y": 0.13},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0.13},
+                {"matrix": [0, 1], "x": 5, "y": 0.25},
 
-                { "label": "Tab", "x": 0, "y": 1.5 },
-                { "label": "Q", "x": 1, "y": 1.38 },
-                { "label": "W", "x": 2, "y": 1.13 },
-                { "label": "E", "x": 3, "y": 1 },
-                { "label": "R", "x": 4, "y": 1.13 },
-                { "label": "T", "x": 5, "y": 1.25 },
-                { "label": "6^", "x": 6, "y": 0.75 },
-                { "label": "6^", "x": 8, "y": 0.75 },
-                { "label": "U", "x": 9, "y": 1.25 },
-                { "label": "I", "x": 10, "y": 1.13 },
-                { "label": "O", "x": 11, "y": 1 },
-                { "label": "P", "x": 12, "y": 1.13 },
-                { "label": "[{", "x": 13, "y": 1.38 },
-                { "label": "]}", "x": 14, "y": 1.5 },
+                {"matrix": [5, 1], "x": 9, "y": 0.25},
+                {"matrix": [5, 2], "x": 10, "y": 0.13},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0.13},
+                {"matrix": [5, 5], "x": 13, "y": 0.38},
+                {"matrix": [5, 6], "x": 14, "y": 0.5},
 
-                { "label": "Ctrl", "x": 0, "y": 2.5 },
-                { "label": "A", "x": 1, "y": 2.38 },
-                { "label": "S", "x": 2, "y": 2.13 },
-                { "label": "D", "x": 3, "y": 2 },
-                { "label": "F", "x": 4, "y": 2.13 },
-                { "label": "G", "x": 5, "y": 2.25 },
-                { "label": "Y", "x": 6, "y": 1.75 },
-                { "label": "Y", "x": 8, "y": 1.75 },
-                { "label": "H", "x": 9, "y": 2.25 },
-                { "label": "J", "x": 10, "y": 2.13 },
-                { "label": "K", "x": 11, "y": 2 },
-                { "label": "L", "x": 12, "y": 2.13 },
-                { "label": ";:", "x": 13, "y": 2.38 },
-                { "label": "'\"", "x": 14, "y": 2.5 },
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 5], "x": 1, "y": 1.38},
+                {"matrix": [1, 4], "x": 2, "y": 1.13},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1.13},
+                {"matrix": [1, 1], "x": 5, "y": 1.25},
+                {"matrix": [0, 0], "x": 6, "y": 0.75},
 
-                { "label": "Shift", "x": 0, "y": 3.5 },
-                { "label": "Z", "x": 1, "y": 3.38 },
-                { "label": "X", "x": 2, "y": 3.13 },
-                { "label": "C", "x": 3, "y": 3 },
-                { "label": "V", "x": 4, "y": 3.13 },
-                { "label": "B", "x": 5, "y": 3.25 },
-                { "label": "[{", "x": 6, "y": 2.75 },
-                { "label": "]}", "x": 8, "y": 2.75 },
-                { "label": "N", "x": 9, "y": 3.25 },
-                { "label": "M", "x": 10, "y": 3.13 },
-                { "label": ",<", "x": 11, "y": 3 },
-                { "label": ",>", "x": 12, "y": 3.13 },
-                { "label": "/?", "x": 13, "y": 3.38 },
-                { "label": "\\|", "x": 14, "y": 3.5 },
+                {"matrix": [5, 0], "x": 8, "y": 0.75},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.13},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1.13},
+                {"matrix": [6, 5], "x": 13, "y": 1.38},
+                {"matrix": [6, 6], "x": 14, "y": 1.5},
 
-                { "label": "Esc", "x": 2.5, "y": 4.13 },
-                { "label": "Alt", "x": 3.5, "y": 4.13 },
-                { "label": "Win", "x": 4.5, "y": 4.25 },
-                { "label": "Space", "x": 5.75, "y": 4.5, "w": 1.25 },
-                { "label": "Enter", "x": 8, "y": 4.5, "w": 1.25 },
-                { "label": "RAISE", "x": 9.5, "y": 4.25 },
-                { "label": "Alt", "x": 10.5, "y": 4.13 },
-                { "label": "BkSp", "x": 11.5, "y": 4.13 }
+                {"matrix": [2, 6], "x": 0, "y": 2.5},
+                {"matrix": [2, 5], "x": 1, "y": 2.38},
+                {"matrix": [2, 4], "x": 2, "y": 2.13},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2.13},
+                {"matrix": [2, 1], "x": 5, "y": 2.25},
+                {"matrix": [1, 0], "x": 6, "y": 1.75},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.75},
+                {"matrix": [7, 1], "x": 9, "y": 2.25},
+                {"matrix": [7, 2], "x": 10, "y": 2.13},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2.13},
+                {"matrix": [7, 5], "x": 13, "y": 2.38},
+                {"matrix": [7, 6], "x": 14, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5},
+                {"matrix": [3, 5], "x": 1, "y": 3.38},
+                {"matrix": [3, 4], "x": 2, "y": 3.13},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3.13},
+                {"matrix": [3, 1], "x": 5, "y": 3.25},
+                {"matrix": [2, 0], "x": 6, "y": 2.75},
+
+                {"matrix": [7, 0], "x": 8, "y": 2.75},
+                {"matrix": [8, 1], "x": 9, "y": 3.25},
+                {"matrix": [8, 2], "x": 10, "y": 3.13},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3.13},
+                {"matrix": [8, 5], "x": 13, "y": 3.38},
+                {"matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 3], "x": 2.5, "y": 4.13},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.13},
+                {"matrix": [4, 1], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 0], "x": 5.75, "y": 4.5, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 8, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.13},
+                {"matrix": [9, 3], "x": 11.5, "y": 4.13}
             ]
         }
     }
diff --git a/keyboards/sparrow62/sparrow62.h b/keyboards/sparrow62/sparrow62.h
deleted file mode 100644
index 15722f1da0..0000000000
--- a/keyboards/sparrow62/sparrow62.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2020 Atsushi Morimoto @74th
-
-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"
-
-/*
- * /-----+-----+-----+-----+-----+-----\             /-----+-----+-----+-----+-----+-----\
- * | L06 | L05 | L04 | L03 | L02 | L01 |             | R01 | R02 | R03 | R04 | R05 | R06 |
- * |-----+-----+-----+-----+-----+-----+-----\ /-----+-----+-----+-----+-----+-----+-----|
- * | L16 | L15 | L14 | L13 | L12 | L11 | L00 | | R00 | R11 | R12 | R13 | R14 | R15 | R16 |
- * |-----+-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----+-----|
- * | L26 | L25 | L24 | L23 | L22 | L21 | L10 | | R10 | R21 | R22 | R23 | R24 | R25 | R26 |
- * |-----+-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----+-----|
- * | L36 | L35 | L34 | L33 | L32 | L31 | L20 | | R20 | R31 | R32 | R33 | R34 | R35 | R36 |
- * \-----+-----+---+-----+-----+-----+-----+-/ \-+-----+-----+-----+-----+---+-----+-----/
- *                 | L43 | L42 | L41 | L30 |     | R30 | R41 | R42 | R43 |
- *                 \-----+-----+-----+-----/     \-----+-----+-----+-----/
- */
-
-#define LAYOUT( \
-    L06, L05, L04, L03, L02, L01,           R01, R02, R03, R04, R05, R06, \
-    L16, L15, L14, L13, L12, L11, L00, R00, R11, R12, R13, R14, R15, R16, \
-    L26, L25, L24, L23, L22, L21, L10, R10, R21, R22, R23, R24, R25, R26, \
-    L36, L35, L34, L33, L32, L31, L20, R20, R31, R32, R33, R34, R35, R36, \
-                   L43, L42, L41, L30, R30, R41, R42, R43 \
-  ) \
-  { \
-    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
-    {   L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
-    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
-    {   L30,   L31,   L32,   L33,   L34,   L35,   L36 }, \
-    { KC_NO,   L41,   L42,   L43, KC_NO, KC_NO, KC_NO }, \
-    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
-    {   R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
-    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
-    {   R30,   R31,   R32,   R33,   R34,   R35,   R36 }, \
-    { KC_NO,   R41,   R42,   R43, KC_NO, KC_NO, KC_NO } \
-  }