Move TKL layouts to data driven (#20337)

3 files changed, 91 insertions, 131 deletions

diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index c05785ac69..90662a47da 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -20,103 +20,106 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 12, "y": 0},
+                {"matrix": [1, 1], "x": 13, "y": 0},
+                {"matrix": [1, 2], "x": 14, "y": 0},
 
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 3], "x": 15.25, "y": 0},
+                {"matrix": [1, 4], "x": 16.25, "y": 0},
+                {"matrix": [1, 5], "x": 17.25, "y": 0},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [2, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 6], "x": 10, "y": 1.5},
+                {"matrix": [2, 7], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [3, 0], "x": 13, "y": 1.5, "w": 2},
 
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 2], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 3], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 4], "x": 17.25, "y": 1.5},
 
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 6], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"x": 16.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 2], "x": 17.25, "y": 2.5},
 
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 5.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [6, 8], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [8, 3], "x": 16.25, "y": 4.5},
+
+                {"matrix": [8, 4], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 6], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [8, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [9, 2], "x": 15.25, "y": 5.5},
+                {"matrix": [9, 3], "x": 16.25, "y": 5.5},
+                {"matrix": [9, 4], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index 1a38a939f2..23a3895408 100644
--- a/keyboards/input_club/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
@@ -15,8 +15,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 "k_type.h"
-
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/input_club/k_type/k_type.h b/keyboards/input_club/k_type/k_type.h
deleted file mode 100644
index 077c013066..0000000000
--- a/keyboards/input_club/k_type/k_type.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Input Club
-
-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 XXX KC_NO
-
-#define LAYOUT_tkl_ansi( \
-    k00,      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, k30,      k32, k33, k34, \
-    k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48,      k50, k51, k52, \
-    k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64,      k66, \
-    k68,      k70, k71, k72, k73, k74, k75, k76, k77, k78, k79,      k81,           k83, \
-    k84, k85, k86,                k87,                k88, k89, k90, k91,      k92, k93, k94 \
-) { \
-    { k00, 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, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, k68, XXX }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
-    { XXX, k81, XXX, k83, k84, k85, k86, k87, k88, k89 }, \
-    { k90, k91, k92, k93, k94, XXX, XXX, XXX, XXX, XXX } \
-}