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

2 files changed, 54 insertions, 88 deletions

diff --git a/keyboards/huytbt/h50/h50.h b/keyboards/huytbt/h50/h50.h
deleted file mode 100644
index 9d710de915..0000000000
--- a/keyboards/huytbt/h50/h50.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Huy Ta (@huytbt)
- *
- * 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 XXX KC_NO
-
-/* h50 keymap definition macro
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
-    k30, k31, k32, k33,      k35,      k37,      k39, k3A, k3B, k3C, k3D \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-    { k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3A, k3B, k3C, k3D } \
-}
diff --git a/keyboards/huytbt/h50/info.json b/keyboards/huytbt/h50/info.json
index 052c5a0b20..4a7e60d387 100644
--- a/keyboards/huytbt/h50/info.json
+++ b/keyboards/huytbt/h50/info.json
@@ -21,62 +21,63 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "Tab", "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": "[", "x": 11, "y": 0 },
-        { "label": "]", "x": 12, "y": 0 },
-        { "label": "Back<br>Space", "x": 13, "y": 0 },
+        {"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},
 
-        { "label": "Caps", "x": 0, "y": 1, "w": 1.25 },
-        { "label": "A", "x": 1.25, "y": 1 },
-        { "label": "S", "x": 2.25, "y": 1 },
-        { "label": "D", "x": 3.25, "y": 1 },
-        { "label": "F", "x": 4.25, "y": 1 },
-        { "label": "G", "x": 5.25, "y": 1 },
-        { "label": "H", "x": 6.25, "y": 1 },
-        { "label": "J", "x": 7.25, "y": 1 },
-        { "label": "K", "x": 8.25, "y": 1 },
-        { "label": "L", "x": 9.25, "y": 1 },
-        { "label": ";", "x": 10.25, "y": 1 },
-        { "label": "'", "x": 11.25, "y": 1 },
-        { "label": "Enter", "x": 12.25, "y": 1, "w": 1.75 },
-        { "label": "PGUP", "x": 14, "y": 1 },
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1},
+        {"matrix": [1, 12], "x": 12.25, "y": 1, "w": 1.75},
+        {"matrix": [1, 13], "x": 14, "y": 1},
 
-        { "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": "/", "x": 10.75, "y": 2 },
-        { "label": "Shift", "x": 11.75, "y": 2, "w": 1.25 },
-        { "label": "Up", "x": 13, "y": 2 },
-        { "label": "PGDN", "x": 14, "y": 2 },
+        {"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, "w": 1.25},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2},
 
-        { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
-        { "label": "Alt", "x": 1.25, "y": 3, "w": 1.25 },
-        { "label": "Super", "x": 2.5, "y": 3, "w": 1.25 },
-        { "x": 3.75, "y": 3, "w": 1.75 },
-        { "x": 5.5, "y": 3, "w": 1.75 },
-        { "label": "Fn1", "x": 7.25, "y": 3, "w": 1.75 },
-        { "label": "Fn2", "x": 9, "y": 3, "w": 1.25 },
-        { "label": "Fn3", "x": 10.25, "y": 3, "w": 1.25 },
-        { "label": "Left", "x": 12, "y": 3 },
-        { "label": "Down", "x": 13, "y": 3 },
-        { "label": "Right", "x": 14, "y": 3 }
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75},
+        {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 9], "x": 9, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 10.25, "y": 3, "w": 1.25},
+
+        {"matrix": [3, 11], "x": 12, "y": 3},
+        {"matrix": [3, 12], "x": 13, "y": 3},
+        {"matrix": [3, 13], "x": 14, "y": 3}
       ]
     }
   }