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

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

3 files changed, 33 insertions, 62 deletions

diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
index 454577c1eb..21254557d4 100644
--- a/keyboards/deng/thirty/info.json
+++ b/keyboards/deng/thirty/info.json
@@ -24,36 +24,38 @@
     "layouts": {
         "LAYOUT_ortho_3x10": {
             "layout": [
-                { "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": [3, 4], "x": 5, "y": 0 },
-                { "matrix": [3, 3], "x": 6, "y": 0 },
-                { "matrix": [3, 2], "x": 7, "y": 0 },
-                { "matrix": [3, 1], "x": 8, "y": 0 },
-                { "matrix": [3, 0], "x": 9, "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 },
-                { "matrix": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [4, 4], "x": 5, "y": 1 },
-                { "matrix": [4, 3], "x": 6, "y": 1 },
-                { "matrix": [4, 2], "x": 7, "y": 1 },
-                { "matrix": [4, 1], "x": 8, "y": 1 },
-                { "matrix": [4, 0], "x": 9, "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, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [5, 4], "x": 5, "y": 2 },
-                { "matrix": [5, 3], "x": 6, "y": 2 },
-                { "matrix": [5, 2], "x": 7, "y": 2 },
-                { "matrix": [5, 1], "x": 8, "y": 2 },
-                { "matrix": [5, 0], "x": 9, "y": 2 }
+                {"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": [3, 4], "x": 5, "y": 0},
+                {"matrix": [3, 3], "x": 6, "y": 0},
+                {"matrix": [3, 2], "x": 7, "y": 0},
+                {"matrix": [3, 1], "x": 8, "y": 0},
+                {"matrix": [3, 0], "x": 9, "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},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [4, 4], "x": 5, "y": 1},
+                {"matrix": [4, 3], "x": 6, "y": 1},
+                {"matrix": [4, 2], "x": 7, "y": 1},
+                {"matrix": [4, 1], "x": 8, "y": 1},
+                {"matrix": [4, 0], "x": 9, "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, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [5, 4], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [5, 1], "x": 8, "y": 2},
+                {"matrix": [5, 0], "x": 9, "y": 2}
             ]
         }
     }
diff --git a/keyboards/deng/thirty/thirty.c b/keyboards/deng/thirty/thirty.c
index 4f4a5c566d..2e582d6833 100644
--- a/keyboards/deng/thirty/thirty.c
+++ b/keyboards/deng/thirty/thirty.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 "thirty.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/deng/thirty/thirty.h b/keyboards/deng/thirty/thirty.h
deleted file mode 100644
index 49af4b3424..0000000000
--- a/keyboards/deng/thirty/thirty.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 Leo Deng (@myst729)
- *
- * 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_3x10( \
-    K00, K01, K02, K03, K04, K34, K33, K32, K31, K30, \
-    K10, K11, K12, K13, K14, K44, K43, K42, K41, K40, \
-    K20, K21, K22, K23, K24, K54, K53, K52, K51, K50  \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, K34 }, \
-    { K40, K41, K42, K43, K44 }, \
-    { K50, K51, K52, K53, K54 }  \
-}