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

2 files changed, 131 insertions, 181 deletions

diff --git a/keyboards/handwired/dqz11n1g/dqz11n1g.h b/keyboards/handwired/dqz11n1g/dqz11n1g.h
deleted file mode 100644
index f5c55bd6d5..0000000000
--- a/keyboards/handwired/dqz11n1g/dqz11n1g.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2022 David Kuehling <dvdkhlng TA posteo TOD de>
- *
- * 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"
-
-#define XXX KC_NO
-
-/* Fill actually existing keys into the 7x19 keyboard matrix */
-#define LAYOUT(                                                \
-    k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k0A, k0B, k0C,   k0D, k0E, k0F, k0G, k0H, k0J, \
-    k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19, k1A, k1B, k1C,   k1D, k1E, k1F, k1G, k1H, k1J, \
-    k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29, k2A, k2B, k2C,   k2D, k2E, k2F, k2G, k2H, k2J, \
-    k30, k31, k32, k33, k34, k35,   k36, k37, k38, k39, k3A, k3B, k3C,   k3D, k3E, k3F, k3G, k3H, k3J, \
-    k40, k41, k42, k43, k44, k45,                                        k4D, k4E, k4F, k4G, k4H, k4J, \
-         k51, k52, k53, k54,                                                  k5E, k5F, k5G, k5H, \
-                                    k46, k47, k48,      k4A, k4B, k4C,  \
-                                    k56, k57, k58,      k5A, k5B, k5C,  \
-                                              k68,      k6A             \
-) {                                                                     \
-   /* left hand */                      /* middle/thumb block */                      /* right hand */ \
-    { k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k0A, k0B, k0C,   k0D, k0E, k0F, k0G, k0H, k0J }, \
-    { k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19, k1A, k1B, k1C,   k1D, k1E, k1F, k1G, k1H, k1J }, \
-    { k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29, k2A, k2B, k2C,   k2D, k2E, k2F, k2G, k2H, k2J }, \
-    { k30, k31, k32, k33, k34, k35,   k36, k37, k38, k39, k3A, k3B, k3C,   k3D, k3E, k3F, k3G, k3H, k3J }, \
-    { k40, k41, k42, k43, k44, k45,   k46, k47, k48, XXX, k4A, k4B, k4C,   k4D, k4E, k4F, k4G, k4H, k4J }, \
-    { XXX, k51, k52, k53, k54, XXX,   k56, k57, k58, XXX, k5A, k5B, k5C,   XXX, k5E, k5F, k5G, k5H, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX,   XXX, XXX, k68, XXX, k6A, XXX, XXX,   XXX, XXX, XXX, XXX, XXX, XXX }, \
-}
-
-/*
- * Local Variables:
- * c-basic-offset:4
- * fill-column: 76
- * End:
- */
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json
index c72310a1e8..4df4185010 100644
--- a/keyboards/handwired/dqz11n1g/info.json
+++ b/keyboards/handwired/dqz11n1g/info.json
@@ -18,136 +18,137 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0] },
-                {"x": 1, "y": 0, "matrix": [0, 1] },
-                {"x": 2, "y": 0, "matrix": [0, 2] },
-                {"x": 3, "y": 0, "matrix": [0, 3] },
-                {"x": 4, "y": 0, "matrix": [0, 4] },
-                {"x": 5, "y": 0, "matrix": [0, 5] },
-
-                {"x": 7, "y": 0, "matrix": [0, 6] },
-                {"x": 8, "y": 0, "matrix": [0, 7] },
-                {"x": 9, "y": 0, "matrix": [0, 8] },
-                {"x": 10, "y": 0, "matrix": [0, 9] },
-                {"x": 11, "y": 0, "matrix": [0, 10] },
-                {"x": 12, "y": 0, "matrix": [0, 11] },
-                {"x": 13, "y": 0, "matrix": [0, 12] },
-
-                {"x": 15, "y": 0, "matrix": [0, 13] },
-                {"x": 16, "y": 0, "matrix": [0, 14] },
-                {"x": 17, "y": 0, "matrix": [0, 15] },
-                {"x": 18, "y": 0, "matrix": [0, 16] },
-                {"x": 19, "y": 0, "matrix": [0, 17] },
-                {"x": 20, "y": 0, "matrix": [0, 18] },
-
-                {"x": 0, "y": 1, "matrix": [1, 0] },
-                {"x": 1, "y": 1, "matrix": [1, 1] },
-                {"x": 2, "y": 1, "matrix": [1, 2] },
-                {"x": 3, "y": 1, "matrix": [1, 3] },
-                {"x": 4, "y": 1, "matrix": [1, 4] },
-                {"x": 5, "y": 1, "matrix": [1, 5] },
-
-                {"x": 7, "y": 1, "matrix": [1, 6] },
-                {"x": 8, "y": 1, "matrix": [1, 7] },
-                {"x": 9, "y": 1, "matrix": [1, 8] },
-                {"x": 10, "y": 1, "matrix": [1, 9] },
-                {"x": 11, "y": 1, "matrix": [1, 10] },
-                {"x": 12, "y": 1, "matrix": [1, 11] },
-                {"x": 13, "y": 1, "matrix": [1, 12] },
-
-                {"x": 15, "y": 1, "matrix": [1, 13] },
-                {"x": 16, "y": 1, "matrix": [1, 14] },
-                {"x": 17, "y": 1, "matrix": [1, 15] },
-                {"x": 18, "y": 1, "matrix": [1, 16] },
-                {"x": 19, "y": 1, "matrix": [1, 17] },
-                {"x": 20, "y": 1, "matrix": [1, 18] },
-
-                {"x": 0, "y": 2, "matrix": [2, 0] },
-                {"x": 1, "y": 2, "matrix": [2, 1] },
-                {"x": 2, "y": 2, "matrix": [2, 2] },
-                {"x": 3, "y": 2, "matrix": [2, 3] },
-                {"x": 4, "y": 2, "matrix": [2, 4] },
-                {"x": 5, "y": 2, "matrix": [2, 5] },
-
-                {"x": 7, "y": 2, "matrix": [2, 6] },
-                {"x": 8, "y": 2, "matrix": [2, 7] },
-                {"x": 9, "y": 2, "matrix": [2, 8] },
-                {"x": 10, "y": 2, "matrix": [2, 9] },
-                {"x": 11, "y": 2, "matrix": [2, 10] },
-                {"x": 12, "y": 2, "matrix": [2, 11] },
-                {"x": 13, "y": 2, "matrix": [2, 12] },
-
-                {"x": 15, "y": 2, "matrix": [2, 13] },
-                {"x": 16, "y": 2, "matrix": [2, 14] },
-                {"x": 17, "y": 2, "matrix": [2, 15] },
-                {"x": 18, "y": 2, "matrix": [2, 16] },
-                {"x": 19, "y": 2, "matrix": [2, 17] },
-                {"x": 20, "y": 2, "matrix": [2, 18] },
-
-                {"x": 0, "y": 3, "matrix": [3, 0] },
-                {"x": 1, "y": 3, "matrix": [3, 1] },
-                {"x": 2, "y": 3, "matrix": [3, 2] },
-                {"x": 3, "y": 3, "matrix": [3, 3] },
-                {"x": 4, "y": 3, "matrix": [3, 4] },
-                {"x": 5, "y": 3, "matrix": [3, 5] },
-
-                {"x": 7, "y": 3, "matrix": [3, 6] },
-                {"x": 8, "y": 3, "matrix": [3, 7] },
-                {"x": 9, "y": 3, "matrix": [3, 8] },
-                {"x": 10, "y": 3, "matrix": [3, 9] },
-                {"x": 11, "y": 3, "matrix": [3, 10] },
-                {"x": 12, "y": 3, "matrix": [3, 11] },
-                {"x": 13, "y": 3, "matrix": [3, 12] },
-
-                {"x": 15, "y": 3, "matrix": [3, 13] },
-                {"x": 16, "y": 3, "matrix": [3, 14] },
-                {"x": 17, "y": 3, "matrix": [3, 15] },
-                {"x": 18, "y": 3, "matrix": [3, 16] },
-                {"x": 19, "y": 3, "matrix": [3, 17] },
-                {"x": 20, "y": 3, "matrix": [3, 18] },
-
-                {"x": 0, "y": 4, "h": 2, "matrix": [4, 0] },
-                {"x": 1, "y": 4, "matrix": [4, 1] },
-                {"x": 2, "y": 4, "matrix": [4, 2] },
-                {"x": 3, "y": 4, "matrix": [4, 3] },
-                {"x": 4, "y": 4, "matrix": [4, 4] },
-                {"x": 5, "y": 4, "matrix": [4, 5] },
-
-                {"x": 15, "y": 4, "matrix": [4, 13] },
-                {"x": 16, "y": 4, "matrix": [4, 14] },
-                {"x": 17, "y": 4, "matrix": [4, 15] },
-                {"x": 18, "y": 4, "matrix": [4, 16] },
-                {"x": 19, "y": 4, "matrix": [4, 17] },
-                {"x": 20, "y": 4, "h": 2, "matrix": [4, 18] },
-
-                {"x": 1, "y": 5, "matrix": [5, 1] },
-                {"x": 2, "y": 5, "matrix": [5, 2] },
-                {"x": 3, "y": 5, "matrix": [5, 3] },
-                {"x": 4, "y": 5, "matrix": [5, 4] },
-
-                {"x": 16, "y": 5, "matrix": [5, 14] },
-                {"x": 17, "y": 5, "matrix": [5, 15] },
-                {"x": 18, "y": 5, "matrix": [5, 16] },
-                {"x": 19, "y": 5, "matrix": [5, 17] },
-
-                {"x": 5, "y": 7, "matrix": [4, 6] },
-                {"x": 6, "y": 7, "matrix": [4, 7] },
-                {"x": 7, "y": 7, "matrix": [4, 8] },
-
-                {"x": 13, "y": 7, "matrix": [4, 10] },
-                {"x": 14, "y": 7, "matrix": [4, 11] },
-                {"x": 15, "y": 7, "matrix": [4, 12] },
-
-                {"x": 5, "y": 8, "h": 2, "matrix": [5, 6] },
-                {"x": 6, "y": 8, "h": 2, "matrix": [5, 7] },
-                {"x": 7, "y": 8, "matrix": [5, 8] },
-
-                {"x": 13, "y": 8, "matrix": [5, 10] },
-                {"x": 14, "y": 8, "h": 2, "matrix": [5, 11] },
-                {"x": 15, "y": 8, "h": 2, "matrix": [5, 12] },
-
-                {"x": 7, "y": 9, "matrix": [6, 8] },
-                {"x": 13, "y": 9, "matrix": [6, 10] }
+                {"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": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+                {"matrix": [0, 15], "x": 17, "y": 0},
+                {"matrix": [0, 16], "x": 18, "y": 0},
+                {"matrix": [0, 17], "x": 19, "y": 0},
+                {"matrix": [0, 18], "x": 20, "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": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+
+                {"matrix": [1, 13], "x": 15, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1},
+                {"matrix": [1, 15], "x": 17, "y": 1},
+                {"matrix": [1, 16], "x": 18, "y": 1},
+                {"matrix": [1, 17], "x": 19, "y": 1},
+                {"matrix": [1, 18], "x": 20, "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": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+
+                {"matrix": [2, 13], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2},
+                {"matrix": [2, 15], "x": 17, "y": 2},
+                {"matrix": [2, 16], "x": 18, "y": 2},
+                {"matrix": [2, 17], "x": 19, "y": 2},
+                {"matrix": [2, 18], "x": 20, "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": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+
+                {"matrix": [3, 13], "x": 15, "y": 3},
+                {"matrix": [3, 14], "x": 16, "y": 3},
+                {"matrix": [3, 15], "x": 17, "y": 3},
+                {"matrix": [3, 16], "x": 18, "y": 3},
+                {"matrix": [3, 17], "x": 19, "y": 3},
+                {"matrix": [3, 18], "x": 20, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
+                {"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": [4, 13], "x": 15, "y": 4},
+                {"matrix": [4, 14], "x": 16, "y": 4},
+                {"matrix": [4, 15], "x": 17, "y": 4},
+                {"matrix": [4, 16], "x": 18, "y": 4},
+                {"matrix": [4, 17], "x": 19, "y": 4},
+                {"matrix": [4, 18], "x": 20, "y": 4, "h": 2},
+
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+
+                {"matrix": [5, 14], "x": 16, "y": 5},
+                {"matrix": [5, 15], "x": 17, "y": 5},
+                {"matrix": [5, 16], "x": 18, "y": 5},
+                {"matrix": [5, 17], "x": 19, "y": 5},
+
+                {"matrix": [4, 6], "x": 5, "y": 7},
+                {"matrix": [4, 7], "x": 6, "y": 7},
+                {"matrix": [4, 8], "x": 7, "y": 7},
+
+                {"matrix": [4, 10], "x": 13, "y": 7},
+                {"matrix": [4, 11], "x": 14, "y": 7},
+                {"matrix": [4, 12], "x": 15, "y": 7},
+
+                {"matrix": [5, 6], "x": 5, "y": 8, "h": 2},
+                {"matrix": [5, 7], "x": 6, "y": 8, "h": 2},
+                {"matrix": [5, 8], "x": 7, "y": 8},
+
+                {"matrix": [5, 10], "x": 13, "y": 8},
+                {"matrix": [5, 11], "x": 14, "y": 8, "h": 2},
+                {"matrix": [5, 12], "x": 15, "y": 8, "h": 2},
+
+                {"matrix": [6, 8], "x": 7, "y": 9},
+
+                {"matrix": [6, 10], "x": 13, "y": 9}
             ]
         }
     }