Move TKL layouts to data driven (#20337)

2 files changed, 102 insertions, 119 deletions

diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json
index 05fa106877..07e477bf9f 100644
--- a/keyboards/mode/m80v1/m80h/info.json
+++ b/keyboards/mode/m80v1/m80h/info.json
@@ -22,93 +22,108 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "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":"Bkspc", "x":13, "y":1.5, "w": 2},
-			{"label":"Mute", "x":15.25, "y":0},
-			{"label":"VolDn", "x":16.25, "y":0},
-			{"label":"VolUp", "x":17.25, "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":"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":"Enter", "x":12.75, "y":3.5, "w":2.25},
-			{"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":"\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":"FN1", "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": [3, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 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": 15.25, "y": 1.5},
+                {"matrix": [1, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 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": [4, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 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, 12], "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, 11], "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.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, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/mode/m80v1/m80h/m80h.h b/keyboards/mode/m80v1/m80h/m80h.h
deleted file mode 100644
index 87867de6b4..0000000000
--- a/keyboards/mode/m80v1/m80h/m80h.h
+++ /dev/null
@@ -1,32 +0,0 @@
- /* Copyright 2020 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-  * 
-  * 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. 
-  */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-    K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
-    K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,         K214, K215,  K216, \
-    K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K514,  K314, K315,  K316, \
-    K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,                            \
-    K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  K512,                      K515,        \
-    K601,  K602,  K603,                       K607,                K610,  K611,  K612,  K613,         K614, K615,  K616  \
-) { \
-    { K101,   K102,   K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 , K115,  K116 },  \
-    { K201,   K202,   K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 , K215,  K216 },  \
-    { K301,   K302,   K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 , K315,  K316 },  \
-    { K401,   K402,   K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO, K415 , KC_NO }, \
-    { K501,   K502,   K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  K512,  KC_NO, K514 , K515,  KC_NO }, \
-    { K601,   K602,   K603,  KC_NO, KC_NO, KC_NO, K607,  KC_NO, KC_NO, K610,  K611,  K612,  K613,  K614 , K615,  K616 }   \
-}