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

2 files changed, 88 insertions, 125 deletions

diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json
index a1355ce5a1..c43883e8bd 100644
--- a/keyboards/ep/comsn/mollydooker/info.json
+++ b/keyboards/ep/comsn/mollydooker/info.json
@@ -20,90 +20,94 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "VolDn", "x": 0, "y": 0 },
-                { "label": "VolUp", "x": 1, "y": 0 },
-                { "label": "Mute", "x": 2, "y": 0 },
-                { "label": "~", "x": 3, "y": 0 },
-                { "label": "Esc", "x": 4, "y": 0 },
-                { "label": "!", "x": 5, "y": 0 },
-                { "label": "@", "x": 6, "y": 0 },
-                { "label": "#", "x": 7, "y": 0 },
-                { "label": "$", "x": 8, "y": 0 },
-                { "label": "%", "x": 9, "y": 0 },
-                { "label": "^", "x": 10, "y": 0 },
-                { "label": "&", "x": 11, "y": 0 },
-                { "label": "*", "x": 12, "y": 0 },
-                { "label": "(", "x": 13, "y": 0 },
-                { "label": ")", "x": 14, "y": 0 },
-                { "label": "_", "x": 15, "y": 0 },
-                { "label": "+", "x": 16, "y": 0 },
-                { "label": "Backspace", "x": 17, "y": 0, "w": 2 },
-                { "label": "Del", "x": 19, "y": 0 },
-                { "label": "7", "x": 0, "y": 1 },
-                { "label": "8", "x": 1, "y": 1 },
-                { "label": "9", "x": 2, "y": 1 },
-                { "label": "+", "x": 3, "y": 1, "h": 2 },
-                { "label": "Tab", "x": 4, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 5.5, "y": 1 },
-                { "label": "W", "x": 6.5, "y": 1 },
-                { "label": "E", "x": 7.5, "y": 1 },
-                { "label": "R", "x": 8.5, "y": 1 },
-                { "label": "T", "x": 9.5, "y": 1 },
-                { "label": "Y", "x": 10.5, "y": 1 },
-                { "label": "U", "x": 11.5, "y": 1 },
-                { "label": "I", "x": 12.5, "y": 1 },
-                { "label": "O", "x": 13.5, "y": 1 },
-                { "label": "P", "x": 14.5, "y": 1 },
-                { "label": "{", "x": 15.5, "y": 1 },
-                { "label": "}", "x": 16.5, "y": 1 },
-                { "label": "|", "x": 17.5, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 19, "y": 1 },
-                { "label": "4", "x": 0, "y": 2 },
-                { "label": "5", "x": 1, "y": 2 },
-                { "label": "6", "x": 2, "y": 2 },
-                { "label": "Caps Lock", "x": 4, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 5.75, "y": 2 },
-                { "label": "S", "x": 6.75, "y": 2 },
-                { "label": "D", "x": 7.75, "y": 2 },
-                { "label": "F", "x": 8.75, "y": 2 },
-                { "label": "G", "x": 9.75, "y": 2 },
-                { "label": "H", "x": 10.75, "y": 2 },
-                { "label": "J", "x": 11.75, "y": 2 },
-                { "label": "K", "x": 12.75, "y": 2 },
-                { "label": "L", "x": 13.75, "y": 2 },
-                { "label": ":", "x": 14.75, "y": 2 },
-                { "label": "\"", "x": 15.75, "y": 2 },
-                { "label": "Enter", "x": 16.75, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 19, "y": 2 },
-                { "label": "1", "x": 0, "y": 3 },
-                { "label": "2", "x": 1, "y": 3 },
-                { "label": "3", "x": 2, "y": 3 },
-                { "label": "Enter", "x": 3, "y": 3, "h": 2 },
-                { "label": "Shift", "x": 4, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 6.25, "y": 3 },
-                { "label": "X", "x": 7.25, "y": 3 },
-                { "label": "C", "x": 8.25, "y": 3 },
-                { "label": "V", "x": 9.25, "y": 3 },
-                { "label": "B", "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": "Up", "x": 18, "y": 3 },
-                { "label": "fn0", "x": 19, "y": 3 },
-                { "label": "0", "x": 0, "y": 4, "w": 2 },
-                { "label": ".", "x": 2, "y": 4 },
-                { "label": "Ctrl", "x": 4, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 5.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 6.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 14, "y": 4, "w": 1.5 },
-                { "label": "Ctrl", "x": 15.5, "y": 4, "w": 1.5 },
-                { "label": "Left", "x": 17, "y": 4 },
-                { "label": "Down", "x": 18, "y": 4 },
-                { "label": "Right", "x": 19, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0, "w": 2},
+                {"matrix": [0, 18], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 18], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 17], "x": 16.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 18], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.25, "y": 3},
+                {"matrix": [3, 13], "x": 14.25, "y": 3},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 15.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 18], "x": 19, "y": 4}
             ]
         }
     }
diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.h b/keyboards/ep/comsn/mollydooker/mollydooker.h
deleted file mode 100644
index 0cdac37a02..0000000000
--- a/keyboards/ep/comsn/mollydooker/mollydooker.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * 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 xxxx KC_NO
-
-#define LAYOUT( \
-    K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, k118, \
-    K200, k201, K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, k217, k218, \
-    K300, k301, K302,       k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315,       k317, k318, \
-    K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, k414,       k416, k417, k418, \
-    K500,       K502,       k504, k505, k506,             k509,                   k513, k514,       k516, k517, k518) \
-{ \
-    {K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, k118}, \
-    {K200, k201, K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, k217, k218}, \
-    {K300, k301, K302, xxxx, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, xxxx, k317, k318}, \
-    {K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, k414, xxxx, k416, k417, k418}, \
-    {K500, xxxx, K502, xxxx, k504, k505, k506, xxxx, xxxx, k509, xxxx, xxxx, xxxx, k513, k514, xxxx, k516, k517, k518}  \
-}