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

2 files changed, 119 insertions, 128 deletions

diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json
index 2e291fc69b..8c58c84c67 100644
--- a/keyboards/mt/mt980/info.json
+++ b/keyboards/mt/mt980/info.json
@@ -33,109 +33,125 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"K50", "x":0, "y":0},
-        {"label":"K52", "x":1.25, "y":0},
-        {"label":"K53", "x":2.25, "y":0},
-        {"label":"K54", "x":3.25, "y":0},
-        {"label":"K55", "x":4.25, "y":0},
-        {"label":"K57", "x":5.5, "y":0},
-        {"label":"K58", "x":6.5, "y":0},
-        {"label":"KB8", "x":7.5, "y":0},
-        {"label":"KB7", "x":8.5, "y":0},
-        {"label":"KB5", "x":9.75, "y":0},
-        {"label":"KB4", "x":10.75, "y":0},
-        {"label":"KB3", "x":11.75, "y":0},
-        {"label":"KB6", "x":12.75, "y":0},
-        {"label":"K51", "x":14, "y":0},
-        {"label":"KB2", "x":15.5, "y":0},
-        {"label":"KB1", "x":16.5, "y":0},
-        {"label":"KB0", "x":17.5, "y":0},
-        {"label":"K63", "x":18.5, "y":0},
-        {"label":"K40", "x":0, "y":1.5},
-        {"label":"K41", "x":1, "y":1.5},
-        {"label":"K42", "x":2, "y":1.5},
-        {"label":"K43", "x":3, "y":1.5},
-        {"label":"K44", "x":4, "y":1.5},
-        {"label":"K45", "x":5, "y":1.5},
-        {"label":"K46", "x":6, "y":1.5},
-        {"label":"K47", "x":7, "y":1.5},
-        {"label":"K48", "x":8, "y":1.5},
-        {"label":"KA8", "x":9, "y":1.5},
-        {"label":"KA7", "x":10, "y":1.5},
-        {"label":"KA5", "x":11, "y":1.5},
-        {"label":"KA4", "x":12, "y":1.5},
-        {"label":"KA3", "x":13, "y":1.5},
-        {"label":"KA6", "x":14, "y":1.5},
-        {"label":"KA2", "x":15.5, "y":1.5},
-        {"label":"KA1", "x":16.5, "y":1.5},
-        {"label":"KA0", "x":17.5, "y":1.5},
-        {"label":"K64", "x":18.5, "y":1.5},
-        {"label":"K30", "x":0, "y":2.5, "w":1.5},
-        {"label":"K31", "x":1.5, "y":2.5},
-        {"label":"K32", "x":2.5, "y":2.5},
-        {"label":"K33", "x":3.5, "y":2.5},
-        {"label":"K34", "x":4.5, "y":2.5},
-        {"label":"K35", "x":5.5, "y":2.5},
-        {"label":"K36", "x":6.5, "y":2.5},
-        {"label":"K37", "x":7.5, "y":2.5},
-        {"label":"K38", "x":8.5, "y":2.5},
-        {"label":"K98", "x":9.5, "y":2.5},
-        {"label":"K97", "x":10.5, "y":2.5},
-        {"label":"K95", "x":11.5, "y":2.5},
-        {"label":"K94", "x":12.5, "y":2.5},
-        {"label":"K84", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"K96", "x":15.5, "y":2.5},
-        {"label":"K92", "x":16.5, "y":2.5},
-        {"label":"K91", "x":17.5, "y":2.5},
-        {"label":"K90", "x":18.5, "y":2.5},
-        {"label":"K20", "x":0, "y":3.5, "w":1.75},
-        {"label":"K21", "x":1.75, "y":3.5},
-        {"label":"K22", "x":2.75, "y":3.5},
-        {"label":"K23", "x":3.75, "y":3.5},
-        {"label":"K24", "x":4.75, "y":3.5},
-        {"label":"K25", "x":5.75, "y":3.5},
-        {"label":"K26", "x":6.75, "y":3.5},
-        {"label":"K27", "x":7.75, "y":3.5},
-        {"label":"K28", "x":8.75, "y":3.5},
-        {"label":"K88", "x":9.75, "y":3.5},
-        {"label":"K87", "x":10.75, "y":3.5},
-        {"label":"K85", "x":11.75, "y":3.5},
-        {"label":"K93", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"K86", "x":15.5, "y":3.5},
-        {"label":"K82", "x":16.5, "y":3.5},
-        {"label":"K81", "x":17.5, "y":3.5},
-        {"label":"K80", "x":18.5, "y":3.5},
-        {"label":"K10", "x":0, "y":4.5, "w":1.25},
-        {"label":"K11", "x":1.25, "y":4.5},
-        {"label":"K12", "x":2.25, "y":4.5},
-        {"label":"K13", "x":3.25, "y":4.5},
-        {"label":"K14", "x":4.25, "y":4.5},
-        {"label":"K15", "x":5.25, "y":4.5},
-        {"label":"K16", "x":6.25, "y":4.5},
-        {"label":"K17", "x":7.25, "y":4.5},
-        {"label":"K18", "x":8.25, "y":4.5},
-        {"label":"K78", "x":9.25, "y":4.5},
-        {"label":"K77", "x":10.25, "y":4.5},
-        {"label":"K75", "x":11.25, "y":4.5},
-        {"label":"K74", "x":12.25, "y":4.5, "w":1.75},
-        {"label":"K73", "x":14.25, "y":4.75},
-        {"label":"K76", "x":15.5, "y":4.5},
-        {"label":"K72", "x":16.5, "y":4.5},
-        {"label":"K71", "x":17.5, "y":4.5},
-        {"label":"K70", "x":18.5, "y":4.5},
-        {"label":"K00", "x":0, "y":5.5, "w":1.25},
-        {"label":"K01", "x":1.25, "y":5.5},
-        {"label":"K02", "x":2.25, "y":5.5, "w":1.25},
-        {"label":"K06", "x":3.5, "y":5.5, "w":6.25},
-        {"label":"K08", "x":9.75, "y":5.5},
-        {"label":"K07", "x":10.75, "y":5.5},
-        {"label":"K05", "x":11.75, "y":5.5, "w":1.25},
-        {"label":"K04", "x":13.25, "y":5.75},
-        {"label":"K03", "x":14.25, "y":5.75},
-        {"label":"K66", "x":15.25, "y":5.75},
-        {"label":"K62", "x":16.5, "y":5.5},
-        {"label":"K61", "x":17.5, "y":5.5},
-        {"label":"K60", "x":18.5, "y":5.5}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+
+        {"matrix": [5, 2], "x": 1.25, "y": 0},
+        {"matrix": [5, 3], "x": 2.25, "y": 0},
+        {"matrix": [5, 4], "x": 3.25, "y": 0},
+        {"matrix": [5, 5], "x": 4.25, "y": 0},
+
+        {"matrix": [5, 7], "x": 5.5, "y": 0},
+        {"matrix": [5, 8], "x": 6.5, "y": 0},
+        {"matrix": [11, 8], "x": 7.5, "y": 0},
+        {"matrix": [11, 7], "x": 8.5, "y": 0},
+
+        {"matrix": [11, 5], "x": 9.75, "y": 0},
+        {"matrix": [11, 4], "x": 10.75, "y": 0},
+        {"matrix": [11, 3], "x": 11.75, "y": 0},
+        {"matrix": [11, 6], "x": 12.75, "y": 0},
+
+        {"matrix": [5, 1], "x": 14, "y": 0},
+
+        {"matrix": [11, 2], "x": 15.5, "y": 0},
+        {"matrix": [11, 1], "x": 16.5, "y": 0},
+        {"matrix": [11, 0], "x": 17.5, "y": 0},
+        {"matrix": [6, 3], "x": 18.5, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1.5},
+        {"matrix": [4, 1], "x": 1, "y": 1.5},
+        {"matrix": [4, 2], "x": 2, "y": 1.5},
+        {"matrix": [4, 3], "x": 3, "y": 1.5},
+        {"matrix": [4, 4], "x": 4, "y": 1.5},
+        {"matrix": [4, 5], "x": 5, "y": 1.5},
+        {"matrix": [4, 6], "x": 6, "y": 1.5},
+        {"matrix": [4, 7], "x": 7, "y": 1.5},
+        {"matrix": [4, 8], "x": 8, "y": 1.5},
+        {"matrix": [10, 8], "x": 9, "y": 1.5},
+        {"matrix": [10, 7], "x": 10, "y": 1.5},
+        {"matrix": [10, 5], "x": 11, "y": 1.5},
+        {"matrix": [10, 4], "x": 12, "y": 1.5},
+        {"matrix": [10, 3], "x": 13, "y": 1.5},
+        {"matrix": [10, 6], "x": 14, "y": 1.5},
+
+        {"matrix": [10, 2], "x": 15.5, "y": 1.5},
+        {"matrix": [10, 1], "x": 16.5, "y": 1.5},
+        {"matrix": [10, 0], "x": 17.5, "y": 1.5},
+        {"matrix": [6, 4], "x": 18.5, "y": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [3, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [3, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [3, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [3, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [3, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [3, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [9, 8], "x": 9.5, "y": 2.5},
+        {"matrix": [9, 7], "x": 10.5, "y": 2.5},
+        {"matrix": [9, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [9, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+        {"matrix": [9, 6], "x": 15.5, "y": 2.5},
+        {"matrix": [9, 2], "x": 16.5, "y": 2.5},
+        {"matrix": [9, 1], "x": 17.5, "y": 2.5},
+        {"matrix": [9, 0], "x": 18.5, "y": 2.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [2, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [2, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [2, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [2, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [2, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [2, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [8, 8], "x": 9.75, "y": 3.5},
+        {"matrix": [8, 7], "x": 10.75, "y": 3.5},
+        {"matrix": [8, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [8, 6], "x": 15.5, "y": 3.5},
+        {"matrix": [8, 2], "x": 16.5, "y": 3.5},
+        {"matrix": [8, 1], "x": 17.5, "y": 3.5},
+        {"matrix": [8, 0], "x": 18.5, "y": 3.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [7, 8], "x": 9.25, "y": 4.5},
+        {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+        {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [7, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+
+        {"matrix": [7, 3], "x": 14.25, "y": 4.75},
+
+        {"matrix": [7, 6], "x": 15.5, "y": 4.5},
+        {"matrix": [7, 2], "x": 16.5, "y": 4.5},
+        {"matrix": [7, 1], "x": 17.5, "y": 4.5},
+        {"matrix": [7, 0], "x": 18.5, "y": 4.5},
+
+        {"matrix": [0, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 5.5},
+        {"matrix": [0, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 6], "x": 3.5, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 8], "x": 9.75, "y": 5.5},
+        {"matrix": [0, 7], "x": 10.75, "y": 5.5},
+        {"matrix": [0, 5], "x": 11.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 4], "x": 13.25, "y": 5.75},
+        {"matrix": [0, 3], "x": 14.25, "y": 5.75},
+        {"matrix": [6, 6], "x": 15.25, "y": 5.75},
+
+        {"matrix": [6, 2], "x": 16.5, "y": 5.5},
+        {"matrix": [6, 1], "x": 17.5, "y": 5.5},
+        {"matrix": [6, 0], "x": 18.5, "y": 5.5}
       ]
     }
   }
diff --git a/keyboards/mt/mt980/mt980.h b/keyboards/mt/mt980/mt980.h
deleted file mode 100644
index d9804b3392..0000000000
--- a/keyboards/mt/mt980/mt980.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K050, K052, K053, K054, K055, K057, K058, K118, K117, K115, K114, K113, K116, K051,       K112, K111, K110, K063, \
-  K040, K041, K042, K043, K044, K045, K046, K047, K048, K108, K107, K105, K104, K103, K106, K102, K101, K100, K064, \
-  K030, K031, K032, K033, K034, K035, K036, K037, K038, K098, K097, K095, K094, K084,       K096, K092, K091, K090, \
-  K020, K021, K022, K023, K024, K025, K026, K027, K028, K088, K087, K085, K093,             K086, K082, K081, K080, \
-  K010, K011, K012, K013, K014, K015, K016, K017, K018, K078, K077, K075, K074,       K073, K076, K072, K071, K070, \
-  K000, K001, K002,                   K006,                   K008, K007, K005, K004, K003, K066, K062, K061, K060  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
-  { K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
-  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
-  { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058 }, \
-  { K060,  K061,  K062,  K063,  K064,  KC_NO, K066,  KC_NO, KC_NO}, \
-  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
-  { K080,  K081,  K082,  KC_NO, K084,  K085,  K086,  K087,  K088 }, \
-  { K090,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
-  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
-  { K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118 }  \
-}