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

3 files changed, 103 insertions, 48 deletions

diff --git a/keyboards/doppelganger/doppelganger.c b/keyboards/doppelganger/doppelganger.c
index 304d764028..9a9fc0679f 100644
--- a/keyboards/doppelganger/doppelganger.c
+++ b/keyboards/doppelganger/doppelganger.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 "doppelganger.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(C6);
diff --git a/keyboards/doppelganger/doppelganger.h b/keyboards/doppelganger/doppelganger.h
deleted file mode 100644
index c065c28c46..0000000000
--- a/keyboards/doppelganger/doppelganger.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2019 Yiancar-Designs
- *
- * 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( \
-          L01,    L02,  L03,  L04,  L05,  L06,  L07,  L08,      R00,  R01,  R02,  R03,  R04,  R05,  R06,  R07, \
-    L10,  L11,    L12,  L13,  L14,  L15,  L16,  L17,            R10,  R11,  R12,  R13,  R14,  R15,  R16,  R17,    R18, \
-    L20,  L21,    L22,  L23,  L24,  L25,  L26,  L27,            R20,  R21,  R22,  R23,  R24,  R25,  R26,  R27,    R28, \
-    L30,  L31,    L32,  L33,  L34,  L35,  L36,  L37,  L38,            R31,  R32,  R33,  R34,  R35,  R36,  R37,    R38, \
-    L40,  L41,    L42,  L43,  L44,     L45,     L46,                  R42,        R43,  R44,  R45,  R46,  R47,  R48 \
-) \
-{ \
-    { KC_NO, L01,   L02, L03, L04, L05, L06,   L07,   L08 }, \
-    {   L10, L11,   L12, L13, L14, L15, L16,   L17, KC_NO }, \
-    {   L20, L21,   L22, L23, L24, L25, L26,   L27, KC_NO }, \
-    {   L30, L31,   L32, L33, L34, L35, L36,   L37,   L38 }, \
-    {   L40, L41,   L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
-    {   R00, R01,   R02, R03, R04, R05, R06,   R07, KC_NO }, \
-    {   R10, R11,   R12, R13, R14, R15, R16,   R17,   R18 }, \
-    {   R20, R21,   R22, R23, R24, R25, R26,   R27,   R28 }, \
-    { KC_NO, R31,   R32, R33, R34, R35, R36,   R37,   R38 }, \
-    { KC_NO, KC_NO, R42, R43, R44, R45, R46,   R47,   R48 }, \
-}
diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json
index 831922f945..a13225c1ca 100644
--- a/keyboards/doppelganger/info.json
+++ b/keyboards/doppelganger/info.json
@@ -32,7 +32,108 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"F1", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"1", "x":3.5, "y":0}, {"label":"2", "x":4.5, "y":0}, {"label":"3", "x":5.5, "y":0}, {"label":"4", "x":6.5, "y":0}, {"label":"5", "x":7.5, "y":0}, {"label":"6", "x":8.5, "y":0}, {"label":"7", "x":10.5, "y":0}, {"label":"8", "x":11.5, "y":0}, {"label":"9", "x":12.5, "y":0}, {"label":"0", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"label":"F2", "x":0, "y":1}, {"label":"F3", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Pg Up", "x":19, "y":1}, {"label":"F4", "x":0, "y":2}, {"label":"F5", "x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"~", "x":16.25, "y":2}, {"label":"Enter", "x":17.25, "y":2, "w":1.25}, {"label":"Pg Dn", "x":19, "y":2}, {"label":"F6", "x":0, "y":3}, {"label":"F7", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":1.25}, {"label":"|", "x":3.75, "y":3}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"Up", "x":17.75, "y":3.25}, {"label":"Fn", "x":19, "y":3}, {"label":"F8", "x":0, "y":4}, {"label":"F9", "x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, {"label":"Win", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"x":8.25, "y":4}, {"x":10.25, "y":4, "w":2.75}, {"label":"Alt", "x":13, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"label":"Win", "x":15.25, "y":4, "w":1.25}, {"label":"Left", "x":16.75, "y":4.25}, {"label":"Down", "x":17.75, "y":4.25}, {"label":"Right", "x":18.75, "y":4.25}]
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2},
+                {"matrix": [7, 7], "x": 17.25, "y": 2, "w": 1.25},
+
+                {"matrix": [7, 8], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+                {"matrix": [8, 1], "x": 10.75, "y": 3},
+                {"matrix": [8, 2], "x": 11.75, "y": 3},
+                {"matrix": [8, 3], "x": 12.75, "y": 3},
+                {"matrix": [8, 4], "x": 13.75, "y": 3},
+                {"matrix": [8, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 7], "x": 17.75, "y": 3.25},
+
+                {"matrix": [8, 8], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4},
+                {"matrix": [9, 5], "x": 15.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 7], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.75, "y": 4.25}
+            ]
         }
     }
 }