Move miscellaneous layouts to data driven (#20516)

2 files changed, 74 insertions, 111 deletions

diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
deleted file mode 100644
index 7cd2597a1f..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/5x7.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_5x7( \
-    L11, L12, L13, L14, L15, L16, L17, \
-    L21, L22, L23, L24, L25, L26, L27, \
-    L31, L32, L33, L34, L35, L36, L37, \
-    L41, L42, L43, L44, L45, L46, \
-    L51, L52, L53, L54, \
-                        L55, L56, \
-                                  L65, L66, \
-                                  L63, L64, \
-         R11, R12, R13, R14, R15, R16, R17, \
-         R21, R22, R23, R24, R25, R26, R27, \
-         R31, R32, R33, R34, R35, R36, R37, \
-              R42, R43, R44, R45, R46, R47, \
-                        R54, R55, R56, R57, \
-              R52, R53, \
-    R62, R63, \
-    R64, R65 \
-) { \
-    { L11, L12, L13, L14, L15, L16, L17 }, \
-    { L21, L22, L23, L24, L25, L26, L27 }, \
-    { L31, L32, L33, L34, L35, L36, L37 }, \
-    { L41, L42, L43, L44, L45, L46, XXX }, \
-    { L51, L52, L53, L54, L55, L56, XXX }, \
-    { XXX, XXX, L63, L64, L65, L66, XXX }, \
-    { R11, R12, R13, R14, R15, R16, R17 }, \
-    { R21, R22, R23, R24, R25, R26, R27 }, \
-    { R31, R32, R33, R34, R35, R36, R37 }, \
-    { XXX, R42, R43, R44, R45, R46, R47 }, \
-    { XXX, R52, R53, R54, R55, R56, R57 }, \
-    { XXX, R62, R63, R64, R65, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
index e5c3b5af86..b166df22a0 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -24,95 +24,95 @@
     "layouts": {
         "LAYOUT_5x7": {
             "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": 6, "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},
 
-                {"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": 6, "y": 1},
+                {"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": [1, 6], "x": 6, "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": 6, "y": 2},
+                {"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": [2, 6], "x": 6, "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},
+                {"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},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
+                {"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},
 
-                {"x": 4, "y": 5},
-                {"x": 5, "y": 5},
+                {"matrix": [4, 4], "x": 4, "y": 5},
+                {"matrix": [4, 5], "x": 5, "y": 5},
 
-                {"x": 6, "y": 6},
-                {"x": 7, "y": 6},
+                {"matrix": [5, 4], "x": 6, "y": 6},
+                {"matrix": [5, 5], "x": 7, "y": 6},
 
-                {"x": 6, "y": 7},
-                {"x": 7, "y": 7},
+                {"matrix": [5, 2], "x": 6, "y": 7},
+                {"matrix": [5, 3], "x": 7, "y": 7},
 
-                {"x": 10, "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},
+                {"matrix": [6, 0], "x": 10, "y": 0},
+                {"matrix": [6, 1], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 6], "x": 16, "y": 0},
 
-                {"x": 10, "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},
+                {"matrix": [7, 0], "x": 10, "y": 1},
+                {"matrix": [7, 1], "x": 11, "y": 1},
+                {"matrix": [7, 2], "x": 12, "y": 1},
+                {"matrix": [7, 3], "x": 13, "y": 1},
+                {"matrix": [7, 4], "x": 14, "y": 1},
+                {"matrix": [7, 5], "x": 15, "y": 1},
+                {"matrix": [7, 6], "x": 16, "y": 1},
 
-                {"x": 10, "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},
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 6], "x": 16, "y": 2},
 
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
+                {"matrix": [9, 1], "x": 11, "y": 3},
+                {"matrix": [9, 2], "x": 12, "y": 3},
+                {"matrix": [9, 3], "x": 13, "y": 3},
+                {"matrix": [9, 4], "x": 14, "y": 3},
+                {"matrix": [9, 5], "x": 15, "y": 3},
+                {"matrix": [9, 6], "x": 16, "y": 3},
 
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
+                {"matrix": [10, 3], "x": 13, "y": 4},
+                {"matrix": [10, 4], "x": 14, "y": 4},
+                {"matrix": [10, 5], "x": 15, "y": 4},
+                {"matrix": [10, 6], "x": 16, "y": 4},
 
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
+                {"matrix": [10, 1], "x": 11, "y": 5},
+                {"matrix": [10, 2], "x": 12, "y": 5},
 
-                {"x": 9, "y": 6},
-                {"x": 10, "y": 6},
+                {"matrix": [11, 1], "x": 9, "y": 6},
+                {"matrix": [11, 2], "x": 10, "y": 6},
 
-                {"x":9, "y":7},
-                {"x":10, "y":7}
+                {"matrix": [11, 3], "x": 9, "y": 7},
+                {"matrix": [11, 4], "x": 10, "y": 7}
             ]
         }
     }