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

3 files changed, 88 insertions, 126 deletions

diff --git a/keyboards/handwired/hnah40rgb/hnah40rgb.c b/keyboards/handwired/hnah40rgb/hnah40rgb.c
index 2bf1373d91..1f877975e5 100644
--- a/keyboards/handwired/hnah40rgb/hnah40rgb.c
+++ b/keyboards/handwired/hnah40rgb/hnah40rgb.c
@@ -1,4 +1,4 @@
-#include "hnah40rgb.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 #if defined (ansi)
 led_config_t g_led_config = { {
diff --git a/keyboards/handwired/hnah40rgb/hnah40rgb.h b/keyboards/handwired/hnah40rgb/hnah40rgb.h
deleted file mode 100644
index 182c68603a..0000000000
--- a/keyboards/handwired/hnah40rgb/hnah40rgb.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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( \
-k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \
-k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, \
-k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33,\
-k34, k35, k36, k37, k38, k39, k40 \
-) \
-{ \
-    {k00, k01, k02, k03,  k04, k05,   k06, k07, k08, k09, k10}, \
-    {k11, k12, k13, k14,  k15, k16,   k17, k18, k19, k20, k21}, \
-    {k22, k23, k24, k25,  k26, k27,   k28, k29, k30, k31, k32}, \
-    {k33, k34, k35, KC_NO,k36, KC_NO, k37, k38, k39, k40, k41}, \
-}
-
-#define LAYOUT_ansi( \
-k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \
-k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, \
-k22, k23, k24, k25, k26, k27, k28, k29, k30, k32,\
-k33, k34, k35, k38, k39, k40 \
-) \
-{ \
-    {k00,   k01, k02, k03,   k04,   k05,   k06,   k07,   k08, k09,   k10}, \
-    {k11,   k12, k13, k14,   k15,   k16,   k17,   k18,   k19, k20,   k21}, \
-    {k22,   k23, k24, k25,   k26,   k27,   k28,   k29,   k30, KC_NO, k32}, \
-    {k33,   k34, k35, KC_NO, KC_NO, KC_NO, k38,   KC_NO, k39, k40,   k41}, \
-}
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json
index 3eb92ce1ef..f2e1925ee1 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -24,91 +24,97 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"Q", "x":1, "y":0}, 
-                {"label":"W", "x":2, "y":0}, 
-                {"label":"E", "x":3, "y":0}, 
-                {"label":"R", "x":4, "y":0}, 
-                {"label":"T", "x":5, "y":0}, 
-                {"label":"Y", "x":6, "y":0}, 
-                {"label":"U", "x":7, "y":0}, 
-                {"label":"I", "x":8, "y":0}, 
-                {"label":"O", "x":9, "y":0}, 
-                {"label":"P", "x":10, "y":0}, 
-                {"label":"BSPC", "x":11, "y":0}, 
-                {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, 
-                {"label":"A", "x":1.5, "y":1}, 
-                {"label":"S", "x":2.5, "y":1}, 
-                {"label":"D", "x":3.5, "y":1}, 
-                {"label":"F", "x":4.5, "y":1}, 
-                {"label":"G", "x":5.5, "y":1}, 
-                {"label":"H", "x":6.5, "y":1}, 
-                {"label":"J", "x":7.5, "y":1}, 
-                {"label":"K", "x":8.5, "y":1}, 
-                {"label":"L", "x":9.5, "y":1}, 
-                {"label":"Enter", "x":10.5, "y":1, "w":1.5}, 
-                {"label":"Shift", "x":0, "y":2, "w":1.75}, 
-                {"label":"Z", "x":1.75, "y":2}, 
-                {"label":"X", "x":2.75, "y":2}, 
-                {"label":"C", "x":3.75, "y":2}, 
-                {"label":"V", "x":4.75, "y":2}, 
-                {"label":"B", "x":5.75, "y":2}, 
-                {"label":"N", "x":6.75, "y":2}, 
-                {"label":"M", "x":7.75, "y":2}, 
-                {"label":",", "x":8.75, "y":2}, 
-                {"label":".", "x":9.75, "y":2}, 
-                {"label":"Shift", "x":10.75, "y":2, "w":1.25}, 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":3}, 
-                {"label":"Alt", "x":2.25, "y":3, "w":1.25}, 
-                {"label":"Space", "x":3.5, "y":3, "w":2.25}, 
-                {"label":"Space", "x":5.75, "y":3, "w":2.75},
-                {"label":"App", "x":8.5, "y":3, "w":1.25}, 
-                {"label":"Fn", "x":9.75, "y":3}, 
-                {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
+                {"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": [3, 10], "x": 11, "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, "w": 1.5},
+
+                {"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, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"Q", "x":1, "y":0}, 
-                {"label":"W", "x":2, "y":0}, 
-                {"label":"E", "x":3, "y":0}, 
-                {"label":"R", "x":4, "y":0}, 
-                {"label":"T", "x":5, "y":0}, 
-                {"label":"Y", "x":6, "y":0}, 
-                {"label":"U", "x":7, "y":0}, 
-                {"label":"I", "x":8, "y":0}, 
-                {"label":"O", "x":9, "y":0}, 
-                {"label":"P", "x":10, "y":0}, 
-                {"label":"BSPC", "x":11, "y":0}, 
-                {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, 
-                {"label":"A", "x":1.5, "y":1}, 
-                {"label":"S", "x":2.5, "y":1}, 
-                {"label":"D", "x":3.5, "y":1}, 
-                {"label":"F", "x":4.5, "y":1}, 
-                {"label":"G", "x":5.5, "y":1}, 
-                {"label":"H", "x":6.5, "y":1}, 
-                {"label":"J", "x":7.5, "y":1}, 
-                {"label":"K", "x":8.5, "y":1}, 
-                {"label":"L", "x":9.5, "y":1}, 
-                {"label":"Enter", "x":10.5, "y":1, "w":1.5}, 
-                {"label":"Shift", "x":0, "y":2, "w":1.75}, 
-                {"label":"Z", "x":1.75, "y":2}, 
-                {"label":"X", "x":2.75, "y":2}, 
-                {"label":"C", "x":3.75, "y":2}, 
-                {"label":"V", "x":4.75, "y":2}, 
-                {"label":"B", "x":5.75, "y":2}, 
-                {"label":"N", "x":6.75, "y":2}, 
-                {"label":"M", "x":7.75, "y":2}, 
-                {"label":",", "x":8.75, "y":2}, 
-                {"label":"Shift", "x":9.75, "y":2, "w":2.25}, 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":3}, 
-                {"label":"Alt", "x":2.25, "y":3, "w":1.25}, 
-                {"label":"Space", "x":3.5, "y":3, "w":6}, 
-                {"label":"App", "x":9.5, "y":3, "w":1.25}, 
-                {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
+                {"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": [3, 10], "x": 11, "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, "w": 1.5},
+
+                {"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, 10], "x": 9.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6},
+                {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
             ]
         }
     }