Move miscellaneous layouts to data driven (#20516)

2 files changed, 64 insertions, 106 deletions

diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
deleted file mode 100644
index 673164b424..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This uses the same coordinate system as the program that defines
-// the case model, but not the same coordinates.
-// Numbers increase going to the right and away from the user on the
-// right-hand side of the keyboard. This is mirrored for the
-// left-hand side.
-// The matrix is constructed for ease of soldering, with the columns
-// of the thumb cluster extending along the sides of the finger
-// cluster so that everything can be contained in a 6x6 pattern.
-
-#define LAYOUT_62key( \
-    LA_20, LA_10, LF_35, LF_25, LF_15, LF_05, \
-    LF_55, LF_45, LF_34, LF_24, LF_14, LF_04, \
-    LF_54, LF_44, LF_33, LF_23, LF_13, LF_03, \
-    LF_53, LF_43, LF_32, LF_22, LF_12, \
-                         LF_21,        LT_21, LT_22, \
-                                    LT_10, LT_11, LT_12, \
-                                       LT_01, LT_02, \
-\
-           RF_05, RF_15, RF_25, RF_35, RA_10, RA_20, \
-           RF_04, RF_14, RF_24, RF_34, RF_45, RF_55, \
-           RF_03, RF_13, RF_23, RF_33, RF_44, RF_54, \
-                  RF_12, RF_22, RF_32, RF_43, RF_53, \
-       RT_22, RT_21,     RF_21, \
-    RT_12, RT_11, RT_10, \
-       RT_02, RT_01 \
-) { \
-    { LA_20, LA_10, LF_35, LF_25, LF_15, LF_05 }, \
-    { LF_55, LF_45, LF_34, LF_24, LF_14, LF_04 }, \
-    { LF_54, LF_44, LF_33, LF_23, LF_13, LF_03 }, \
-    { LF_53, LF_43, LF_32, LF_22, LF_12, LT_22 }, \
-    { KC_NO, KC_NO, LT_21, LF_21, LT_11, LT_12 }, \
-    { KC_NO, KC_NO, LT_10, KC_NO, LT_01, LT_02 }, \
-\
-    { RA_20, RA_10, RF_35, RF_25, RF_15, RF_05 }, \
-    { RF_55, RF_45, RF_34, RF_24, RF_14, RF_04 }, \
-    { RF_54, RF_44, RF_33, RF_23, RF_13, RF_03 }, \
-    { RF_53, RF_43, RF_32, RF_22, RF_12, RT_22 }, \
-    { KC_NO, KC_NO, RT_21, RF_21, RT_11, RT_12 }, \
-    { KC_NO, KC_NO, RT_10, KC_NO, RT_01, RT_02 } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index 4d50af4668..c2a818bde2 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -25,81 +25,83 @@
     "layouts": {
         "LAYOUT_62key": {
             "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},
+                {"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},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "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},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "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},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "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},
 
-                {"x": 3, "y": 4},
-                {"x": 4.5, "y": 4.5},
-                {"x": 5.5, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4},
 
-                {"x": 4, "y": 5.5},
-                {"x": 5, "y": 5.5},
-                {"x": 6, "y": 5.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.5},
 
-                {"x": 4.5, "y": 6.5},
-                {"x": 5.5, "y": 6.5},
+                {"matrix": [5, 2], "x": 4, "y": 5.5},
+                {"matrix": [4, 4], "x": 5, "y": 5.5},
+                {"matrix": [4, 5], "x": 6, "y": 5.5},
 
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 6.5},
+                {"matrix": [5, 5], "x": 5.5, "y": 6.5},
 
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 9, "y": 0},
+                {"matrix": [6, 4], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
 
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 9, "y": 1},
+                {"matrix": [7, 4], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 2], "x": 12, "y": 1},
+                {"matrix": [7, 1], "x": 13, "y": 1},
+                {"matrix": [7, 0], "x": 14, "y": 1},
 
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"matrix": [8, 5], "x": 9, "y": 2},
+                {"matrix": [8, 4], "x": 10, "y": 2},
+                {"matrix": [8, 3], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 1], "x": 13, "y": 2},
+                {"matrix": [8, 0], "x": 14, "y": 2},
 
-                {"x": 8.5, "y": 4.5},
-                {"x": 9.5, "y": 4.5},
-                {"x": 11, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 3},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [9, 2], "x": 12, "y": 3},
+                {"matrix": [9, 1], "x": 13, "y": 3},
+                {"matrix": [9, 0], "x": 14, "y": 3},
 
-                {"x": 8, "y": 5.5},
-                {"x": 9, "y": 5.5},
-                {"x": 10, "y": 5.5},
+                {"matrix": [9, 5], "x": 8.5, "y": 4.5},
+                {"matrix": [10, 2], "x": 9.5, "y": 4.5},
 
-                {"x": 8.5, "y": 6.5},
-                {"x": 9.5, "y": 6.5}
+                {"matrix": [10, 3], "x": 11, "y": 4},
+
+                {"matrix": [10, 5], "x": 8, "y": 5.5},
+                {"matrix": [10, 4], "x": 9, "y": 5.5},
+                {"matrix": [11, 2], "x": 10, "y": 5.5},
+
+                {"matrix": [11, 5], "x": 8.5, "y": 6.5},
+                {"matrix": [11, 4], "x": 9.5, "y": 6.5}
             ]
         }
     }