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

2 files changed, 67 insertions, 83 deletions

diff --git a/keyboards/hhkb/ansi/ansi.h b/keyboards/hhkb/ansi/ansi.h
deleted file mode 100644
index 28e8d2fef8..0000000000
--- a/keyboards/hhkb/ansi/ansi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(                                                                \
-    K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \
-    K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52,      \
-    K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53,           \
-    K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54,           \
-         K35, K36,           K37,                K57, K56)                     \
-                                                                               \
-{                                                                              \
-    { K00, K01, K02, K03, K04, K05, K06, K07   },                              \
-    { K10, K11, K12, K13, K14, K15, K16, K17   },                              \
-    { K20, K21, K22, K23, K24, K25, K26, KC_NO },                              \
-    { K30, K31, K32, K33, K34, K35, K36, K37   },                              \
-    { K40, K41, K42, K43, K44, K45, K46, KC_NO },                              \
-    { K50, K51, K52, K53, K54, K55, K56, K57   },                              \
-    { K60, K61, K62, K63, K64, K65, K66, KC_NO },                              \
-    { K70, K71, K72, K73, K74, K75, K76, KC_NO }                               \
-}
-
-#define LAYOUT_60_hhkb LAYOUT
diff --git a/keyboards/hhkb/ansi/info.json b/keyboards/hhkb/ansi/info.json
index c892d2b14b..16349fc6e2 100644
--- a/keyboards/hhkb/ansi/info.json
+++ b/keyboards/hhkb/ansi/info.json
@@ -9,69 +9,76 @@
     "device_version": "1.0.4"
   },
   "community_layouts": ["60_hhkb"],
+  "layout_aliases": {
+    "LAYOUT_60_hhkb": "LAYOUT"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "!", "x": 1, "y": 0 },
-        { "label": "@", "x": 2, "y": 0 },
-        { "label": "#", "x": 3, "y": 0 },
-        { "label": "$", "x": 4, "y": 0 },
-        { "label": "%", "x": 5, "y": 0 },
-        { "label": "^", "x": 6, "y": 0 },
-        { "label": "&", "x": 7, "y": 0 },
-        { "label": "*", "x": 8, "y": 0 },
-        { "label": "(", "x": 9, "y": 0 },
-        { "label": ")", "x": 10, "y": 0 },
-        { "label": "_", "x": 11, "y": 0 },
-        { "label": "+", "x": 12, "y": 0 },
-        { "label": "|", "x": 13, "y": 0 },
-        { "label": "~", "x": 14, "y": 0 },
-        { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 1 },
-        { "label": "W", "x": 2.5, "y": 1 },
-        { "label": "E", "x": 3.5, "y": 1 },
-        { "label": "R", "x": 4.5, "y": 1 },
-        { "label": "T", "x": 5.5, "y": 1 },
-        { "label": "Y", "x": 6.5, "y": 1 },
-        { "label": "U", "x": 7.5, "y": 1 },
-        { "label": "I", "x": 8.5, "y": 1 },
-        { "label": "O", "x": 9.5, "y": 1 },
-        { "label": "P", "x": 10.5, "y": 1 },
-        { "label": "{", "x": 11.5, "y": 1 },
-        { "label": "}", "x": 12.5, "y": 1 },
-        { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 },
-        { "label": "Control", "x": 0, "y": 2, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 2 },
-        { "label": "S", "x": 2.75, "y": 2 },
-        { "label": "D", "x": 3.75, "y": 2 },
-        { "label": "F", "x": 4.75, "y": 2 },
-        { "label": "G", "x": 5.75, "y": 2 },
-        { "label": "H", "x": 6.75, "y": 2 },
-        { "label": "J", "x": 7.75, "y": 2 },
-        { "label": "K", "x": 8.75, "y": 2 },
-        { "label": "L", "x": 9.75, "y": 2 },
-        { "label": ":", "x": 10.75, "y": 2 },
-        { "label": "\"", "x": 11.75, "y": 2 },
-        { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 },
-        { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 3 },
-        { "label": "X", "x": 3.25, "y": 3 },
-        { "label": "C", "x": 4.25, "y": 3 },
-        { "label": "V", "x": 5.25, "y": 3 },
-        { "label": "B", "x": 6.25, "y": 3 },
-        { "label": "N", "x": 7.25, "y": 3 },
-        { "label": "M", "x": 8.25, "y": 3 },
-        { "label": "<", "x": 9.25, "y": 3 },
-        { "label": ">", "x": 10.25, "y": 3 },
-        { "label": "?", "x": 11.25, "y": 3 },
-        { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-        { "label": "Fn", "x": 14, "y": 3 },
-        { "label": "", "x": 1.5, "y": 4 },
-        { "label": "", "x": 2.5, "y": 4, "w": 1.5 },
-        { "x": 4, "y": 4, "w": 6 },
-        { "label": "", "x": 10, "y": 4, "w": 1.5 },
-        { "label": "", "x": 11.5, "y": 4 }
+        {"matrix": [3, 1], "x": 0, "y": 0},
+        {"matrix": [3, 0], "x": 1, "y": 0},
+        {"matrix": [0, 0], "x": 2, "y": 0},
+        {"matrix": [1, 0], "x": 3, "y": 0},
+        {"matrix": [1, 1], "x": 4, "y": 0},
+        {"matrix": [2, 0], "x": 5, "y": 0},
+        {"matrix": [2, 1], "x": 6, "y": 0},
+        {"matrix": [4, 0], "x": 7, "y": 0},
+        {"matrix": [4, 1], "x": 8, "y": 0},
+        {"matrix": [6, 0], "x": 9, "y": 0},
+        {"matrix": [6, 1], "x": 10, "y": 0},
+        {"matrix": [7, 0], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [5, 0], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+
+        {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 1},
+        {"matrix": [0, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 2], "x": 4.5, "y": 1},
+        {"matrix": [2, 3], "x": 5.5, "y": 1},
+        {"matrix": [2, 2], "x": 6.5, "y": 1},
+        {"matrix": [4, 2], "x": 7.5, "y": 1},
+        {"matrix": [4, 3], "x": 8.5, "y": 1},
+        {"matrix": [6, 2], "x": 9.5, "y": 1},
+        {"matrix": [6, 3], "x": 10.5, "y": 1},
+        {"matrix": [7, 3], "x": 11.5, "y": 1},
+        {"matrix": [7, 2], "x": 12.5, "y": 1},
+        {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [0, 4], "x": 1.75, "y": 2},
+        {"matrix": [0, 3], "x": 2.75, "y": 2},
+        {"matrix": [1, 4], "x": 3.75, "y": 2},
+        {"matrix": [1, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 4], "x": 5.75, "y": 2},
+        {"matrix": [2, 5], "x": 6.75, "y": 2},
+        {"matrix": [4, 5], "x": 7.75, "y": 2},
+        {"matrix": [4, 4], "x": 8.75, "y": 2},
+        {"matrix": [6, 5], "x": 9.75, "y": 2},
+        {"matrix": [6, 4], "x": 10.75, "y": 2},
+        {"matrix": [7, 4], "x": 11.75, "y": 2},
+        {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [0, 5], "x": 2.25, "y": 3},
+        {"matrix": [0, 6], "x": 3.25, "y": 3},
+        {"matrix": [0, 7], "x": 4.25, "y": 3},
+        {"matrix": [1, 6], "x": 5.25, "y": 3},
+        {"matrix": [1, 7], "x": 6.25, "y": 3},
+        {"matrix": [2, 6], "x": 7.25, "y": 3},
+        {"matrix": [4, 6], "x": 8.25, "y": 3},
+        {"matrix": [6, 6], "x": 9.25, "y": 3},
+        {"matrix": [7, 6], "x": 10.25, "y": 3},
+        {"matrix": [7, 5], "x": 11.25, "y": 3},
+        {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [5, 4], "x": 14, "y": 3},
+
+        {"matrix": [3, 5], "x": 1.5, "y": 4},
+        {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
+        {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
+        {"matrix": [5, 6], "x": 11.5, "y": 4}
       ]
     }
   }