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

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

3 files changed, 96 insertions, 145 deletions

diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
index c99041be74..e7321ba697 100644
--- a/keyboards/planck/thk/info.json
+++ b/keyboards/planck/thk/info.json
@@ -29,105 +29,105 @@
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label": "k10", "matrix": [1, 0], "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 },
-        { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 },
-        { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 },
-        { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 },
-        { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 },
-        { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 },
-        { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 },
-        { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 },
-        { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 },
-        { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 },
-        { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 },
-        { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
-        { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
-        { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
-        { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
-        { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
-        { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
-        { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 }
+        {"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": [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": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "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": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "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},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label": "k10", "matrix": [1, 0], "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 },
-        { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 },
-        { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 },
-        { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 },
-        { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 },
-        { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 },
-        { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 },
-        { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 },
-        { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 },
-        { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 },
-        { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 },
-        { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
-        { "label": "k35", "matrix": [3, 6], "w": 2, "x": 5, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
-        { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
-        { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
-        { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
-        { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 }
+        {"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": [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": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "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": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "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},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/thk/thk.c b/keyboards/planck/thk/thk.c
index bd5e1a0342..42836f0f11 100644
--- a/keyboards/planck/thk/thk.c
+++ b/keyboards/planck/thk/thk.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "thk.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/thk/thk.h b/keyboards/planck/thk/thk.h
deleted file mode 100644
index 6cbbf7262c..0000000000
--- a/keyboards/planck/thk/thk.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- * Copyright 2021 Erovia
- *
- * 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 "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12