Move remaining `LAYOUT_all`s to data driven (#20463)

3 files changed, 153 insertions, 192 deletions

diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c
deleted file mode 100644
index 824e7364be..0000000000
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
index cc0d0dc7e9..5f25d9c5c3 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
@@ -18,36 +18,3 @@
 
 #include "quantum.h"
 #include "encoder_actions.h"
-
-
-
-#define XXX KC_NO
-
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K42, K43, K45, K46, K47, K48, K4B, K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, XXX, K42, K43, XXX, K45, K46, K47, K48, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_via_rotary( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, EC1A, EC2A,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K42, K43, K45, K46, K47, K48, K4B, K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, EC1A, K3D, K3E, K3F }, \
-    { K40, XXX, K42, K43, XXX, K45, K46, K47, K48, XXX, XXX, K4B, EC2A, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
index 481b503520..af2f69242e 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
@@ -30,152 +30,163 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "", "x": 0, "y": 0 },
-                { "label": "", "x": 1, "y": 0 },
-                { "label": "", "x": 2, "y": 0 },
-                { "label": "", "x": 3, "y": 0 },
-                { "label": "", "x": 4, "y": 0 },
-                { "label": "", "x": 5, "y": 0 },
-                { "label": "", "x": 6, "y": 0 },
-                { "label": "", "x": 7, "y": 0 },
-                { "label": "", "x": 8, "y": 0 },
-                { "label": "", "x": 9, "y": 0 },
-                { "label": "", "x": 10, "y": 0 },
-                { "label": "", "x": 11, "y": 0 },
-                { "label": "", "x": 12, "y": 0 },
-                { "label": "", "x": 13, "y": 0 },
-                { "label": "", "x": 14, "y": 0 },
-                { "label": "", "x": 15, "y": 0 },
-                { "label": "", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "", "x": 1.5, "y": 1 },
-                { "label": "", "x": 2.5, "y": 1 },
-                { "label": "", "x": 3.5, "y": 1 },
-                { "label": "", "x": 4.5, "y": 1 },
-                { "label": "", "x": 5.5, "y": 1 },
-                { "label": "", "x": 6.5, "y": 1 },
-                { "label": "", "x": 7.5, "y": 1 },
-                { "label": "", "x": 8.5, "y": 1 },
-                { "label": "", "x": 9.5, "y": 1 },
-                { "label": "", "x": 10.5, "y": 1 },
-                { "label": "", "x": 11.5, "y": 1 },
-                { "label": "", "x": 12.5, "y": 1 },
-                { "label": "", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "", "x": 15, "y": 1 },
-                { "label": "", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "", "x": 1.75, "y": 2 },
-                { "label": "", "x": 2.75, "y": 2 },
-                { "label": "", "x": 3.75, "y": 2 },
-                { "label": "", "x": 4.75, "y": 2 },
-                { "label": "", "x": 5.75, "y": 2 },
-                { "label": "", "x": 6.75, "y": 2 },
-                { "label": "", "x": 7.75, "y": 2 },
-                { "label": "", "x": 8.75, "y": 2 },
-                { "label": "", "x": 9.75, "y": 2 },
-                { "label": "", "x": 10.75, "y": 2 },
-                { "label": "", "x": 11.75, "y": 2 },
-                { "label": "", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "", "x": 15, "y": 2 },
-                { "label": "", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "", "x": 2.25, "y": 3 },
-                { "label": "", "x": 3.25, "y": 3 },
-                { "label": "", "x": 4.25, "y": 3 },
-                { "label": "", "x": 5.25, "y": 3 },
-                { "label": "", "x": 6.25, "y": 3 },
-                { "label": "", "x": 7.25, "y": 3 },
-                { "label": "", "x": 8.25, "y": 3 },
-                { "label": "", "x": 9.25, "y": 3 },
-                { "label": "", "x": 10.25, "y": 3 },
-                { "label": "", "x": 11.25, "y": 3 },
-                { "label": "", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "", "x": 14, "y": 3 },
-                { "label": "", "x": 15, "y": 3 },
-                { "label": "", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "", "x": 3.75, "y": 4, "w": 2.25 },
-                { "label": "", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "", "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "", "x": 13, "y": 4 },
-                { "label": "", "x": 14, "y": 4 },
-                { "label": "", "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_via_rotary": {
             "layout": [
-                { "label": "", "x": 0, "y": 0.75 },
-                { "label": "", "x": 1, "y": 0.75 },
-                { "label": "", "x": 2, "y": 0.75 },
-                { "label": "", "x": 3, "y": 0.75 },
-                { "label": "", "x": 4, "y": 0.75 },
-                { "label": "", "x": 5, "y": 0.75 },
-                { "label": "", "x": 6, "y": 0.75 },
-                { "label": "", "x": 7, "y": 0.75 },
-                { "label": "", "x": 8, "y": 0.75 },
-                { "label": "", "x": 9, "y": 0.75 },
-                { "label": "", "x": 10, "y": 0.75 },
-                { "label": "", "x": 11, "y": 0.75 },
-                { "label": "", "x": 12, "y": 0.75 },
-                { "label": "", "x": 13, "y": 0.75 },
-                { "label": "", "x": 14, "y": 0.75 },
-                { "label": "", "x": 15, "y": 0.75 },
-                { "label": "", "x": 14.75, "y": 0, "w": 0.75, "h": 0.75 },
-                { "label": "", "x": 15.5, "y": 0, "w": 0.75, "h": 0.75 },
-                { "label": "", "x": 0, "y": 1.75, "w": 1.5 },
-                { "label": "", "x": 1.5, "y": 1.75 },
-                { "label": "", "x": 2.5, "y": 1.75 },
-                { "label": "", "x": 3.5, "y": 1.75 },
-                { "label": "", "x": 4.5, "y": 1.75 },
-                { "label": "", "x": 5.5, "y": 1.75 },
-                { "label": "", "x": 6.5, "y": 1.75 },
-                { "label": "", "x": 7.5, "y": 1.75 },
-                { "label": "", "x": 8.5, "y": 1.75 },
-                { "label": "", "x": 9.5, "y": 1.75 },
-                { "label": "", "x": 10.5, "y": 1.75 },
-                { "label": "", "x": 11.5, "y": 1.75 },
-                { "label": "", "x": 12.5, "y": 1.75 },
-                { "label": "", "x": 13.5, "y": 1.75, "w": 1.5 },
-                { "label": "", "x": 15, "y": 1.75 },
-                { "label": "", "x": 0, "y": 2.75, "w": 1.75 },
-                { "label": "", "x": 1.75, "y": 2.75 },
-                { "label": "", "x": 2.75, "y": 2.75 },
-                { "label": "", "x": 3.75, "y": 2.75 },
-                { "label": "", "x": 4.75, "y": 2.75 },
-                { "label": "", "x": 5.75, "y": 2.75 },
-                { "label": "", "x": 6.75, "y": 2.75 },
-                { "label": "", "x": 7.75, "y": 2.75 },
-                { "label": "", "x": 8.75, "y": 2.75 },
-                { "label": "", "x": 9.75, "y": 2.75 },
-                { "label": "", "x": 10.75, "y": 2.75 },
-                { "label": "", "x": 11.75, "y": 2.75 },
-                { "label": "", "x": 12.75, "y": 2.75, "w": 2.25 },
-                { "label": "", "x": 15, "y": 2.75 },
-                { "label": "", "x": 0, "y": 3.75, "w": 2.25 },
-                { "label": "", "x": 2.25, "y": 3.75 },
-                { "label": "", "x": 3.25, "y": 3.75 },
-                { "label": "", "x": 4.25, "y": 3.75 },
-                { "label": "", "x": 5.25, "y": 3.75 },
-                { "label": "", "x": 6.25, "y": 3.75 },
-                { "label": "", "x": 7.25, "y": 3.75 },
-                { "label": "", "x": 8.25, "y": 3.75 },
-                { "label": "", "x": 9.25, "y": 3.75 },
-                { "label": "", "x": 10.25, "y": 3.75 },
-                { "label": "", "x": 11.25, "y": 3.75 },
-                { "label": "", "x": 12.25, "y": 3.75, "w": 1.75 },
-                { "label": "", "x": 14, "y": 3.75 },
-                { "label": "", "x": 15, "y": 3.75 },
-                { "label": "", "x": 0, "y": 4.75, "w": 1.25 },
-                { "label": "", "x": 1.25, "y": 4.75, "w": 1.25 },
-                { "label": "", "x": 2.5, "y": 4.75, "w": 1.25 },
-                { "label": "", "x": 3.75, "y": 4.75, "w": 2.25 },
-                { "label": "", "x": 6, "y": 4.75, "w": 1.25 },
-                { "label": "", "x": 7.25, "y": 4.75, "w": 2.75 },
-                { "label": "", "x": 10, "y": 4.75, "w": 1.25 },
-                { "label": "", "x": 11.25, "y": 4.75, "w": 1.25 },
-                { "label": "", "x": 13, "y": 4.75 },
-                { "label": "", "x": 14, "y": 4.75 },
-                { "label": "", "x": 15, "y": 4.75 }
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.75},
+                {"matrix": [0, 3], "x": 3, "y": 0.75},
+                {"matrix": [0, 4], "x": 4, "y": 0.75},
+                {"matrix": [0, 5], "x": 5, "y": 0.75},
+                {"matrix": [0, 6], "x": 6, "y": 0.75},
+                {"matrix": [0, 7], "x": 7, "y": 0.75},
+                {"matrix": [0, 8], "x": 8, "y": 0.75},
+                {"matrix": [0, 9], "x": 9, "y": 0.75},
+                {"matrix": [0, 10], "x": 10, "y": 0.75},
+                {"matrix": [0, 11], "x": 11, "y": 0.75},
+                {"matrix": [0, 12], "x": 12, "y": 0.75},
+                {"matrix": [0, 13], "x": 13, "y": 0.75},
+                {"matrix": [0, 14], "x": 14, "y": 0.75},
+                {"matrix": [0, 15], "x": 15, "y": 0.75},
+
+                {"matrix": [3, 12], "x": 14.75, "y": 0, "w": 0.75, "h": 0.75},
+                {"matrix": [4, 12], "x": 15.5, "y": 0, "w": 0.75, "h": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.75},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.75},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.75},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.75},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.75},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.75},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.75},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.75},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.75},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.75},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.75},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.75},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.75, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.75},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.75},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.75},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.75},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.75},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.75},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.75},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.75},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.75},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.75},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.75, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.75},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.75},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.75},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.75},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.75},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.75},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.75},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.75},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.75},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.75},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.75, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3.75},
+                {"matrix": [3, 15], "x": 15, "y": 3.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4.75, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.75, "w": 2.75},
+                {"matrix": [4, 8], "x": 10, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.75, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.75},
+                {"matrix": [4, 15], "x": 15, "y": 4.75}
             ]
         }
     }