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

3 files changed, 103 insertions, 121 deletions

diff --git a/keyboards/halokeys/elemental75/elemental75.c b/keyboards/halokeys/elemental75/elemental75.c
index 2b5dc1ca2e..457e1efbaa 100644
--- a/keyboards/halokeys/elemental75/elemental75.c
+++ b/keyboards/halokeys/elemental75/elemental75.c
@@ -13,7 +13,7 @@
   * 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 "elemental75.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/halokeys/elemental75/elemental75.h b/keyboards/halokeys/elemental75/elemental75.h
deleted file mode 100644
index 265d1c9437..0000000000
--- a/keyboards/halokeys/elemental75/elemental75.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 Halokeys
-*
-* 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 LAYOUT( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,   K0D,  K0E,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K59,  K1E,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,         K3E,  \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,     K4D,  K4E,  \
-    K50,   K51, K52,    K54,       K56,  K58,          K5A,  K5B,    K5C, K5D, K5E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-    { K50,   K51,   K52,   KC_NO, K54,   KC_NO, K56,   KC_NO, K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
-}
diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json
index d2434896d7..a97731b125 100644
--- a/keyboards/halokeys/elemental75/info.json
+++ b/keyboards/halokeys/elemental75/info.json
@@ -27,92 +27,108 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"K00 (A2,B2)", "x":0, "y":0},
-              {"label":"K01 (A2,B1)", "x":1.25, "y":0},
-              {"label":"K02 (A2,B0)", "x":2.25, "y":0},
-              {"label":"K03 (A2,B10)", "x":3.25, "y":0},
-              {"label":"K04 (A2,B11)", "x":4.25, "y":0},
-              {"label":"K05 (A2,B13)", "x":5.5, "y":0},
-              {"label":"K06 (A2,B14)", "x":6.5, "y":0},
-              {"label":"K07 (A2,B15)", "x":7.5, "y":0},
-              {"label":"K08 (A2,A8)", "x":8.5, "y":0},
-              {"label":"K09 (A2,A9)", "x":9.75, "y":0},
-              {"label":"K0A (A2,A14)", "x":10.75, "y":0},
-              {"label":"K0B (A2,A15)", "x":11.75, "y":0},
-              {"label":"K0C (A2,B3)", "x":12.75, "y":0},
-              {"label":"K0D (A2,B4)", "x":14, "y":0},
-              {"label":"K0E (A2,B7)", "x":15.25, "y":0},
-              {"label":"K10 (A3,B2)", "x":0, "y":1.25},
-              {"label":"K11 (A3,B1)", "x":1, "y":1.25},
-              {"label":"K12 (A3,B0)", "x":2, "y":1.25},
-              {"label":"K13 (A3,B10)", "x":3, "y":1.25},
-              {"label":"K14 (A3,B11)", "x":4, "y":1.25},
-              {"label":"K15 (A3,B13)", "x":5, "y":1.25},
-              {"label":"K16 (A3,B14)", "x":6, "y":1.25},
-              {"label":"K17 (A3,B15)", "x":7, "y":1.25},
-              {"label":"K18 (A3,A8)", "x":8, "y":1.25},
-              {"label":"K19 (A3,A9)", "x":9, "y":1.25},
-              {"label":"K1A (A3,A14)", "x":10, "y":1.25},
-              {"label":"K1B (A3,A15)", "x":11, "y":1.25},
-              {"label":"K1C (A3,B3)", "x":12, "y":1.25},
-              {"label":"K1D (A3,B4)", "x":13, "y":1.25},
-              {"label":"K59 (A7,A9)", "x":14, "y":1.25},
-              {"label":"K1E (A3,B7)", "x":15.25, "y":1.25},
-              {"label":"K20 (A4,B2)", "x":0, "y":2.25, "w":1.5},
-              {"label":"K21 (A4,B1)", "x":1.5, "y":2.25},
-              {"label":"K22 (A4,B0)", "x":2.5, "y":2.25},
-              {"label":"K23 (A4,B10)", "x":3.5, "y":2.25},
-              {"label":"K24 (A4,B11)", "x":4.5, "y":2.25},
-              {"label":"K25 (A4,B13)", "x":5.5, "y":2.25},
-              {"label":"K26 (A4,B14)", "x":6.5, "y":2.25},
-              {"label":"K27 (A4,B15)", "x":7.5, "y":2.25},
-              {"label":"K28 (A4,A8)", "x":8.5, "y":2.25},
-              {"label":"K29 (A4,A9)", "x":9.5, "y":2.25},
-              {"label":"K2A (A4,A14)", "x":10.5, "y":2.25},
-              {"label":"K2B (A4,A15)", "x":11.5, "y":2.25},
-              {"label":"K2C (A4,B3)", "x":12.5, "y":2.25},
-              {"label":"K2D (A4,B4)", "x":13.5, "y":2.25, "w":1.5},
-              {"label":"K2E (A4,B7)", "x":15.25, "y":2.25},
-              {"label":"K30 (A5,B2)", "x":0, "y":3.25, "w":1.75},
-              {"label":"K31 (A5,B1)", "x":1.75, "y":3.25},
-              {"label":"K32 (A5,B0)", "x":2.75, "y":3.25},
-              {"label":"K33 (A5,B10)", "x":3.75, "y":3.25},
-              {"label":"K34 (A5,B11)", "x":4.75, "y":3.25},
-              {"label":"K35 (A5,B13)", "x":5.75, "y":3.25},
-              {"label":"K36 (A5,B14)", "x":6.75, "y":3.25},
-              {"label":"K37 (A5,B15)", "x":7.75, "y":3.25},
-              {"label":"K38 (A5,A8)", "x":8.75, "y":3.25},
-              {"label":"K39 (A5,A9)", "x":9.75, "y":3.25},
-              {"label":"K3A (A5,A14)", "x":10.75, "y":3.25},
-              {"label":"K3B (A5,A15)", "x":11.75, "y":3.25},
-              {"label":"K3C (A5,B3)", "x":12.75, "y":3.25, "w":2.25},
-              {"label":"K3E (A5,B7)", "x":15.25, "y":3.25},
-              {"label":"K40 (A6,B2)", "x":0, "y":4.25, "w":1.25},
-              {"label":"K41 (A6,B1)", "x":1.25, "y":4.25},
-              {"label":"K42 (A6,B0)", "x":2.25, "y":4.25},
-              {"label":"K43 (A6,B10)", "x":3.25, "y":4.25},
-              {"label":"K44 (A6,B11)", "x":4.25, "y":4.25},
-              {"label":"K45 (A6,B13)", "x":5.25, "y":4.25},
-              {"label":"K46 (A6,B14)", "x":6.25, "y":4.25},
-              {"label":"K47 (A6,B15)", "x":7.25, "y":4.25},
-              {"label":"K48 (A6,A8)", "x":8.25, "y":4.25},
-              {"label":"K49 (A6,A9)", "x":9.25, "y":4.25},
-              {"label":"K4A (A6,A14)", "x":10.25, "y":4.25},
-              {"label":"K4B (A6,A15)", "x":11.25, "y":4.25},
-              {"label":"K4C (A6,B3)", "x":12.25, "y":4.25, "w":1.5},
-              {"label":"K4D (A6,B4)", "x":14, "y":4.5},
-              {"label":"K4E (A6,B7)", "x":15.25, "y":4.25},
-              {"label":"K50 (A7,B2)", "x":0, "y":5.25, "w":1.5},
-              {"label":"K51 (A7,B1)", "x":1.5, "y":5.25},
-              {"label":"K52 (A7,B0)", "x":2.5, "y":5.25, "w":1.5},
-              {"label":"K54 (A7,B11)", "x":4, "y":5.25, "w":2.25},
-              {"label":"K56 (A7,B14)", "x":6.25, "y":5.25, "w":1.25},
-              {"label":"K58 (A7,A8)", "x":7.5, "y":5.25, "w":2.75},
-              {"label":"K5A (A7,A14)", "x":10.25, "y":5.25, "w":1.25},
-              {"label":"K5B (A7,A15)", "x":11.5, "y":5.25, "w":1.25},
-              {"label":"K5C (A7,B3)", "x":13, "y":5.5},
-              {"label":"K5D (A7,B4)", "x":14, "y":5.5},
-              {"label":"K5E (A7,B7)", "x":15, "y":5.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.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [5, 9], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 6], "x": 6.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
             ]
         }
     }