Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 90 insertions, 129 deletions

diff --git a/keyboards/cannonkeys/hoodrowg/hoodrowg.h b/keyboards/cannonkeys/hoodrowg/hoodrowg.h
deleted file mode 100644
index 6337699bf5..0000000000
--- a/keyboards/cannonkeys/hoodrowg/hoodrowg.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 CannonKeys LLC
-
-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_all( \
-	K0100,        K0101, K0001, K0102, K0002, K0103, K0003, K0104, K0004, K0105, K0005, K0106, K0006, K0107, K0007, K0108, \
-    K0300, K0200, K0301, K0201, K0302, K0202, K0303, K0203, K0304, K0204, K0305, K0205, K0306, K0206, K0307, K0207, K0308, \
-    K0500, K0400, K0501, K0401, K0502, K0402, K0503, K0403, K0504, K0404, K0505, K0405, K0506, K0406, K0507, K0407, K0508, \
-    K0700, K0600, K0701, K0601, K0702, K0602, K0703, K0603, K0704, K0604, K0705, K0605, K0706, K0606,                      \
-    K0900, K0800, K0901, K0801, K0902, K0802, K0903, K0803, K0904, K0804, K0905, K0805,        K0806,        K0807,        \
-    K1100, K1000, K1101,                      K1103,                      K1105,        K1106, K1006, K1107, K1007, K1108  \
-) { \
-	{ KC_NO, K0001, K0002, K0003, K0004, K0005, K0006, K0007, KC_NO }, \
-	{ K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108 }, \
-    { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, KC_NO }, \
-	{ K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308 }, \
-    { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, KC_NO }, \
-	{ K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508 }, \
-	{ K0600, K0601, K0602, K0603, K0604, K0605, K0606, KC_NO, KC_NO }, \
-	{ K0700, K0701, K0702, K0703, K0704, K0705, K0706, KC_NO, KC_NO }, \
-	{ K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, KC_NO }, \
-	{ K0900, K0901, K0902, K0903, K0904, K0905, KC_NO, KC_NO, KC_NO }, \
-	{ K1000, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1006, K1007, KC_NO }, \
-	{ K1100, K1101, KC_NO, K1103, KC_NO, K1105, K1106, K1107, K1108 } \
-}
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 6a3846465d..aea9b4f981 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -25,105 +25,107 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 0},
 
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 6], "x": 14, "y": 0},
 
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 7], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
 
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 1], "x": 2, "y": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 1.5},
+                {"matrix": [3, 2], "x": 4, "y": 1.5},
+                {"matrix": [2, 2], "x": 5, "y": 1.5},
+                {"matrix": [3, 3], "x": 6, "y": 1.5},
+                {"matrix": [2, 3], "x": 7, "y": 1.5},
+                {"matrix": [3, 4], "x": 8, "y": 1.5},
+                {"matrix": [2, 4], "x": 9, "y": 1.5},
+                {"matrix": [3, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 5], "x": 11, "y": 1.5},
+                {"matrix": [3, 6], "x": 12, "y": 1.5},
+                {"matrix": [2, 6], "x": 13, "y": 1.5, "w": 2},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.5},
 
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"x": 0, "y": 4.5, "w": 1.25},
-                {"x": 1.25, "y": 4.5},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [5, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.5},
 
-                {"x": 16.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [6, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},
 
-                {"x": 0, "y": 5.5, "w": 1.5},
-                {"x": 1.5, "y": 5.5},
-                {"x": 2.5, "y": 5.5, "w": 1.5},
-                {"x": 4, "y": 5.5, "w": 7},
-                {"x": 11, "y": 5.5, "w": 1.5},
-                {"x": 12.5, "y": 5.5},
-                {"x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [8, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [11, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 0], "x": 1.5, "y": 5.5},
+                {"matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.5},
+                {"matrix": [10, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.5}
             ]
         }
     }