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

2 files changed, 113 insertions, 157 deletions

diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json
index b71dff3ec8..f2d1e4886b 100644
--- a/keyboards/sets3n/kk980/info.json
+++ b/keyboards/sets3n/kk980/info.json
@@ -21,110 +21,120 @@
     "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":"DEL", "x": 15.5, "y": 0},
-                {"label":"INSERT", "x": 16.5, "y": 0},
-                {"label":"PGUP", "x": 17.5, "y": 0},
-                {"label":"PGDN", "x": 18.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":"BS", "x": 13, "y": 1.5, "w": 2},
-                {"label":"NUML", "x": 15.5, "y": 1.5},
-                {"label":"/", "x": 16.5, "y": 1.5},
-                {"label":"*", "x": 17.5, "y": 1.5},
-                {"label":"-", "x": 18.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":"7", "x": 15.5, "y": 2.5},
-                {"label":"8", "x": 16.5, "y": 2.5},
-                {"label":"9", "x": 17.5, "y": 2.5},
-
-                {"label":"CAPS", "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":"RETURN", "x": 12.75, "y": 3.5, "w": 2.25},
-                {"label":"4", "x": 15.5, "y": 3.5},
-                {"label":"5", "x": 16.5, "y": 3.5},
-                {"label":"6", "x": 17.5, "y": 3.5},
-                {"label":"+", "x": 18.5, "y": 2.5, "h": 2},
-
-                {"label":"LSHIFT", "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":"RSHIFT", "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label":"up", "x": 14.25, "y": 4.75},
-                {"label":"1", "x": 15.5, "y": 4.5},
-                {"label":"2", "x": 16.5, "y": 4.5},
-                {"label":"3", "x": 17.5, "y": 4.5},
-
-                {"label":"LCTRL", "x": 0, "y": 5.5, "w": 1.25},
-                {"label":"LWIN", "x": 1.25, "y": 5.5},
-                {"label":"LALT", "x": 2.25, "y": 5.5, "w": 1.25},
-                {"label":"SPACE", "x": 3.5, "y": 5.5, "w": 6.25},
-                {"label":"RALT", "x": 9.75, "y": 5.5},
-                {"label":"FN", "x": 10.75, "y": 5.5},
-                {"label":"RCTRL", "x": 11.75, "y": 5.5, "w": 1.25},
-                {"label":"LEFT", "x": 13.25, "y": 5.75},
-                {"label":"DOWN", "x": 14.25, "y": 5.75},
-                {"label":"RIGHT", "x": 15.25, "y": 5.75},
-                {"label":"0", "x": 16.5, "y": 5.5},
-                {"label":".DEL", "x": 17.5, "y": 5.5},
-                {"label":"ENTER", "x": 18.5, "y": 4.5, "h": 2}
+                {"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, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 15], "x": 17.5, "y": 0},
+                {"matrix": [0, 16], "x": 18.5, "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": [5, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 13], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 18.5, "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": [5, 7], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 13], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 17.5, "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": [3, 13], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 14], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 15], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"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": 1.75},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 13], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 14], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 15], "x": 17.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 9], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 10], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 11], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 12], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 14], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 18.5, "y": 4.5, "h": 2}
             ]
         }
     }
diff --git a/keyboards/sets3n/kk980/kk980.h b/keyboards/sets3n/kk980/kk980.h
deleted file mode 100644
index c7589e8c40..0000000000
--- a/keyboards/sets3n/kk980/kk980.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2021 Sets3n
- *
- * 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
-
-/*
- * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
- * │00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0D │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │56     │ │1D │1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │57   │ │2D │2E │2F │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤3G │
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C      │ │3D │3E │3F │   │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤
- * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B    │┌───┐│4D │4E │4F │   │
- * ├────┬───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴──┬───┘│4C │└───┼───┼───┤5G │
- * │50  │51 │52  │55                      │58 │59 │5A  │┌───┼───┼───┐│5E │5F │   │
- * └────┴───┴────┴────────────────────────┴───┴───┴────┘│5B │5C │5D │└───┴───┴───┘
- *                                                      └───┴───┴───┘
- */
-
-#define LAYOUT( \
-	K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0D, K0E, K0F, K0G, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K56,      K1D, K1E, K1F, K1G, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K57,      K2D, K2E, K2F,      \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,      K3D, K3E, K3F, K3G, \
-	K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4C,    K4D, K4E, K4F,      \
-	K50, K51, K52,                K55,           K58, K59, K5A,   K5B, K5C, K5D,    K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, XXX }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G }, \
-	{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, XXX }, \
-	{ K50, K51, K52, XXX, XXX, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}