Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

2 files changed, 79 insertions, 113 deletions

diff --git a/keyboards/sendyyeah/75pixels/75pixels.h b/keyboards/sendyyeah/75pixels/75pixels.h
deleted file mode 100644
index 9ac0f763d9..0000000000
--- a/keyboards/sendyyeah/75pixels/75pixels.h
+++ /dev/null
@@ -1,38 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * 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"
-
-#define LAYOUT_ortho_5x15(\
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K87 \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, KC_NO }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { K70, K71, K72, K73, K74, K75, K76, KC_NO }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { K90, K91, K92, K93, K94, K95, K96, KC_NO } \
-}
diff --git a/keyboards/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/info.json
index aeaf26da6c..9ccc1a8dfb 100644
--- a/keyboards/sendyyeah/75pixels/info.json
+++ b/keyboards/sendyyeah/75pixels/info.json
@@ -19,81 +19,85 @@
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"label": "Esc", "x": 0, "y": 0},
-                {"label": "1", "x": 1, "y": 0},
-                {"label": "2", "x": 2, "y": 0},
-                {"label": "3", "x": 3, "y": 0},
-                {"label": "4", "x": 4, "y": 0},
-                {"label": "5", "x": 5, "y": 0},
-                {"label": "6", "x": 6, "y": 0},
-                {"label": "7", "x": 7, "y": 0},
-                {"label": "8", "x": 8, "y": 0},
-                {"label": "9", "x": 9, "y": 0},
-                {"label": "0", "x": 10, "y": 0},
-                {"label": "Bkspc", "x": 11, "y": 0},
-                {"label": "NumLock", "x": 12, "y": 0},
-                {"label": "/", "x": 13, "y": 0},
-                {"label": "*", "x": 14, "y": 0},
-                {"label": "Tab", "x": 0, "y": 1},
-                {"label": "Q", "x": 1, "y": 1},
-                {"label": "W", "x": 2, "y": 1},
-                {"label": "E", "x": 3, "y": 1},
-                {"label": "R", "x": 4, "y": 1},
-                {"label": "T", "x": 5, "y": 1},
-                {"label": "Y", "x": 6, "y": 1},
-                {"label": "U", "x": 7, "y": 1},
-                {"label": "I", "x": 8, "y": 1},
-                {"label": "O", "x": 9, "y": 1},
-                {"label": "P", "x": 10, "y": 1},
-                {"label": "|", "x": 11, "y": 1},
-                {"label": "7", "x": 12, "y": 1},
-                {"label": "8", "x": 13, "y": 1},
-                {"label": "9", "x": 14, "y": 1},
-                {"label": "Caps", "x": 0, "y": 2},
-                {"label": "A", "x": 1, "y": 2},
-                {"label": "S", "x": 2, "y": 2},
-                {"label": "D", "x": 3, "y": 2},
-                {"label": "F", "x": 4, "y": 2},
-                {"label": "G", "x": 5, "y": 2},
-                {"label": "H", "x": 6, "y": 2},
-                {"label": "J", "x": 7, "y": 2},
-                {"label": "K", "x": 8, "y": 2},
-                {"label": "L", "x": 9, "y": 2},
-                {"label": ":", "x": 10, "y": 2},
-                {"label": "Enter", "x": 11, "y": 2},
-                {"label": "4", "x": 12, "y": 2},
-                {"label": "5", "x": 13, "y": 2},
-                {"label": "6", "x": 14, "y": 2},
-                {"label": "Shift", "x": 0, "y": 3},
-                {"label": "Z", "x": 1, "y": 3},
-                {"label": "X", "x": 2, "y": 3},
-                {"label": "C", "x": 3, "y": 3},
-                {"label": "V", "x": 4, "y": 3},
-                {"label": "B", "x": 5, "y": 3},
-                {"label": "N", "x": 6, "y": 3},
-                {"label": "M", "x": 7, "y": 3},
-                {"label": "<", "x": 8, "y": 3},
-                {"label": ">", "x": 9, "y": 3},
-                {"label": "?", "x": 10, "y": 3},
-                {"label": "Shift", "x": 11, "y": 3},
-                {"label": "1", "x": 12, "y": 3},
-                {"label": "2", "x": 13, "y": 3},
-                {"label": "3", "x": 14, "y": 3},
-                {"label": "Ctrl", "x": 0, "y": 4},
-                {"label": "Win", "x": 1, "y": 4},
-                {"label": "Alt", "x": 2, "y": 4},
-                {"label": "Fn", "x": 3, "y": 4},
-                {"label": "Lower", "x": 4, "y": 4},
-                {"label": "Space", "x": 5, "y": 4},
-                {"label": "Space", "x": 6, "y": 4},
-                {"label": "Raise", "x": 7, "y": 4},
-                {"label": "Alt", "x": 8, "y": 4},
-                {"label": "Win", "x": 9, "y": 4},
-                {"label": "Menu", "x": 10, "y": 4},
-                {"label": "Ctrl", "x": 11, "y": 4},
-                {"label": "0", "x": 12, "y": 4},
-                {"label": ".", "x": 13, "y": 4},
-                {"label": "Enter", "x": 14, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [4, 7], "x": 14, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+                {"matrix": [9, 1], "x": 3, "y": 4},
+                {"matrix": [8, 2], "x": 4, "y": 4},
+                {"matrix": [9, 2], "x": 5, "y": 4},
+                {"matrix": [8, 3], "x": 6, "y": 4},
+                {"matrix": [9, 3], "x": 7, "y": 4},
+                {"matrix": [8, 4], "x": 8, "y": 4},
+                {"matrix": [9, 4], "x": 9, "y": 4},
+                {"matrix": [8, 5], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [9, 6], "x": 13, "y": 4},
+                {"matrix": [8, 7], "x": 14, "y": 4}
             ]
         }
     }