Move miscellaneous layouts to data driven (#20516)

2 files changed, 97 insertions, 134 deletions

diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
deleted file mode 100644
index 74cb474a5b..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2021 Dmitriy Kuminov (@dmik)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_6x6_4( \
-    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
-    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
-    L50, L51, L52, L53,                                              R52, R53, R54, R55, \
-                        L54, L55,                          R50, R51, \
-                                  L64, L65,      R60, R61, \
-                                  L62, L63,      R62, R63 \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45 }, \
-    { L50, L51, L52, L53, L54, L55 }, \
-    { XXX, XXX, L62, L63, L64, L65 }, \
-\
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45 }, \
-    { R50, R51, R52, R53, R54, R55 }, \
-    { R60, R61, R62, R63, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
index 2d5dbd2351..567057cf08 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -24,103 +24,103 @@
     "layouts": {
         "LAYOUT_6x6_4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-
-                {"x": 0, "y": 5},
-                {"x": 1, "y": 5},
-                {"x": 2, "y": 5},
-                {"x": 3, "y": 5},
-
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5},
-                {"x": 16, "y": 5},
-
-                {"x": 4, "y": 6},
-                {"x": 5, "y": 6},
-
-                {"x": 11, "y": 6},
-                {"x": 12, "y": 6},
-
-                {"x": 6, "y": 7},
-                {"x": 7, "y": 7},
-
-                {"x": 9, "y": 7},
-                {"x": 10, "y": 7},
-
-                {"x": 6, "y": 8},
-                {"x": 7, "y": 8},
-
-                {"x": 9, "y": 8},
-                {"x": 10, "y": 8}
+                {"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": [7, 0], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [7, 3], "x": 14, "y": 0},
+                {"matrix": [7, 4], "x": 15, "y": 0},
+                {"matrix": [7, 5], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"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": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [8, 0], "x": 11, "y": 1},
+                {"matrix": [8, 1], "x": 12, "y": 1},
+                {"matrix": [8, 2], "x": 13, "y": 1},
+                {"matrix": [8, 3], "x": 14, "y": 1},
+                {"matrix": [8, 4], "x": 15, "y": 1},
+                {"matrix": [8, 5], "x": 16, "y": 1},
+
+                {"matrix": [2, 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": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [9, 0], "x": 11, "y": 2},
+                {"matrix": [9, 1], "x": 12, "y": 2},
+                {"matrix": [9, 2], "x": 13, "y": 2},
+                {"matrix": [9, 3], "x": 14, "y": 2},
+                {"matrix": [9, 4], "x": 15, "y": 2},
+                {"matrix": [9, 5], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [10, 0], "x": 11, "y": 3},
+                {"matrix": [10, 1], "x": 12, "y": 3},
+                {"matrix": [10, 2], "x": 13, "y": 3},
+                {"matrix": [10, 3], "x": 14, "y": 3},
+                {"matrix": [10, 4], "x": 15, "y": 3},
+                {"matrix": [10, 5], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [11, 0], "x": 11, "y": 4},
+                {"matrix": [11, 1], "x": 12, "y": 4},
+                {"matrix": [11, 2], "x": 13, "y": 4},
+                {"matrix": [11, 3], "x": 14, "y": 4},
+                {"matrix": [11, 4], "x": 15, "y": 4},
+                {"matrix": [11, 5], "x": 16, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+
+                {"matrix": [12, 2], "x": 13, "y": 5},
+                {"matrix": [12, 3], "x": 14, "y": 5},
+                {"matrix": [12, 4], "x": 15, "y": 5},
+                {"matrix": [12, 5], "x": 16, "y": 5},
+
+                {"matrix": [5, 4], "x": 4, "y": 6},
+                {"matrix": [5, 5], "x": 5, "y": 6},
+
+                {"matrix": [12, 0], "x": 11, "y": 6},
+                {"matrix": [12, 1], "x": 12, "y": 6},
+
+                {"matrix": [6, 4], "x": 6, "y": 7},
+                {"matrix": [6, 5], "x": 7, "y": 7},
+
+                {"matrix": [13, 0], "x": 9, "y": 7},
+                {"matrix": [13, 1], "x": 10, "y": 7},
+
+                {"matrix": [6, 2], "x": 6, "y": 8},
+                {"matrix": [6, 3], "x": 7, "y": 8},
+
+                {"matrix": [13, 2], "x": 9, "y": 8},
+                {"matrix": [13, 3], "x": 10, "y": 8}
             ]
         }
     }