Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 105 insertions, 133 deletions

diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json
index 9a65d8e1e1..0ea83277ec 100644
--- a/keyboards/tkc/tkl_ab87/info.json
+++ b/keyboards/tkc/tkl_ab87/info.json
@@ -29,97 +29,111 @@
     "layouts": {
         "LAYOUT_all": {
             "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":"PrtSc", "x":15.25, "y":0}, 
-				{"label":"Scroll Lock", "x":16.25, "y":0}, 
-				{"label":"Pause", "x":17.25, "y":0}, 
-				{"label":"~", "x":0, "y":1.5}, 
-				{"label":"!", "x":1, "y":1.5}, 
-				{"label":"@", "x":2, "y":1.5}, 
-				{"label":"#", "x":3, "y":1.5}, 
-				{"label":"$", "x":4, "y":1.5}, 
-				{"label":"%", "x":5, "y":1.5}, 
-				{"label":"^", "x":6, "y":1.5}, 
-				{"label":"&", "x":7, "y":1.5}, 
-				{"label":"*", "x":8, "y":1.5}, 
-				{"label":"(", "x":9, "y":1.5}, 
-				{"label":")", "x":10, "y":1.5}, 
-				{"label":"_", "x":11, "y":1.5}, 
-				{"label":"+", "x":12, "y":1.5}, 
-				{"label":"Del", "x":13, "y":1.5}, 
-				{"label":"Bksp", "x":14, "y":1.5}, 
-				{"label":"Insert", "x":15.25, "y":1.5}, 
-				{"label":"Home", "x":16.25, "y":1.5}, 
-				{"label":"PgUp", "x":17.25, "y":1.5}, 
-				{"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-				{"label":"Q", "x":1.5, "y":2.5}, 
-				{"label":"W", "x":2.5, "y":2.5}, 
-				{"label":"E", "x":3.5, "y":2.5}, 
-				{"label":"R", "x":4.5, "y":2.5}, 
-				{"label":"T", "x":5.5, "y":2.5}, 
-				{"label":"Y", "x":6.5, "y":2.5}, 
-				{"label":"U", "x":7.5, "y":2.5}, 
-				{"label":"I", "x":8.5, "y":2.5}, 
-				{"label":"O", "x":9.5, "y":2.5}, 
-				{"label":"P", "x":10.5, "y":2.5}, 
-				{"label":"{", "x":11.5, "y":2.5}, 
-				{"label":"}", "x":12.5, "y":2.5}, 
-				{"label":"|", "x":13.5, "y":2.5, "w":1.5}, 
-				{"label":"Delete", "x":15.25, "y":2.5}, 
-				{"label":"End", "x":16.25, "y":2.5}, 
-				{"label":"PgDn", "x":17.25, "y":2.5}, 
-				{"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-				{"label":"A", "x":1.75, "y":3.5}, 
-				{"label":"S", "x":2.75, "y":3.5}, 
-				{"label":"D", "x":3.75, "y":3.5}, 
-				{"label":"F", "x":4.75, "y":3.5}, 
-				{"label":"G", "x":5.75, "y":3.5}, 
-				{"label":"H", "x":6.75, "y":3.5}, 
-				{"label":"J", "x":7.75, "y":3.5}, 
-				{"label":"K", "x":8.75, "y":3.5}, 
-				{"label":"L", "x":9.75, "y":3.5}, 
-				{"label":":", "x":10.75, "y":3.5}, 
-				{"label":"\"", "x":11.75, "y":3.5}, 
-				{"label":"Nuhs", "x":12.75, "y":3.5}, 
-				{"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, 
-				{"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-				{"label":"Nubs", "x":1.25, "y":4.5}, 
-				{"label":"Z", "x":2.25, "y":4.5}, 
-				{"label":"X", "x":3.25, "y":4.5}, 
-				{"label":"C", "x":4.25, "y":4.5}, 
-				{"label":"V", "x":5.25, "y":4.5}, 
-				{"label":"B", "x":6.25, "y":4.5}, 
-				{"label":"N", "x":7.25, "y":4.5}, 
-				{"label":"M", "x":8.25, "y":4.5}, 
-				{"label":"<", "x":9.25, "y":4.5}, 
-				{"label":">", "x":10.25, "y":4.5}, 
-				{"label":"?", "x":11.25, "y":4.5}, 
-				{"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, 
-				{"label":"Del", "x":14, "y":4.5}, 
-				{"label":"\u2191", "x":16.25, "y":4.5}, 
-				{"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
-				{"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
-				{"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
-				{"x":3.75, "y":5.5, "w":6.25}, 
-				{"label":"Alt", "x":10, "y":5.5, "w":1.25}, 
-				{"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
-				{"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
-				{"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
-				{"label":"\u2190", "x":15.25, "y":5.5}, 
-				{"label":"\u2193", "x":16.25, "y":5.5}, 
-				{"label":"\u2192", "x":17.25, "y":5.5}]
+                {"matrix": [0, 0], "x": 0, "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},
+
+                {"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},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [5, 6], "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": [0, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [5, 5], "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": [5, 4], "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, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 3], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/tkc/tkl_ab87/tkl_ab87.h b/keyboards/tkc/tkl_ab87/tkl_ab87.h
deleted file mode 100644
index 3d831bb7f8..0000000000
--- a/keyboards/tkc/tkl_ab87/tkl_ab87.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 Terry Mathews
- *
- * 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"  
-
-/* 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_all( \
-    K00,  K01, K02, K03, K04,    K05, K06, K07, K08,    K09, K0A, K0B, K0C,     K0E, K0F, K56,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K0D, K1D,  K1E, K1F, K55,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K2F, K54,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,   K3D,                  \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4C,   K4D,       K4F,       \
-    K50,  K51,  K52,              K57,                K5A,  K5B,  K5C,  K5D,    K5E, K5F, K53   \
-) { \
-    { 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, K3C, K3D,KC_NO,KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48, K49, K4A, K4B, K4C, K4D,KC_NO,K4F   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,  K57, KC_NO,KC_NO,K5A, K5B, K5C, K5D, K5E, K5F   }, \
-}