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

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

2 files changed, 90 insertions, 51 deletions

diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index 794647015f..83690d1352 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -24,13 +24,96 @@
     },
     "layouts": {
         "LAYOUT_ortho_5x16": {
-            "layout":
-            [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":15.25, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3}, {"x":14.25, "y":3}, {"x":15.25, "y":3},
-                {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4}, {"x":13.25, "y":4}, {"x":14.25, "y":4}, {"x":15.25, "y":4}
+            "layout": [
+                {"matrix": [7, 5], "x": 0, "y": 0},
+                {"matrix": [6, 5], "x": 1, "y": 0},
+                {"matrix": [5, 5], "x": 2, "y": 0},
+                {"matrix": [7, 0], "x": 3, "y": 0},
+
+                {"matrix": [6, 0], "x": 4.25, "y": 0},
+                {"matrix": [5, 0], "x": 5.25, "y": 0},
+                {"matrix": [0, 0], "x": 6.25, "y": 0},
+                {"matrix": [0, 1], "x": 7.25, "y": 0},
+                {"matrix": [0, 2], "x": 8.25, "y": 0},
+                {"matrix": [0, 3], "x": 9.25, "y": 0},
+                {"matrix": [0, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [0, 7], "x": 13.25, "y": 0},
+                {"matrix": [0, 8], "x": 14.25, "y": 0},
+                {"matrix": [0, 9], "x": 15.25, "y": 0},
+
+                {"matrix": [7, 6], "x": 0, "y": 1},
+                {"matrix": [6, 6], "x": 1, "y": 1},
+                {"matrix": [5, 6], "x": 2, "y": 1},
+                {"matrix": [7, 1], "x": 3, "y": 1},
+
+                {"matrix": [6, 1], "x": 4.25, "y": 1},
+                {"matrix": [5, 1], "x": 5.25, "y": 1},
+                {"matrix": [1, 0], "x": 6.25, "y": 1},
+                {"matrix": [1, 1], "x": 7.25, "y": 1},
+                {"matrix": [1, 2], "x": 8.25, "y": 1},
+                {"matrix": [1, 3], "x": 9.25, "y": 1},
+                {"matrix": [1, 4], "x": 10.25, "y": 1},
+                {"matrix": [1, 5], "x": 11.25, "y": 1},
+                {"matrix": [1, 6], "x": 12.25, "y": 1},
+                {"matrix": [1, 7], "x": 13.25, "y": 1},
+                {"matrix": [1, 8], "x": 14.25, "y": 1},
+                {"matrix": [1, 9], "x": 15.25, "y": 1},
+
+                {"matrix": [7, 7], "x": 0, "y": 2},
+                {"matrix": [6, 7], "x": 1, "y": 2},
+                {"matrix": [5, 7], "x": 2, "y": 2},
+                {"matrix": [7, 2], "x": 3, "y": 2},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 2},
+                {"matrix": [5, 2], "x": 5.25, "y": 2},
+                {"matrix": [2, 0], "x": 6.25, "y": 2},
+                {"matrix": [2, 1], "x": 7.25, "y": 2},
+                {"matrix": [2, 2], "x": 8.25, "y": 2},
+                {"matrix": [2, 3], "x": 9.25, "y": 2},
+                {"matrix": [2, 4], "x": 10.25, "y": 2},
+                {"matrix": [2, 5], "x": 11.25, "y": 2},
+                {"matrix": [2, 6], "x": 12.25, "y": 2},
+                {"matrix": [2, 7], "x": 13.25, "y": 2},
+                {"matrix": [2, 8], "x": 14.25, "y": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 2},
+
+                {"matrix": [7, 8], "x": 0, "y": 3},
+                {"matrix": [6, 8], "x": 1, "y": 3},
+                {"matrix": [5, 8], "x": 2, "y": 3},
+                {"matrix": [7, 3], "x": 3, "y": 3},
+
+                {"matrix": [6, 3], "x": 4.25, "y": 3},
+                {"matrix": [5, 3], "x": 5.25, "y": 3},
+                {"matrix": [3, 0], "x": 6.25, "y": 3},
+                {"matrix": [3, 1], "x": 7.25, "y": 3},
+                {"matrix": [3, 2], "x": 8.25, "y": 3},
+                {"matrix": [3, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [3, 5], "x": 11.25, "y": 3},
+                {"matrix": [3, 6], "x": 12.25, "y": 3},
+                {"matrix": [3, 7], "x": 13.25, "y": 3},
+                {"matrix": [3, 8], "x": 14.25, "y": 3},
+                {"matrix": [3, 9], "x": 15.25, "y": 3},
+
+                {"matrix": [7, 9], "x": 0, "y": 4},
+                {"matrix": [6, 9], "x": 1, "y": 4},
+                {"matrix": [5, 9], "x": 2, "y": 4},
+                {"matrix": [7, 4], "x": 3, "y": 4},
+
+                {"matrix": [6, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 0], "x": 6.25, "y": 4},
+                {"matrix": [4, 1], "x": 7.25, "y": 4},
+                {"matrix": [4, 2], "x": 8.25, "y": 4},
+                {"matrix": [4, 3], "x": 9.25, "y": 4},
+                {"matrix": [4, 4], "x": 10.25, "y": 4},
+                {"matrix": [4, 5], "x": 11.25, "y": 4},
+                {"matrix": [4, 6], "x": 12.25, "y": 4},
+                {"matrix": [4, 7], "x": 13.25, "y": 4},
+                {"matrix": [4, 8], "x": 14.25, "y": 4},
+                {"matrix": [4, 9], "x": 15.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/delikeeb/waaffle/rev3/rev3.h b/keyboards/delikeeb/waaffle/rev3/rev3.h
deleted file mode 100644
index 8ca245d845..0000000000
--- a/keyboards/delikeeb/waaffle/rev3/rev3.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 noclew
- *
- * 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 is 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_ortho_5x16( \
-    k76, k66, k56, k71, k61, k51, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \
-    k77, k67, k57, k72, k62, k52, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, \
-    k78, k68, k58, k73, k63, k53, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
-    k79, k69, k59, k74, k64, k54, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, \
-    k80, k70, k60, k75, k65, k55, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 \
-) { \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k20 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 }, \
-    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 }, \
-    { k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 }, \
-    { k61, k62, k63, k64, k65, k66, k67, k68, k69, k70 }, \
-    { k71, k72, k73, k74, k75, k76, k77, k78, k79, k80 } \
-}