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

3 files changed, 69 insertions, 100 deletions

diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index 9d5efc208d..98d37290e6 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hotswap.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.h b/keyboards/axolstudio/yeti/hotswap/hotswap.h
deleted file mode 100644
index 736f26ed7f..0000000000
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 kb-elmo
- *
- * 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 ____ KC_NO
-
-#define LAYOUT( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,   k214,     \
-          k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,       k314, \
-          k401,       k403,       k405, k406,       k408,       k410,                   k414  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214 }, \
-    { ____, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, ____, k314 }, \
-    { ____, k401, ____, k403, ____, k405, k406, ____, k408, ____, k410, ____, ____, ____, k414 }  \
-}
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
index e65ab71e73..732e9075cd 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -21,70 +21,74 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0, "w":2},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":2.75},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+
+        {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 2.75},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
       ]
     }
   }