Move TKL layouts to data driven (#20337)

2 files changed, 96 insertions, 124 deletions

diff --git a/keyboards/hardlineworks/otd_plus/info.json b/keyboards/hardlineworks/otd_plus/info.json
index ca385ce6cb..6dcb95fa50 100644
--- a/keyboards/hardlineworks/otd_plus/info.json
+++ b/keyboards/hardlineworks/otd_plus/info.json
@@ -22,96 +22,103 @@
     "layouts": {
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-      
-                {"label" : "Esc", "x":0, "y":0},
-                {"label" : "F1", "x":2, "y":0},
-                {"label" : "F2", "x":3, "y":0},
-                {"label" : "F3", "x":4, "y":0},
-                {"label" : "F4", "x":5, "y":0},
-                {"label" : "F5", "x":6.5, "y":0},
-                {"label" : "F6", "x":7.5, "y":0},
-                {"label" : "F7", "x":8.5, "y":0},
-                {"label" : "F8", "x":9.5, "y":0},
-                {"label" : "F9", "x":11, "y":0},
-                {"label" : "F10", "x":12, "y":0},
-                {"label" : "F11", "x":13, "y":0},
-                {"label" : "F12", "x":14, "y":0},
-                {"label" : "Print screen", "x":15.25, "y":0},
-                {"label" : "Scroll lock", "x":16.25, "y":0},
-                {"label" : "Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label" : "`", "x":0, "y":1.25},
-                {"label" : "1", "x":1, "y":1.25},
-                {"label" : "2", "x":2, "y":1.25},
-                {"label" : "3", "x":3, "y":1.25},
-                {"label" : "4", "x":4, "y":1.25},
-                {"label" : "5", "x":5, "y":1.25},
-                {"label" : "6", "x":6, "y":1.25},
-                {"label" : "7", "x":7, "y":1.25},
-                {"label" : "8", "x":8, "y":1.25},
-                {"label" : "9", "x":9, "y":1.25},
-                {"label" : "0", "x":10, "y":1.25},
-                {"label" : "-", "x":11, "y":1.25},
-                {"label" : "=", "x":12, "y":1.25},
-                {"label" : "Backspace", "x":13, "y":1.25, "w":2},
-                {"label" : "Insert", "x":15.25, "y":1.25},
-                {"label" : "Home", "x":16.25, "y":1.25},
-                {"label" : "Page up", "x":17.25, "y":1.25},
-    
-                {"label" : "Tab", "x":0, "y":2.25, "w":1.5},
-                {"label" : "Q", "x":1.5, "y":2.25},
-                {"label" : "W", "x":2.5, "y":2.25},
-                {"label" : "E", "x":3.5, "y":2.25},
-                {"label" : "R", "x":4.5, "y":2.25},
-                {"label" : "T", "x":5.5, "y":2.25},
-                {"label" : "Y", "x":6.5, "y":2.25},
-                {"label" : "U", "x":7.5, "y":2.25},
-                {"label" : "I", "x":8.5, "y":2.25},
-                {"label" : "O", "x":9.5, "y":2.25},
-                {"label" : "P", "x":10.5, "y":2.25},
-                {"label" : "[", "x":11.5, "y":2.25},
-                {"label" : "]", "x":12.5, "y":2.25},
-                {"label" : "|", "x":13.5, "y":2.25, "w":1.5},
-                {"label" : "Delete", "x":15.25, "y":2.25},
-                {"label" : "End", "x":16.25, "y":2.25},
-                {"label" : "Page down", "x":17.25, "y":2.25},
-       
-                {"label" : "Caps lock", "x":0, "y":3.25, "w":1.75},
-                {"label" : "A", "x":1.75, "y":3.25},
-                {"label" : "S", "x":2.75, "y":3.25},
-                {"label" : "D", "x":3.75, "y":3.25},
-                {"label" : "F", "x":4.75, "y":3.25},
-                {"label" : "G", "x":5.75, "y":3.25},
-                {"label" : "H", "x":6.75, "y":3.25},
-                {"label" : "J", "x":7.75, "y":3.25},
-                {"label" : "K", "x":8.75, "y":3.25},
-                {"label" : "L", "x":9.75, "y":3.25},
-                {"label" : ";", "x":10.75, "y":3.25},
-                {"label" : "'", "x":11.75, "y":3.25},
-                {"label" : "Enter", "x":12.75, "y":3.25, "w":2.25},
-    
-                {"label" : "Shift", "x":0, "y":4.25, "w":2.25},
-                {"label" : "Z", "x":2.25, "y":4.25},
-                {"label" : "X", "x":3.25, "y":4.25},
-                {"label" : "C", "x":4.25, "y":4.25},
-                {"label" : "V", "x":5.25, "y":4.25},
-                {"label" : "B", "x":6.25, "y":4.25},
-                {"label" : "N", "x":7.25, "y":4.25},
-                {"label" : "M", "x":8.25, "y":4.25},
-                {"label" : ",", "x":9.25, "y":4.25},
-                {"label" : ".", "x":10.25, "y":4.25},
-                {"label" : "/", "x":11.25, "y":4.25},
-                {"label" : "Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label" : "Up", "x":16.25, "y":4.25},
-       
-                {"label" : "Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label" : "Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label" : "Space", "x":4, "y":5.25, "w":7},
-                {"label" : "Alt", "x":11, "y":5.25, "w":1.5},
-                {"label" : "Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label" : "Left", "x":15.25, "y":5.25 },
-                {"label" : "Down", "x":16.25, "y":5.25 },
-                {"label" : "Right", "x":17.25, "y":5.25 }                                                        
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [11, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [11, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [11, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [11, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [11, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [11, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [10, 0], "x": 1, "y": 1.25},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [10, 1], "x": 3, "y": 1.25},
+                {"matrix": [1, 2], "x": 4, "y": 1.25},
+                {"matrix": [10, 2], "x": 5, "y": 1.25},
+                {"matrix": [1, 3], "x": 6, "y": 1.25},
+                {"matrix": [10, 3], "x": 7, "y": 1.25},
+                {"matrix": [1, 4], "x": 8, "y": 1.25},
+                {"matrix": [10, 4], "x": 9, "y": 1.25},
+                {"matrix": [1, 5], "x": 10, "y": 1.25},
+                {"matrix": [10, 5], "x": 11, "y": 1.25},
+                {"matrix": [1, 6], "x": 12, "y": 1.25},
+                {"matrix": [10, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [9, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [9, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [9, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [8, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [7, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [6, 2], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/hardlineworks/otd_plus/otd_plus.h b/keyboards/hardlineworks/otd_plus/otd_plus.h
deleted file mode 100644
index f523cfff29..0000000000
--- a/keyboards/hardlineworks/otd_plus/otd_plus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#pragma once
-
-#include "quantum.h"
-
-/* This 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_tkl_ansi_wkl( \
-     K00,      K01, KB1, K02, KB2, K03, KB3, K04, KB4, KB5, K06, KB6, K07,  KB7, K08, KB8, \
-     K10, KA0, K11, KA1, K12, KA2, K13, KA3, K14, KA4, K15, KA5, K16, KA6,  KA7, K18, KA8, \
-     K20, K90, K21, K91, K22, K92, K23, K93, K24, K94, K25, K95, K26, K96,  K97, K28, K98, \
-     K30, K80, K31, K81, K32, K82, K33, K83, K34, K84, K35, K85,      K86, \
-     K40, K70, K41, K71, K42, K72, K43, K73, K44, K74, K45,      K46,            K48, \
-     K50,      K51,           K62,                          K55,      K56,  K67, K58, K68  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   KC_NO, K06,   K07,   K08,   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO, K18,   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO, K28,   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO, KC_NO, KC_NO, }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48,   }, \
-    { K50,   K51,   KC_NO, KC_NO, KC_NO, K55,   K56,   KC_NO, K58,   }, \
-    { KC_NO, KC_NO, K62,   KC_NO, KC_NO, KC_NO, KC_NO, K67,   K68,   }, \
-    { K70,   K71,   K72,   K73,   K74,   KC_NO, KC_NO, KC_NO, KC_NO, }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, KC_NO, }, \
-    { K90,   K91,   K92,   K93,   K94,   K95,   K96,   K97,   K98,   }, \
-    { KA0,   KA1,   KA2,   KA3,   KA4,   KA5,   KA6,   KA7,   KA8,   }, \
-    { KC_NO, KB1,   KB2,   KB3,   KB4,   KB5,   KB6,   KB7,   KB8,   }, \
-}