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

2 files changed, 122 insertions, 58 deletions

diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/info.json
index f232a0ea33..d3bc56857a 100644
--- a/keyboards/handwired/t111/info.json
+++ b/keyboards/handwired/t111/info.json
@@ -17,7 +17,128 @@
     "bootloader": "stm32duino",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Break", "x":0, "y":0}, {"label":"PF1", "x":2, "y":0}, {"label":"PF2", "x":3, "y":0}, {"label":"PF3", "x":4, "y":0}, {"label":"PF4", "x":5, "y":0}, {"label":"PF5", "x":6, "y":0}, {"label":"PF6", "x":7, "y":0}, {"label":"PF7", "x":8, "y":0}, {"label":"PF8", "x":9, "y":0}, {"label":"PF9", "x":10, "y":0}, {"label":"PF10", "x":11, "y":0}, {"label":"PF11", "x":12, "y":0}, {"label":"PF12", "x":13, "y":0}, {"label":"PF13", "x":14, "y":0}, {"label":"PF14", "x":15, "y":0}, {"label":"PF15", "x":16, "y":0}, {"label":"PF16", "x":17, "y":0}, {"label":"Esc", "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":"~", "x":13, "y":1.5}, {"label":"bkspc", "x":14, "y":1.5, "w":1.25}, {"label":"Ins", "x":15.5, "y":1.5}, {"label":"Cls", "x":16.5, "y":1.5}, {"label":"*", "x":17.75, "y":1.5}, {"label":"/", "x":18.75, "y":1.5}, {"label":"+", "x":19.75, "y":1.5}, {"label":"-", "x":20.75, "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":"El", "x":15.5, "y":2.5}, {"label":"Dup", "x":16.5, "y":2.5}, {"label":"7", "x":17.75, "y":2.5}, {"label":"8", "x":18.75, "y":2.5}, {"label":"9", "x":19.75, "y":2.5}, {"label":"=", "x":20.75, "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":"|", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.5, "h":2}, {"label":"Del", "x":15.5, "y":3.5}, {"label":"Home", "x":16.5, "y":3.5}, {"label":"4", "x":17.75, "y":3.5}, {"label":"5", "x":18.75, "y":3.5}, {"label":"6", "x":19.75, "y":3.5}, {"label":",", "x":20.75, "y":3.5}, {"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}, {"x":12.25, "y":4.5}, {"label":"Shift", "x":13.25, "y":4.5, "w":2}, {"label":"\u0432\u2020\u2018", "x":15.5, "y":4.5}, {"label":"\u0432\u2020\u201c", "x":16.5, "y":4.5}, {"label":"1", "x":17.75, "y":4.5}, {"label":"2", "x":18.75, "y":4.5}, {"label":"3", "x":19.75, "y":4.5}, {"label":"Enter", "x":20.75, "y":4.5, "h":2}, {"label":"Caps", "x":1.75, "y":5.5}, {"label":"Graph", "x":2.75, "y":5.5, "w":1.5}, {"x":4.25, "y":5.5, "w":8}, {"label":"Alt", "x":12.25, "y":5.5, "w":1.5}, {"label":"\u0432\u2020\u0452", "x":15.5, "y":5.5}, {"label":"\u0432\u2020\u2019", "x":16.5, "y":5.5}, {"label":"0", "x":17.75, "y":5.5, "w":2}, {"label":".", "x":19.75, "y":5.5}]
+            "layout": [
+                {"matrix": [3, 0], "x": 0, "y": 0},
+
+                {"matrix": [4, 0], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [2, 1], "x": 4, "y": 0},
+                {"matrix": [3, 1], "x": 5, "y": 0},
+                {"matrix": [4, 1], "x": 6, "y": 0},
+                {"matrix": [5, 1], "x": 7, "y": 0},
+                {"matrix": [6, 1], "x": 8, "y": 0},
+                {"matrix": [7, 1], "x": 9, "y": 0},
+                {"matrix": [0, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [2, 2], "x": 12, "y": 0},
+                {"matrix": [3, 2], "x": 13, "y": 0},
+                {"matrix": [4, 2], "x": 14, "y": 0},
+                {"matrix": [5, 2], "x": 15, "y": 0},
+                {"matrix": [6, 2], "x": 16, "y": 0},
+                {"matrix": [7, 2], "x": 17, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 3], "x": 1, "y": 1.5},
+                {"matrix": [2, 3], "x": 2, "y": 1.5},
+                {"matrix": [3, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 1.5},
+                {"matrix": [5, 3], "x": 5, "y": 1.5},
+                {"matrix": [6, 3], "x": 6, "y": 1.5},
+                {"matrix": [7, 3], "x": 7, "y": 1.5},
+                {"matrix": [0, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 4], "x": 10, "y": 1.5},
+                {"matrix": [3, 4], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [5, 4], "x": 13, "y": 1.5},
+                {"matrix": [5, 8], "x": 14, "y": 1.5, "w": 1.25},
+
+                {"matrix": [6, 4], "x": 15.5, "y": 1.5},
+                {"matrix": [7, 4], "x": 16.5, "y": 1.5},
+
+                {"matrix": [1, 5], "x": 17.75, "y": 1.5},
+                {"matrix": [0, 6], "x": 18.75, "y": 1.5},
+                {"matrix": [7, 6], "x": 19.75, "y": 1.5},
+                {"matrix": [6, 6], "x": 20.75, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 7], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 12.5, "y": 2.5},
+
+                {"matrix": [6, 8], "x": 15.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 16.5, "y": 2.5},
+
+                {"matrix": [1, 11], "x": 17.75, "y": 2.5},
+                {"matrix": [0, 0], "x": 18.75, "y": 2.5},
+                {"matrix": [7, 0], "x": 19.75, "y": 2.5},
+                {"matrix": [6, 0], "x": 20.75, "y": 2.5},
+
+                {"matrix": [0, 10], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [2, 9], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [4, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 9], "x": 7.75, "y": 3.5},
+                {"matrix": [0, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [2, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 13.75, "y": 2.5, "w": 1.5, "h": 2},
+
+                {"matrix": [6, 10], "x": 15.5, "y": 3.5},
+                {"matrix": [7, 10], "x": 16.5, "y": 3.5},
+
+                {"matrix": [2, 11], "x": 17.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 18.75, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.75, "y": 3.5},
+                {"matrix": [5, 11], "x": 20.75, "y": 3.5},
+
+                {"matrix": [0, 13], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 12], "x": 2.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 3.25, "y": 4.5},
+                {"matrix": [3, 12], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 12], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 8.25, "y": 4.5},
+                {"matrix": [0, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 13], "x": 10.25, "y": 4.5},
+                {"matrix": [2, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5},
+                {"matrix": [0, 4], "x": 13.25, "y": 4.5, "w": 2},
+
+                {"matrix": [6, 13], "x": 15.5, "y": 4.5},
+                {"matrix": [7, 13], "x": 16.5, "y": 4.5},
+
+                {"matrix": [2, 5], "x": 17.75, "y": 4.5},
+                {"matrix": [3, 5], "x": 18.75, "y": 4.5},
+                {"matrix": [4, 5], "x": 19.75, "y": 4.5},
+                {"matrix": [5, 5], "x": 20.75, "y": 4.5, "h": 2},
+
+                {"matrix": [0, 8], "x": 1.75, "y": 5.5},
+                {"matrix": [0, 11], "x": 2.75, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 4.25, "y": 5.5, "w": 8},
+                {"matrix": [0, 5], "x": 12.25, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 11], "x": 15.5, "y": 5.5},
+                {"matrix": [7, 11], "x": 16.5, "y": 5.5},
+
+                {"matrix": [6, 5], "x": 17.75, "y": 5.5, "w": 2},
+                {"matrix": [7, 5], "x": 19.75, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/t111/t111.h b/keyboards/handwired/t111/t111.h
deleted file mode 100644
index 35651f635d..0000000000
--- a/keyboards/handwired/t111/t111.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * 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"
-
-#define XXX KC_NO
-
-/* 
-,-------------------------------------------------------------------------------------------------------------------------------------.
-|break|     | PF1 | PF2 | PF3 | PF4 | PF5 | PF6 | PF7 | PF8 | PF9 | PF10| PF11| PF12| PF13| PF14| PF15| PF16|                         |
-|-------------------------------------------------------------------------------------------------------------------------------------|
-| esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  ~  |backspc|  | ins | cls |  |  *  |  /  |  +  |  -  |
-|-------------------------------------------------------------------------------------------------------------------------------------|
-|  tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   enter      |  el | dup |  |  7  |  8  |  9  |  =  |
-|--------------------------------------------------------------------------------              |--------------------------------------|
-|  ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;: |  '" |  |\ |             | del | home|  |  4  |  5  |  6  |  ,  |
-|-------------------------------------------------------------------------------------------------------------------------------------|
-|   shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /? |blank|     shift      |  up | down|  |  1  |  2  |  3  |enter|
-|-------------------------------------------------------------------------------------------------------------------------------|     |
-|         | caps| graph |                    Space                      | alt |                | left|right|  |     0     |  .  |     |
-`-------------------------------------------------------------------------------------------------------------------------------------'
-*/
-
-#define LAYOUT( \
-  K30,      K40, K11, K21, K31, K41, K51, K61, K71, K01, K12, K22, K32, K42, K52, K62, K72, \
-  K20, K13, K23, K33, K43, K53, K63, K73, K03, K14, K24, K34, K44, K54, K58,   K64, K74,   K15, K06, K76, K66, \
-  K10,  K17, K27, K37, K47, K57, K67, K77, K07, K18, K28, K38, K48,            K68, K78,   K1B, K00, K70, K60, \
-  K0A,   K19, K29, K39, K49, K59, K69, K79, K09, K1A, K2A, K3A, K4A,    K5A,   K6A, K7A,   K2B, K3B, K4B, K5B, \
-  K0D,    K1C, K2C, K3C, K4C, K5C, K6C, K7C, K0C, K1D, K2D, K3D,        K04,   K6D, K7D,   K25, K35, K45, K55, \
-          K08, K0B,                   K50,                  K05,               K6B, K7B,      K65,   K75 \
-) \
-{ \
-/* 0 */  { K00, K01, XXX, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-/* 1 */  { K10, K11, K12, K13, K14, K15, XXX, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-/* 2 */  { K20, K21, K22, K23, K24, K25, XXX, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-/* 3 */  { K30, K31, K32, K33, K34, K35, XXX, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-/* 4 */  { K40, K41, K42, K43, K44, K45, XXX, K47, K48, K49, K4A, K4B, K4C, XXX }, \
-/* 5 */  { K50, K51, K52, K53, K54, K55, XXX, K57, K58, K59, K5A, K5B, K5C, XXX }, \
-/* 6 */  { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D }, \
-/* 7 */  { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D }  \
-}
-/*          0    1    2    3    4    5    6    7    8    9    A    B    C    D    */