Move single `LAYOUT`s to data driven (#20365)

2 files changed, 131 insertions, 134 deletions

diff --git a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h b/keyboards/handwired/108key_trackpoint/108key_trackpoint.h
deleted file mode 100644
index 100f4cb932..0000000000
--- a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K000,       K002, K003, K004, K005,       K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017,       K019, K020, K021, K022, \
-	                                                                                                                                          \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217,       K219, K220, K221, K222, \
-  K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317,       K319, K320, K321,       \
-  K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,                               K419, K420, K421, K422, \
-  K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511,       K513,             K516,             K519, K520, K521,       \
-	K600, K601,       K603,             K606,                   K610, K611,       K613, K614, K615, K616, K617,       K619,       K621, K622, \
-                             K705, K706, K707  \
-) { \
-  { K000,  KC_NO, K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  KC_NO, K019,  K020,  K021,  K022 }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216,  K217,  KC_NO, K219,  K220,  K221,  K222 }, \
-  { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  KC_NO, K319,  K320,  K321,  KC_NO }, \
-  { K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K419,  K420,  K421,  K422 }, \
-  { KC_NO, K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  KC_NO, KC_NO, K516,  KC_NO, KC_NO, K519,  K520,  K521,  KC_NO }, \
-  { K600,  K601,  KC_NO, K603,  KC_NO, KC_NO, K606,  KC_NO, KC_NO, KC_NO, K610,  K611,  KC_NO, K613,  K614,  K615,  K616,  K617,  KC_NO, K619,  KC_NO, K621,  K622 }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705,  K706,  K707,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json
index e771c4b8aa..605c77875d 100644
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ b/keyboards/handwired/108key_trackpoint/info.json
@@ -18,117 +18,137 @@
   "layouts": {
     "LAYOUT": {
       "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},
-        {"label":"Mute", "x":18.5, "y":0},
-        {"label":"Previous", "x":19.5, "y":0},
-        {"label":"Next", "x":20.5, "y":0},
-        {"label":"Play", "x":21.5, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Num Lock", "x":18.5, "y":1.5},
-        {"label":"/", "x":19.5, "y":1.5},
-        {"label":"*", "x":20.5, "y":1.5},
-        {"label":"-", "x":21.5, "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":"Page Down", "x":17.25, "y":2.5},
-        {"label":"7", "x":18.5, "y":2.5},
-        {"label":"8", "x":19.5, "y":2.5},
-        {"label":"9", "x":20.5, "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":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"4", "x":18.5, "y":3.5},
-        {"label":"5", "x":19.5, "y":3.5},
-        {"label":"6", "x":20.5, "y":3.5},
-        {"label":"+", "x":21.5, "y":2.5, "h":2},
-        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-        {"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":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"1", "x":18.5, "y":4.5},
-        {"label":"2", "x":19.5, "y":4.5},
-        {"label":"3", "x":20.5, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-        {"label":"RGUI", "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":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5},
-        {"label":"0", "x":18.5, "y":5.5, "w":2},
-        {"label":".", "x":20.5, "y":5.5},
-        {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-        {"label":"Mouse1", "x":5.25, "y":6.5},
-        {"label":"Mouse3", "x":6.25, "y":6.5},
-        {"label":"Mouse2", "x":7.25, "y":6.5}
+        {"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, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [0, 15], "x": 15.25, "y": 0},
+        {"matrix": [0, 16], "x": 16.25, "y": 0},
+        {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+        {"matrix": [0, 19], "x": 18.5, "y": 0},
+        {"matrix": [0, 20], "x": 19.5, "y": 0},
+        {"matrix": [0, 21], "x": 20.5, "y": 0},
+        {"matrix": [0, 22], "x": 21.5, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1.5},
+        {"matrix": [2, 1], "x": 1, "y": 1.5},
+        {"matrix": [2, 2], "x": 2, "y": 1.5},
+        {"matrix": [2, 3], "x": 3, "y": 1.5},
+        {"matrix": [2, 4], "x": 4, "y": 1.5},
+        {"matrix": [2, 5], "x": 5, "y": 1.5},
+        {"matrix": [2, 6], "x": 6, "y": 1.5},
+        {"matrix": [2, 7], "x": 7, "y": 1.5},
+        {"matrix": [2, 8], "x": 8, "y": 1.5},
+        {"matrix": [2, 9], "x": 9, "y": 1.5},
+        {"matrix": [2, 10], "x": 10, "y": 1.5},
+        {"matrix": [2, 11], "x": 11, "y": 1.5},
+        {"matrix": [2, 12], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [2, 15], "x": 15.25, "y": 1.5},
+        {"matrix": [2, 16], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 17], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 19], "x": 18.5, "y": 1.5},
+        {"matrix": [2, 20], "x": 19.5, "y": 1.5},
+        {"matrix": [2, 21], "x": 20.5, "y": 1.5},
+        {"matrix": [2, 22], "x": 21.5, "y": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+        {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+        {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+        {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+        {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+        {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+        {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+        {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+        {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+        {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+        {"matrix": [3, 13], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [3, 15], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 16], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 17], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 19], "x": 18.5, "y": 2.5},
+        {"matrix": [3, 20], "x": 19.5, "y": 2.5},
+        {"matrix": [3, 21], "x": 20.5, "y": 2.5},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+        {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+        {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+        {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+        {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+        {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+        {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+        {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+        {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+        {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+        {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 19], "x": 18.5, "y": 3.5},
+        {"matrix": [4, 20], "x": 19.5, "y": 3.5},
+        {"matrix": [4, 21], "x": 20.5, "y": 3.5},
+        {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [5, 16], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 19], "x": 18.5, "y": 4.5},
+        {"matrix": [5, 20], "x": 19.5, "y": 4.5},
+        {"matrix": [5, 21], "x": 20.5, "y": 4.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [6, 15], "x": 15.25, "y": 5.5},
+        {"matrix": [6, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [6, 17], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 21], "x": 20.5, "y": 5.5},
+        {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [7, 5], "x": 5.25, "y": 6.5},
+        {"matrix": [7, 6], "x": 6.25, "y": 6.5},
+        {"matrix": [7, 7], "x": 7.25, "y": 6.5}
       ]
     }
   }