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

2 files changed, 78 insertions, 110 deletions

diff --git a/keyboards/handwired/ergocheap/ergocheap.h b/keyboards/handwired/ergocheap/ergocheap.h
deleted file mode 100644
index 106fa45328..0000000000
--- a/keyboards/handwired/ergocheap/ergocheap.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 xSteins <itsmesteins@gmail.com>
-
-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"
-
-/* 
- * 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( \
-    K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F, \
-    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2B, K2D,      K2E, K2F, \
-    K30,      K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3B, K3D, K3E, K3F, \
-    K40,           K42,      K44, K45,        K46,      K47, K48, K4B, K4D, K4E, K4F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,    K0D,   K0E,   K0F }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,    K1D,   K1E,   K1F }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   KC_NO, K2B,    K2D,   K2E,   K2F }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   KC_NO, K3B,    K3D,   K3E,   K3F }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   K45,   K46,   K47,   K48,   KC_NO, KC_NO, K4B,    K4D,   K4E,   K4F }  \
-}
diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json
index 097a4e6278..12bff57b3e 100644
--- a/keyboards/handwired/ergocheap/info.json
+++ b/keyboards/handwired/ergocheap/info.json
@@ -18,75 +18,84 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"ESC", "x":0.75, "y":0},
-                {"label":"1", "x":1.75, "y":0},
-                {"label":"2", "x":2.75, "y":0},
-                {"label":"3", "x":4.25, "y":0},
-                {"label":"4", "x":5.25, "y":0},
-                {"label":"5", "x":6.25, "y":0},
-                {"label":"6", "x":7.25, "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":"MINS", "x":14.5, "y":0},
-                {"label":"EQL", "x":16, "y":0},
-                {"label":"BSPC", "x":17, "y":0, "w":2},
-                {"label":"GRV", "x":19, "y":0},
-                {"label":"TAB", "x":0.5, "y":1, "w":1.5},
-                {"label":"Q", "x":2, "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":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":"LBRC", "x":16, "y":1},
-                {"label":"RBRC", "x":17, "y":1},
-                {"label":"BSLS", "x":18, "y":1, "w":1.5},
-                {"label":"DEL", "x":19.5, "y":1},
-                {"label":"CAPS", "x":0.25, "y":2, "w":1.75},
-                {"label":"A", "x":2, "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.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":"SCLN", "x":15.5, "y":2},
-                {"label":"QUOT", "x":16.5, "y":2},
-                {"label":"ENT", "x":17.5, "y":2, "w":2.25},
-                {"label":"HOME", "x":19.75, "y":2},
-                {"label":"LSFT", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "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":"N", "x":10.5, "y":3},
-                {"label":"M", "x":11.5, "y":3},
-                {"label":"COMM", "x":12.5, "y":3},
-                {"label":"DOT", "x":13.5, "y":3},
-                {"label":"SLSH", "x":15.75, "y":3},
-                {"label":"TO(_FN1)", "x":16.75, "y":3, "w":1.25},
-                {"label":"UP", "x":18, "y":3},
-                {"label":"END", "x":19.5, "y":3},
-                {"label":"LCTL", "x":0, "y":4, "w":1.25},
-                {"label":"LALT", "x":4.5, "y":4, "w":1.25},
-                {"label":"SPC", "x":5.75, "y":4, "w":2},
-                {"label":"MO(_FN1)", "x":7.75, "y":4, "w":1.25},
-                {"label":"SPC", "x":10, "y":4, "w":1.75},
-                {"label":"SPC", "x":11.75, "y":4},
-                {"label":"MO(_FN1)", "x":12.75, "y":4, "w":1.25},
-                {"label":"LGUI", "x":15.5, "y":4, "w":1.25},
-                {"label":"LEFT", "x":17, "y":4},
-                {"label":"DOWN", "x":18, "y":4},
-                {"label":"RGHT", "x":19, "y":4}
+                {"matrix": [0, 0], "x": 0.75, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "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.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 16, "y": 0},
+                {"matrix": [0, 13], "x": 17, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "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": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 16, "y": 1},
+                {"matrix": [1, 12], "x": 17, "y": 1},
+                {"matrix": [1, 13], "x": 18, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 19.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "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.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.5, "y": 2},
+                {"matrix": [2, 12], "x": 16.5, "y": 2},
+                {"matrix": [2, 13], "x": 17.5, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 19.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "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": 10.5, "y": 3},
+                {"matrix": [3, 7], "x": 11.5, "y": 3},
+                {"matrix": [3, 8], "x": 12.5, "y": 3},
+                {"matrix": [3, 9], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 15.75, "y": 3},
+                {"matrix": [3, 12], "x": 16.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 13], "x": 18, "y": 3},
+                {"matrix": [3, 14], "x": 19.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.75},
+                {"matrix": [4, 7], "x": 11.75, "y": 4},
+                {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 15.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 17, "y": 4},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4}
             ]
         }
     }