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

5 files changed, 131 insertions, 63 deletions

diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index db9d760692..16a455f59d 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -27,10 +27,63 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},                                 {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0},
-        {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1},                                 {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1},
-        {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2},                                 {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2},
-        {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}
+        {"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": [4, 5], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 2], "x": 12, "y": 0},
+        {"matrix": [4, 1], "x": 13, "y": 0},
+        {"matrix": [4, 0], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [5, 5], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 3], "x": 11, "y": 1},
+        {"matrix": [5, 2], "x": 12, "y": 1},
+        {"matrix": [5, 1], "x": 13, "y": 1},
+        {"matrix": [5, 0], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [6, 5], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 3], "x": 11, "y": 2},
+        {"matrix": [6, 2], "x": 12, "y": 2},
+        {"matrix": [6, 1], "x": 13, "y": 2},
+        {"matrix": [6, 0], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+
+        {"matrix": [7, 6], "x": 8, "y": 3},
+        {"matrix": [7, 5], "x": 9, "y": 3},
+        {"matrix": [7, 4], "x": 10, "y": 3},
+        {"matrix": [7, 3], "x": 11, "y": 3},
+        {"matrix": [7, 2], "x": 12, "y": 3},
+        {"matrix": [7, 1], "x": 13, "y": 3},
+        {"matrix": [7, 0], "x": 14, "y": 3}
       ]
     }
   }
diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.h b/keyboards/helix/rev3_4rows/rev3_4rows.h
index dc1e2d5da4..f36a5f2840 100644
--- a/keyboards/helix/rev3_4rows/rev3_4rows.h
+++ b/keyboards/helix/rev3_4rows/rev3_4rows.h
@@ -20,28 +20,3 @@
 
 bool is_mac_mode(void);
 void set_mac_mode(bool macmode);
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-    { L20, L21, L22, L23, L24, L25, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { R05, R04, R03, R02, R01, R00, KC_NO }, \
-    { R15, R14, R13, R12, R11, R10, KC_NO }, \
-    { R25, R24, R23, R22, R21, R20, KC_NO }, \
-    { R35, R34, R33, R32, R31, R30, R36 }, \
- }
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index abd4f64ab1..5119235151 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -27,11 +27,79 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},                                 {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0},
-        {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1},                                 {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1},
-        {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2},                                 {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2},
-        {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3},
-        {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "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": [5, 5], "x": 9, "y": 0},
+        {"matrix": [5, 4], "x": 10, "y": 0},
+        {"matrix": [5, 3], "x": 11, "y": 0},
+        {"matrix": [5, 2], "x": 12, "y": 0},
+        {"matrix": [5, 1], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [6, 5], "x": 9, "y": 1},
+        {"matrix": [6, 4], "x": 10, "y": 1},
+        {"matrix": [6, 3], "x": 11, "y": 1},
+        {"matrix": [6, 2], "x": 12, "y": 1},
+        {"matrix": [6, 1], "x": 13, "y": 1},
+        {"matrix": [6, 0], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [7, 5], "x": 9, "y": 2},
+        {"matrix": [7, 4], "x": 10, "y": 2},
+        {"matrix": [7, 3], "x": 11, "y": 2},
+        {"matrix": [7, 2], "x": 12, "y": 2},
+        {"matrix": [7, 1], "x": 13, "y": 2},
+        {"matrix": [7, 0], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+
+        {"matrix": [8, 6], "x": 8, "y": 3},
+        {"matrix": [8, 5], "x": 9, "y": 3},
+        {"matrix": [8, 4], "x": 10, "y": 3},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 2], "x": 12, "y": 3},
+        {"matrix": [8, 1], "x": 13, "y": 3},
+        {"matrix": [8, 0], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+
+        {"matrix": [9, 6], "x": 8, "y": 4},
+        {"matrix": [9, 5], "x": 9, "y": 4},
+        {"matrix": [9, 4], "x": 10, "y": 4},
+        {"matrix": [9, 3], "x": 11, "y": 4},
+        {"matrix": [9, 2], "x": 12, "y": 4},
+        {"matrix": [9, 1], "x": 13, "y": 4},
+        {"matrix": [9, 0], "x": 14, "y": 4}
       ]
     }
   }
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 28fa314a7b..921558e80d 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev3_5rows.h"
+#include "quantum.h"
 
 bool is_mac_mode(void) {
     return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.h b/keyboards/helix/rev3_5rows/rev3_5rows.h
index 1e3121d713..f36a5f2840 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.h
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.h
@@ -20,31 +20,3 @@
 
 bool is_mac_mode(void);
 void set_mac_mode(bool macmode);
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
-  L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45  \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-    { L20, L21, L22, L23, L24, L25, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R05, R04, R03, R02, R01, R00, KC_NO }, \
-    { R15, R14, R13, R12, R11, R10, KC_NO }, \
-    { R25, R24, R23, R22, R21, R20, KC_NO }, \
-    { R35, R34, R33, R32, R31, R30, R36 }, \
-    { R45, R44, R43, R42, R41, R40, R46 } \
- }