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

2 files changed, 53 insertions, 47 deletions

diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h b/keyboards/handwired/hacked_motospeed/hacked_motospeed.h
deleted file mode 100644
index 1063fd2e62..0000000000
--- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2019 Vladislav Opara <Deckweiss75@gmail.com>
- *
- * 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"
-
-/* This 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( \
-    EWR, DWR, CWR, BWR, AWR, FXR,   FYL, AZL, BZL, CZL, DZL,        \
-         DXR, CXR, BXR, AXR, FZR,   DVL, AYL, BYL, CYL, DYL, EZL,   \
-    EZR, DYR, CYR, BYR, AYR, DVR,   FZL, AXL, BXL, CXL, DXL,        \
-         DZR, CZR, BZR, AZR, FYR,   FXL, AWL, BWL, CWL, DWL, EWL    \
-) \
-{ \
-    { EWR,   DWR,   CWR,   BWR,   AWR,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, DXR,   CXR,   BXR,   AXR,   FXR,     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, DYR,   CYR,   BYR,   AYR,   FYR,     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { EZR,   DZR,   CZR,   AZR,   BZR,   FZR,     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, DVR,   KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-                                                                                              \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   FZL,   BZL,   AZL,   CZL,   DZL,   EZL   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   FYL,   AYL,   BYL,   CYL,   DYL,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   FXL,   AXL,   BXL,   CXL,   DXL,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, AWL,   BWL,   CWL,   DWL,   EWL   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, DVL,   KC_NO }  \
-}
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json
index c64931a74b..86736773ec 100644
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ b/keyboards/handwired/hacked_motospeed/info.json
@@ -20,7 +20,59 @@
   "bootloader": "halfkay",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"ESC", "x":0, "y":0, "h":2}, {"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":"Z", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0, "w":2}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":"(", "x":11, "y":1}, {"label":")", "x":12, "y":1}, {"label":"=", "x":0, "y":2}, {"label":"Y", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"Fn", "x":0, "y":3, "w":2}, {"label":"Num", "x":2, "y":3}, {"label":"Bksp", "x":3, "y":3}, {"label":"Enter", "x":4, "y":3}, {"label":"Spc", "x":5, "y":3}, {"label":"LShift", "x":7, "y":3}, {"label":"LCtrl", "x":8, "y":3}, {"label":"LAlt", "x":9, "y":3}, {"label":"RAlt", "x":10, "y":3}, {"label":"Meta", "x":11, "y":3}, {"label":"Fn", "x":12, "y":2, "h":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
+        {"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": [1, 5], "x": 5, "y": 0},
+
+        {"matrix": [6, 6], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 7], "x": 9, "y": 0},
+        {"matrix": [5, 9], "x": 10, "y": 0},
+        {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
+
+        {"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": [3, 5], "x": 5, "y": 1},
+
+        {"matrix": [9, 10], "x": 7, "y": 1},
+        {"matrix": [6, 7], "x": 8, "y": 1},
+        {"matrix": [6, 8], "x": 9, "y": 1},
+        {"matrix": [6, 9], "x": 10, "y": 1},
+        {"matrix": [6, 10], "x": 11, "y": 1},
+        {"matrix": [5, 11], "x": 12, "y": 1},
+
+        {"matrix": [3, 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": [4, 1], "x": 5, "y": 2},
+
+        {"matrix": [5, 6], "x": 7, "y": 2},
+        {"matrix": [7, 7], "x": 8, "y": 2},
+        {"matrix": [7, 8], "x": 9, "y": 2},
+        {"matrix": [7, 9], "x": 10, "y": 2},
+        {"matrix": [7, 10], "x": 11, "y": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 4], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3},
+        {"matrix": [2, 5], "x": 5, "y": 3},
+
+        {"matrix": [7, 6], "x": 7, "y": 3},
+        {"matrix": [8, 7], "x": 8, "y": 3},
+        {"matrix": [8, 8], "x": 9, "y": 3},
+        {"matrix": [8, 9], "x": 10, "y": 3},
+        {"matrix": [8, 10], "x": 11, "y": 3},
+        {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
+      ]
     }
   }
 }