Move TKL layouts to data driven (#20337)

2 files changed, 99 insertions, 38 deletions

diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json
index ba8451a331..f1da7c9726 100644
--- a/keyboards/utd80/info.json
+++ b/keyboards/utd80/info.json
@@ -25,7 +25,105 @@
     "bootloader": "atmel-dfu",
     "layouts": {
       "LAYOUT_tkl_ansi_wkl": {
-        "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}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "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}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"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}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"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}, {"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}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+          {"matrix": [0, 7], "x": 7.5, "y": 0},
+          {"matrix": [0, 8], "x": 8.5, "y": 0},
+          {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+          {"matrix": [0, 10], "x": 11, "y": 0},
+          {"matrix": [0, 11], "x": 12, "y": 0},
+          {"matrix": [0, 12], "x": 13, "y": 0},
+          {"matrix": [0, 13], "x": 14, "y": 0},
+
+          {"matrix": [0, 1], "x": 15.25, "y": 0},
+          {"matrix": [0, 15], "x": 16.25, "y": 0},
+          {"matrix": [5, 15], "x": 17.25, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.5},
+          {"matrix": [1, 1], "x": 1, "y": 1.5},
+          {"matrix": [1, 2], "x": 2, "y": 1.5},
+          {"matrix": [1, 3], "x": 3, "y": 1.5},
+          {"matrix": [1, 4], "x": 4, "y": 1.5},
+          {"matrix": [1, 5], "x": 5, "y": 1.5},
+          {"matrix": [1, 6], "x": 6, "y": 1.5},
+          {"matrix": [1, 7], "x": 7, "y": 1.5},
+          {"matrix": [1, 8], "x": 8, "y": 1.5},
+          {"matrix": [1, 9], "x": 9, "y": 1.5},
+          {"matrix": [1, 10], "x": 10, "y": 1.5},
+          {"matrix": [1, 11], "x": 11, "y": 1.5},
+          {"matrix": [1, 12], "x": 12, "y": 1.5},
+          {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+          {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+          {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+          {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+          {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+          {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+          {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+          {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+          {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+          {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+          {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+          {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+          {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+          {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+          {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+          {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+          {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+          {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+          {"matrix": [4, 15], "x": 17.25, "y": 2.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+          {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+          {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+          {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+          {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+          {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+          {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+          {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+          {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+          {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+          {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+          {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+          {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+          {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+          {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+          {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+          {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+          {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+          {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+          {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+          {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+          {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+          {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+          {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+          {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+          {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+          {"matrix": [5, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+          {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+          {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+          {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+          {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+          {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+          {"matrix": [0, 14], "x": 17.25, "y": 5.5}
+        ]
       }
     }
 }
diff --git a/keyboards/utd80/utd80.h b/keyboards/utd80/utd80.h
deleted file mode 100644
index 43d69ef845..0000000000
--- a/keyboards/utd80/utd80.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 UTDKeyboard & Dominic Gan
- * 
- * 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_wkl( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,   K01,K0F,K5F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,     K1E,K1F,K3F, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,    K2E,K2F,K4F, \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
-      K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4E,     \
-     K50,          K51,               K56,               K5A,          K5D,     K5E,K3E,K0E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F}, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, K4E, K4F}, \
-    { K50, K51, XXX, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, XXX, XXX, K5D, K5E, K5F}  \
-}
-