Move small macropad-ish layouts to data driven (#20341)

keyboards/10bleoledhub/10bleoledhub.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 haierwangwei2005
- *
- * 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 LAYOUT( \
-    K00, \
-    K10, K11, K12,  \
-    K20, K21, K22,  \
-    K30, K31, K32   \
-) { \
-    { K00,   KC_NO,   KC_NO }, \
-    { K10,   K11,   K12 }, \
-    { K20,   K21,   K22 }, \
-    { K30,   K31,   K32 }  \
-}

keyboards/10bleoledhub/info.json

@@ -23,16 +23,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }

keyboards/2key2crawl/2key2crawl.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K15, \
-	K10, K11, K12, K13, K14, K16  \
-) { \
-	{ K00,   K01,   K02,   K03,  KC_NO, KC_NO, KC_NO }, \
-	{ K10,   K11,   K12,   K13,  K14,   K15,   K16 },  \
-}
-

keyboards/2key2crawl/info.json

@@ -23,18 +23,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K15", "x":4, "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": [1, 5], "x": 4, "y": 0},
 
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1},
-                {"label":"K16", "x":5.5, "y":0.5}
+                {"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, 6], "x": 5.5, "y": 0.5}
             ]
         }
     }

keyboards/3keyecosystem/2key2/2key2.c

@@ -14,7 +14,7 @@ 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/>.
 */
-#include "2key2.h"
+#include "quantum.h"
 
 // RGB Matrix configuration
 // based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration

keyboards/3keyecosystem/2key2/2key2.h

@@ -1,33 +0,0 @@
-/*
-Copyright 2021 John Mueller
-
-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 is 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( \
-    k00, k01 \
-) { \
-    { k00, k01 }  \
-}

keyboards/3keyecosystem/2key2/info.json

@@ -21,8 +21,8 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0}
             ]
         }
     }

keyboards/4by3/4by3.h

@@ -1,70 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/* LAYOUT_horizontal
- * ┌───┐
- * │USB│
- * ├───┼───┬───┬───┐
- * │K00│K01│K02│K03│
- * ├───┼───┼───┼───┤
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_horizontal( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }  \
-}
-
-/* LAYOUT_vertical_right
- * ┌───┬───┬───┬───┐
- * │K00│K01│K03│USB│
- * ├───┼───┼───┬───┘
- * │K04│K05│K06│
- * ├───┼───┼───┤
- * │K07│K08│K09│
- * ├───┼───┼───┤
- * │K10│K11│K12│
- * └───┴───┴───┘
- */
-#define LAYOUT_vertical_right( \
-	K20, K10, K00, \
-    K21, K11, K01, \
-    K22, K12, K02, \
-    K23, K13, K03  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }  \
-}
-
-/* LAYOUT_vertical_left
- *     ┌───┬───┬───┐
- *     │K00│K01│K03│
- *     ├───┼───┼───┤
- *     │K04│K05│K06│
- *     ├───┼───┼───┤
- *     │K07│K08│K09│
- * ┌───┼───┼───┼───┤
- * │USB│K10│K11│K12│
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_vertical_left( \
-	K03, K13, K23, \
-    K02, K12, K22, \
-    K01, K11, K21, \
-    K00, K10, K20  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }  \
-}
-
-#define LAYOUT LAYOUT_horizontal

keyboards/4by3/info.json

@@ -15,28 +15,64 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_horizontal"
+    },
     "layouts": {
         "LAYOUT_horizontal": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, { "x": 3, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, { "x": 3, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, { "x": 3, "y": 2 }
+                {"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": [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": [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}
             ]
         },
         "LAYOUT_vertical_right": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 },
-                { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
+                {"matrix": [2, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 2, "y": 0},
+
+                {"matrix": [2, 1], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [0, 1], "x": 2, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 2},
+
+                {"matrix": [2, 3], "x": 0, "y": 3},
+                {"matrix": [1, 3], "x": 1, "y": 3},
+                {"matrix": [0, 3], "x": 2, "y": 3}
             ]
         },
         "LAYOUT_vertical_left": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 },
-                { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
+                {"matrix": [0, 3], "x": 0, "y": 0},
+                {"matrix": [1, 3], "x": 1, "y": 0},
+                {"matrix": [2, 3], "x": 2, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1},
+                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+
+                {"matrix": [0, 1], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3},
+                {"matrix": [1, 0], "x": 1, "y": 3},
+                {"matrix": [2, 0], "x": 2, "y": 3}
             ]
         }
     }

keyboards/9key/9key.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}

keyboards/9key/info.json

@@ -17,7 +17,19 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
+      ]
     }
   }
 }

keyboards/abstract/ellipse/rev1/info.json

@@ -28,7 +28,15 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25}
+            ]
         }
     }
 }

keyboards/abstract/ellipse/rev1/rev1.h

@@ -1,36 +0,0 @@
-/* Copyright 2019 AbstractKB
- *
- * 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( \
-    K00, K01, K02, \
-    K10, K11, K12   \
-) \
-{ \
-    { K00, K01,   K02 }, \
-    { K10, K11,   K12 }, \
-}
-

keyboards/afternoonlabs/gust/rev1/info.json

@@ -18,42 +18,17 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "x": 2,
-                    "y": 3
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3}
             ]
         }
     }

keyboards/afternoonlabs/gust/rev1/rev1.h

@@ -1,30 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 LAYOUT( \
-    M00, M01, M02, \
-    M10, M11, M12,  \
-    M20, M21, M22  \
-) \
-{ \
-    { M00, M01, M02 }, \
-    { M10, M11, M12 }, \
-    { M20, M21, M22 }  \
-}

keyboards/aplyard/aplx6/info.json

@@ -5,18 +5,5 @@
     "maintainer": "Aplyard",
     "usb": {
         "vid": "0xE0E0"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1}
-            ]
-        }
     }
 }

keyboards/aplyard/aplx6/rev1/info.json

@@ -9,5 +9,18 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
 }

keyboards/aplyard/aplx6/rev1/rev1.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-      k000, k001, k002, \
-      k100, k101, k102 \
-) \
-{ \
-    { k000, k001, k002 }, \
-    { k100, k101, k102 }  \
-} 
-

keyboards/aplyard/aplx6/rev2/info.json

@@ -14,5 +14,18 @@
         ]
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
 }

keyboards/aplyard/aplx6/rev2/rev2.h

@@ -1,28 +0,0 @@
- /* Copyright 2020 Aplyard 
-  * 
-  * 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 LAYOUT( \
-      k000, k001, k002, \
-      k100, k101, k102 \
-) \
-{ \
-    { k000, k001, k002 }, \
-    { k100, k101, k102 }  \
-} 
-
-

keyboards/axolstudio/helpo/helpo.h

@@ -1,39 +0,0 @@
-/* Copyright 2020 kb-elmo
- *
- * 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 is 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( \
-    k04, k03, k02, k01, k00, \
-    k09, k08, k07, k06, k05, \
-    k14, k13, k12, k11, k10, \
-    k19, k18, k17, k16, k15  \
-) { \
-    { k00, k01, k02, k03, k04, }, \
-    { k05, k06, k07, k08, k09, }, \
-    { k10, k11, k12, k13, k14, }, \
-    { k15, k16, k17, k18, k19, }  \
-}

keyboards/axolstudio/helpo/info.json

@@ -18,26 +18,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3}
+                {"matrix": [0, 4], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4, "y": 0},
+
+                {"matrix": [1, 4], "x": 0, "y": 1},
+                {"matrix": [1, 3], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 4, "y": 1},
+
+                {"matrix": [2, 4], "x": 0, "y": 2},
+                {"matrix": [2, 3], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 4, "y": 2},
+
+                {"matrix": [3, 4], "x": 0, "y": 3},
+                {"matrix": [3, 3], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 1], "x": 3, "y": 3},
+                {"matrix": [3, 0], "x": 4, "y": 3}
             ]
         }
     }

keyboards/biacco42/meishi/info.json

@@ -18,10 +18,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "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}
             ]
         }
     }

keyboards/biacco42/meishi/meishi.h

@@ -1,31 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * 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 following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, k03\
-) \
-{ \
-    { k00, k01, k02, k03 }\
-}
-

keyboards/biacco42/meishi2/info.json

@@ -18,10 +18,10 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [1, 0], "x": 2, "y": 0},
+        {"matrix": [1, 1], "x": 3, "y": 0}
       ]
     }
   }

keyboards/biacco42/meishi2/meishi2.h

@@ -1,34 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * 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( \
-    k00, k01, k02, k03 \
-) \
-{ \
-    { k00, k01 }, \
-    { k02, k03 } \
-}

keyboards/boston_meetup/boston_meetup.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-  ) \
-{ \
-  {  K00,  KC_NO, KC_NO, KC_NO  }, \
-  {  K10,  K11,   K12,   K13    }, \
-  {  K20,  K21,   K22,   K23    }, \
-  {  K30,  K31,   K32,   K33    }  \
-}

keyboards/boston_meetup/info.json

@@ -9,6 +9,24 @@
   },
   "layouts": {
     "LAYOUT": {
- "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}]    }
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "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": [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": [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}
+      ]
+    }
   }
 }

keyboards/bthlabs/geekpad/geekpad.h

@@ -1,37 +0,0 @@
-/* Copyright 2019-present Tomek Wójcik <contact@bthlabs.pl>
- *
- * 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( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22  \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}

keyboards/bthlabs/geekpad/info.json

@@ -18,15 +18,17 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x": 0, "y": 0},
-        {"x": 1, "y": 0},
-        {"x": 2,"y": 0},
-        {"x": 0, "y": 1},
-        {"x": 1, "y": 1},
-        {"x": 2,"y": 1},
-        {"x": 0, "y": 2},
-        {"x": 1, "y": 2},
-        {"x": 2,"y": 2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
       ]
     }
   }

keyboards/capsunlocked/cu7/cu7.h

@@ -1,36 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-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( \
-	         K01,       \
-	  K10,   K11,  K12, \
-      K20,   K21,  K22  \
-) { \
-	{ KC_NO, K01,  KC_NO }, \
-	{ K10,   K11,  K12 },   \
-    { K20,   K21,  K22 }    \
-}
-

keyboards/capsunlocked/cu7/info.json

@@ -23,15 +23,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0, "w":2, "h":2},
+                {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 2, "h": 2},
 
-                {"x":0, "y":2.5},
-                {"x":1, "y":2.5},
-                {"x":2, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.5},
+                {"matrix": [1, 2], "x": 2, "y": 2.5},
 
-                {"x":0, "y":3.5},
-                {"x":1, "y":3.5},
-                {"x":2, "y":3.5}
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.5},
+                {"matrix": [2, 2], "x": 2, "y": 3.5}
             ]
         }
     }

keyboards/catch22/catch22.h

@@ -1,33 +0,0 @@
-/*
-Copyright 2018 QMK Community
-
-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 LAYOUT( \
-     K01, K02, K03, K04, \
-     K11, K12, K13, K14, \
-K20, K21, K22, K23, K24, \
-K30, K31, K32, K33, K34, \
-     K41, K42, K43, K44 \
-) { \
-  { KC_NO, K01, K02, K03, K04 },  \
-  { KC_NO, K11, K12, K13, K14 },  \
-  { K20,   K21, K22, K23, K24 },  \
-  { K30,   K31, K32, K33, K34 },  \
-  { KC_NO, K41, K42, K43, K44 },  \
-}

keyboards/catch22/info.json

@@ -15,7 +15,34 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"A", "x":1, "y":0}, {"label":"B", "x":2, "y":0}, {"label":"C", "x":3, "y":0}, {"label":"D", "x":4, "y":0}, {"label":"E", "x":1, "y":1}, {"label":"F", "x":2, "y":1}, {"label":"G", "x":3, "y":1}, {"label":"H", "x":4, "y":1}, {"label":"I", "x":0, "y":2}, {"label":"J", "x":1, "y":2}, {"label":"K", "x":2, "y":2}, {"label":"L", "x":3, "y":2}, {"label":"M", "x":4, "y":2}, {"label":"1", "x":0, "y":3, "h":2}, {"label":"N", "x":1, "y":3}, {"label":"O", "x":2, "y":3}, {"label":"P", "x":3, "y":3}, {"label":"Q", "x":4, "y":3}, {"label":"R", "x":1, "y":4}, {"label":"S", "x":2, "y":4}, {"label":"T", "x":3, "y":4}, {"label":"U", "x":4, "y":4}]
+            "layout": [
+                {"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, 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": [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": [3, 0], "x": 0, "y": 3, "h": 2},
+                {"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": [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}
+            ]
         }
     }
 }

keyboards/ckeys/thedora/info.json

@@ -24,30 +24,30 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"k00", "x":1, "y":0},
-        {"label":"k01", "x":2, "y":0},
-        {"label":"k02", "x":3, "y":0},
-        {"label":"k03", "x":4, "y":0},
-        {"label":"k04", "x":5, "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},
 
-        {"label":"k10", "x":1, "y":1},
-        {"label":"k11", "x":2, "y":1},
-        {"label":"k12", "x":3, "y":1},
-        {"label":"k13", "x":4, "y":1},
-        {"label":"k14", "x":5, "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},
 
-        {"label":"k20", "x":1, "y":2},
-        {"label":"k21", "x":2, "y":2},
-        {"label":"k22", "x":3, "y":2},
-        {"label":"k23", "x":4, "y":2},
-        {"label":"k24", "x":5, "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},
 
-        {"label":"k05 (Rotary Push)", "x":0, "y":3},
-        {"label":"k30", "x":1, "y":3},
-        {"label":"k31", "x":2, "y":3},
-        {"label":"k32", "x":3, "y":3},
-        {"label":"k33", "x":4, "y":3},
-        {"label":"k34", "x":5, "y":3}
+        {"matrix": [0, 5], "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}
       ]
     }
   }

keyboards/ckeys/thedora/thedora.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "thedora.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {

keyboards/ckeys/thedora/thedora.h

@@ -1,37 +0,0 @@
-/* Copyright 2019 Branden Byers (@brandenbyers)
- *
- * 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
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-         k00, k01, k02, k03, k04, \
-         k10, k11, k12, k13, k14, \
-         k20, k21, k22, k23, k24, \
-    k05, k30, k31, k32, k33, k34  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, XXX }, \
-    { k20, k21, k22, k23, k24, XXX }, \
-    { k30, k31, k32, k33, k34, XXX }  \
-}

keyboards/ckeys/washington/info.json

@@ -26,7 +26,21 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":0, "y":0.75}, {"x":0.5, "y":1.75}, {"x":1.5, "y":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 0.75},
+
+                {"matrix": [2, 1], "x": 0.5, "y": 1.75},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 2}
+            ]
         }
     }
 }

keyboards/ckeys/washington/washington.h

@@ -1,38 +0,0 @@
-/* Copyright 2019 merlin04
- *
- * 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 is 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( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }  \
-}

keyboards/clawsome/bookerboard/bookerboard.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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 LAYOUT( \
-    K00, K01, K02,   \
-    K10, K11, K12,   \
-    K20, K21, K22,   \
-    K30, K31, K32    \
-) { \
-    { K00,   K01,   K02   }, \
-    { K10,   K11,   K12   }, \
-    { K20,   K21,   K22   }, \
-    { K30,   K31,   K32   }, \
-}

keyboards/clawsome/bookerboard/info.json

@@ -18,18 +18,21 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (B5,B6)", "x":0, "y":0},
-                {"label":"K01 (B5,B2)", "x":1, "y":0},
-                {"label":"K02 (B5,B3)", "x":2, "y":0},
-                {"label":"K10 (B4,B6)", "x":0, "y":1},
-                {"label":"K11 (B4,B2)", "x":1, "y":1},
-                {"label":"K12 (B4,B3)", "x":2, "y":1},
-                {"label":"K20 (E6,B6)", "x":0, "y":2},
-                {"label":"K21 (E6,B2)", "x":1, "y":2},
-                {"label":"K22 (E6,B3)", "x":2, "y":2},
-                {"label":"K30 (D7,B6)", "x":0, "y":3},
-                {"label":"K31 (D7,B2)", "x":1, "y":3},
-                {"label":"K32 (D7,B3)", "x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }

keyboards/clawsome/doodle/doodle.h

@@ -1,27 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * 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 LAYOUT( \
-    K00, K01, K02,   \
-    K10, K11, K12    \
-) { \
-    { K00,   K01,   K02   }, \
-    { K10,   K11,   K12   } \
-}

keyboards/clawsome/doodle/info.json

@@ -18,12 +18,13 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D4,D7)", "x":0, "y":0},
-                {"label":"K01 (D4,F4)", "x":1, "y":0},
-                {"label":"K02 (D4,E6)", "x":2, "y":0},
-                {"label":"K10 (C6,D7)", "x":0, "y":1},
-                {"label":"K11 (C6,F4)", "x":1, "y":1},
-                {"label":"K12 (C6,E6)", "x":2, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
             ]
         }
     }

keyboards/clawsome/fightpad/fightpad.h

@@ -1,26 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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 LAYOUT( \
-         K01,           K03, K04, K05, K06,   \
-    K10, K11, K12,      K13, K14, K15, K16    \
-) { \
-    { KC_NO, K01,   KC_NO, K03,   K04,   K05,   K06   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16   }, \
-}

keyboards/clawsome/fightpad/info.json

@@ -18,18 +18,21 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K01 (B5,E6)", "x":1, "y":0},
-                {"label":"K03 (B5,B2)", "x":4, "y":0},
-                {"label":"K04 (B5,B3)", "x":5, "y":0},
-                {"label":"K05 (B5,B1)", "x":6, "y":0},
-                {"label":"K06 (B5,F7)", "x":7, "y":0},
-                {"label":"K10 (B6,D7)", "x":0, "y":1},
-                {"label":"K11 (B6,E6)", "x":1, "y":1},
-                {"label":"K12 (B6,B4)", "x":2, "y":1},
-                {"label":"K13 (B6,B2)", "x":4, "y":1},
-                {"label":"K14 (B6,B3)", "x":5, "y":1},
-                {"label":"K15 (B6,B1)", "x":6, "y":1},
-                {"label":"K16 (B6,F7)", "x":7, "y":1}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "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": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1}
             ]
         }
     }

keyboards/clawsome/gamebuddy/v1_0/info.json

@@ -18,32 +18,36 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D1,F5)", "x":0, "y":0},
-                {"label":"K01 (D1,F6)", "x":1, "y":0},
-                {"label":"K02 (D1,F7)", "x":2, "y":0},
-                {"label":"K03 (D1,B1)", "x":3, "y":0},
-                {"label":"K04 (D1,C6)", "x":4, "y":0},
-                {"label":"K05 (D1,D7)", "x":5, "y":0},
-                {"label":"K10 (D0,F5)", "x":0, "y":1},
-                {"label":"K11 (D0,F6)", "x":1, "y":1},
-                {"label":"K12 (D0,F7)", "x":2, "y":1},
-                {"label":"K13 (D0,B1)", "x":3, "y":1},
-                {"label":"K14 (D0,C6)", "x":4, "y":1},
-                {"label":"K15 (D0,D7)", "x":5, "y":1},
-                {"label":"K20 (E6,F5)", "x":0, "y":2, "w":2},
-                {"label":"K22 (E6,F7)", "x":2, "y":2},
-                {"label":"K23 (E6,B1)", "x":3, "y":2},
-                {"label":"K24 (E6,C6)", "x":4, "y":2},
-                {"label":"K25 (E6,D7)", "x":5, "y":2},
-                {"label":"K30 (B3,F5)", "x":0, "y":3},
-                {"label":"K31 (B3,F6)", "x":1, "y":3},
-                {"label":"K32 (B3,F7)", "x":2, "y":3},
-                {"label":"K33 (B3,B1)", "x":3, "y":3},
-                {"label":"K34 (B3,C6)", "x":4, "y":3},
-                {"label":"K35 (B3,D7)", "x":5, "y":3},
-                {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2},
-                {"label":"K44 (B2,C6)", "x":4, "y":4},
-                {"label":"K45 (B2,D7)", "x":5, "y":4}
+                {"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": [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": [2, 0], "x": 0, "y": 2, "w": 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": [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": [4, 6], "x": 6, "y": 3, "h": 2},
+
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4}
             ]
         }
     }

keyboards/clawsome/gamebuddy/v1_0/v1_0.h

@@ -1,32 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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 LAYOUT( \
-    K00, K01, K02, K03, K04, K05,        \
-    K10, K11, K12, K13, K14, K15,        \
-    K20,      K22, K23, K24, K25,        \
-    K30, K31, K32, K33, K34, K35, K46,   \
-                        K44, K45         \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   KC_NO }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K44,   K45,   K46   }, \
-}

keyboards/clawsome/gamebuddy/v1_m/info.json

@@ -18,33 +18,37 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (C6,B1)", "x":0, "y":0},
-                {"label":"K01 (C6,F7)", "x":1, "y":0},
-                {"label":"K02 (C6,F6)", "x":2, "y":0},
-                {"label":"K03 (C6,F5)", "x":3, "y":0},
-                {"label":"K04 (C6,E6)", "x":4, "y":0},
-                {"label":"K05 (C6,B4)", "x":5, "y":0},
-                {"label":"K10 (D7,B1)", "x":0, "y":1},
-                {"label":"K11 (D7,F7)", "x":1, "y":1},
-                {"label":"K12 (D7,F6)", "x":2, "y":1},
-                {"label":"K13 (D7,F5)", "x":3, "y":1},
-                {"label":"K14 (D7,E6)", "x":4, "y":1},
-                {"label":"K15 (D7,B4)", "x":5, "y":1},
-                {"label":"K20 (B5,B1)", "x":0, "y":2},
-                {"label":"K21 (B5,F7)", "x":1, "y":2},
-                {"label":"K22 (B5,F6)", "x":2, "y":2},
-                {"label":"K23 (B5,F5)", "x":3, "y":2},
-                {"label":"K24 (B5,E6)", "x":4, "y":2},
-                {"label":"K25 (B5,B4)", "x":5, "y":2},
-                {"label":"K30 (B3,B1)", "x":0, "y":3},
-                {"label":"K31 (B3,F7)", "x":1, "y":3},
-                {"label":"K32 (B3,F6)", "x":2, "y":3},
-                {"label":"K33 (B3,F5)", "x":3, "y":3},
-                {"label":"K34 (B3,E6)", "x":4, "y":3},
-                {"label":"K35 (B3,B4)", "x":5, "y":3},
-                {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2},
-                {"label":"K44 (B2,E6)", "x":4, "y":4},
-                {"label":"K45 (B2,B4)", "x":5, "y":4}
+                {"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": [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": [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": [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": [4, 6], "x": 6, "y": 3, "h": 2},
+
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4}
             ]
         }
     }

keyboards/clawsome/gamebuddy/v1_m/v1_m.h

@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * 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 LAYOUT( \
-    K00, K01, K02, K03, K04, K05,        \
-    K10, K11, K12, K13, K14, K15,        \
-    K20, K21, K22, K23, K24, K25,        \
-    K30, K31, K32, K33, K34, K35, K46,   \
-                        K44, K45         \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K44,   K45,   K46   }, \
-}

keyboards/clawsome/luggage_rack/info.json

@@ -18,19 +18,23 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D3,D4)", "x":0, "y":0},
-                {"label":"K11 (F4,D0)", "x":1, "y":0},
-                {"label":"K02 (D3,D1)", "x":2, "y":0},
-                {"label":"K20 (B0,D4)", "x":0, "y":1.5},
-                {"label":"K31 (B2,D0)", "x":1, "y":1.5},
-                {"label":"K22 (B0,D1)", "x":2, "y":1.5},
-                {"label":"K40 (F7,D4)", "x":0, "y":2.5},
-                {"label":"K51 (B6,D0)", "x":1, "y":2.5},
-                {"label":"K42 (F7,D1)", "x":2, "y":2.5},
-                {"label":"K61 (B1,D0)", "x":1, "y":4.5},
-                {"label":"K70 (F5,D4)", "x":0, "y":5.5},
-                {"label":"K81 (F6,D0)", "x":1, "y":5.5},
-                {"label":"K72 (F5,D1)", "x":2, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 1], "x": 1, "y": 1.5},
+                {"matrix": [2, 2], "x": 2, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5},
+                {"matrix": [5, 1], "x": 1, "y": 2.5},
+                {"matrix": [4, 2], "x": 2, "y": 2.5},
+
+                {"matrix": [6, 1], "x": 1, "y": 4.5},
+
+                {"matrix": [7, 0], "x": 0, "y": 5.5},
+                {"matrix": [8, 1], "x": 1, "y": 5.5},
+                {"matrix": [7, 2], "x": 2, "y": 5.5}
             ]
         }
     }

keyboards/clawsome/luggage_rack/luggage_rack.h

@@ -1,38 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * 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 LAYOUT( \
-    K00, K11, K02,   \
-    K20, K31, K22,   \
-    K40, K51, K42,   \
-                     \
-         K61,        \
-    K70, K81, K72    \
-) { \
-    { K00,   KC_NO, K02   }, \
-    { KC_NO, K11,   KC_NO }, \
-    { K20,   KC_NO, K22   }, \
-    { KC_NO, K31,   KC_NO }, \
-    { K40,   KC_NO, K42   }, \
-    { KC_NO, K51,   KC_NO }, \
-    { KC_NO, K61,   KC_NO }, \
-    { K70,   KC_NO, K72   }, \
-    { KC_NO, K81,   KC_NO }, \
-}

keyboards/clawsome/sidekick/info.json

@@ -18,33 +18,37 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D0,F6)", "x":0, "y":0},
-                {"label":"K01 (D0,F5)", "x":1, "y":0},
-                {"label":"K02 (D0,B1)", "x":2, "y":0},
-                {"label":"K03 (D0,B3)", "x":3, "y":0},
-                {"label":"K04 (D0,E6)", "x":4, "y":0},
-                {"label":"K05 (D0,D7)", "x":5, "y":0},
-                {"label":"K06 (D0,D4)", "x":6, "y":0},
-                {"label":"K10 (C6,F6)", "x":0, "y":1},
-                {"label":"K11 (C6,F5)", "x":1, "y":1},
-                {"label":"K12 (C6,B1)", "x":2, "y":1},
-                {"label":"K13 (C6,B3)", "x":3, "y":1},
-                {"label":"K14 (C6,E6)", "x":4, "y":1},
-                {"label":"K15 (C6,D7)", "x":5, "y":1},
-                {"label":"K16 (C6,D4)", "x":6, "y":1, "h":2},
-                {"label":"K23 (B2,B3)", "x":3, "y":2},
-                {"label":"K24 (B2,E6)", "x":4, "y":2},
-                {"label":"K25 (B2,D7)", "x":5, "y":2},
-                {"label":"K31 (B6,F5)", "x":1, "y":3},
-                {"label":"K33 (B6,B3)", "x":3, "y":3},
-                {"label":"K34 (B6,E6)", "x":4, "y":3},
-                {"label":"K35 (B6,D7)", "x":5, "y":3},
-                {"label":"K36 (B6,D4)", "x":6, "y":3, "h":2},
-                {"label":"K40 (B5,F6)", "x":0, "y":4},
-                {"label":"K41 (B5,F5)", "x":1, "y":4},
-                {"label":"K42 (B5,B1)", "x":2, "y":4},
-                {"label":"K43 (B5,B3)", "x":3, "y":4, "w":2},
-                {"label":"K45 (B5,D7)", "x":5, "y":4}
+                {"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},
+
+                {"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, "h": 2},
+
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 1], "x": 1, "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": 6, "y": 3, "h": 2},
+
+                {"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, "w": 2},
+                {"matrix": [4, 5], "x": 5, "y": 4}
             ]
         }
     }

keyboards/clawsome/sidekick/sidekick.h

@@ -1,33 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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 LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06,   \
-    K10, K11, K12, K13, K14, K15, K16,   \
-                   K23, K24, K25,        \
-         K31,      K33, K34, K35, K36,   \
-    K40, K41, K42, K43,      K45         \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16   }, \
-    { KC_NO, KC_NO, KC_NO, K23,   K24,   K25,   KC_NO }, \
-    { KC_NO, K31,   KC_NO, K33,   K34,   K35,   K36   }, \
-    { K40,   K41,   K42,   K43,   KC_NO, K45,   KC_NO }, \
-}
-

keyboards/contender/contender.h

@@ -1,43 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * 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 is 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( \
-      k00, k01, k02, k03, \
-      k10, k11, k12, k13, \
-      k20, k21, k22, k23, \
-    k30, k31, k32, k33, k34, \
-    k40, k41, k42, k43, k44, \
-    k50, k51, k52, k53 \
-) { \
-    { KC_NO, k00, k01, k02, k03 }, \
-    { KC_NO, k10, k11, k12, k13 }, \
-    { KC_NO, k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33, k34 }, \
-    { k40, k41, k42, k43, k44 }, \
-    { k50, k51, k52, k53, KC_NO } \
-}

keyboards/contender/info.json

@@ -18,32 +18,37 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Esc", "x":1, "y":0},
-              {"label":"Tab", "x":2, "y":0},
-              {"label":"Shift", "x":3, "y":0},
-              {"label":"Back", "x":4, "y":0},
-              {"label":"Num", "x":1, "y":1.25},
-              {"label":"/", "x":2, "y":1.25},
-              {"label":"*", "x":3, "y":1.25},
-              {"label":"=", "x":4, "y":1.25},
-              {"label":"7", "x":1, "y":2.25},
-              {"label":"8", "x":2, "y":2.25},
-              {"label":"9", "x":3, "y":2.25},
-              {"label":"-", "x":4, "y":2.25},
-              {"label":"fn","x":0, "y":3.25},
-              {"label":"4", "x":1, "y":3.25},
-              {"label":"5", "x":2, "y":3.25},
-              {"label":"6", "x":3, "y":3.25},
-              {"label":"+", "x":4, "y":3.25},
-              {"label":"RGB","x":0, "y":4.25},
-              {"label":"1", "x":1, "y":4.25},
-              {"label":"2", "x":2, "y":4.25},
-              {"label":"3", "x":3, "y":4.25},
-              {"label":"Enter", "x":4, "y":4.25, "h":2},
-              {"label":"TG","x":0, "y":5.25},
-              {"label":"0", "x":1, "y":5.25},
-              {"label":"00", "x":2, "y":5.25},
-              {"label":".", "x":3, "y":5.25}
+                {"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, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+                {"matrix": [4, 4], "x": 4, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         }
     }

keyboards/converter/numeric_keypad_iie/info.json

@@ -17,7 +17,43 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}]
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 5], "x": 2, "y": 0},
+                {"matrix": [3, 2], "x": 3, "y": 0},
+                {"matrix": [3, 3], "x": 4, "y": 0},
+
+                {"matrix": [2, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1},
+
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [1, 0], "x": 6.5, "y": 1},
+
+                {"matrix": [3, 1], "x": 0, "y": 2},
+
+                {"matrix": [1, 3], "x": 2, "y": 2},
+                {"matrix": [1, 4], "x": 3, "y": 2},
+                {"matrix": [1, 5], "x": 4, "y": 2},
+
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 0], "x": 6.5, "y": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [2, 5], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [2, 4], "x": 5.5, "y": 3},
+                {"matrix": [2, 0], "x": 6.5, "y": 3}
+            ]
         }
     }
 }

keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h

@@ -1,30 +0,0 @@
-/* Copyright Adam Newbold <adam@neatnik.net>
- *
- * 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 LAYOUT( \
-    K_ESC,   K_7, K_8,     K_9,   K_LEFT_PARENS, K_RIGHT_PARENS, \
-    K_LEFT,  K_4, K_5,     K_6,   K_MINUS,       K_DIVIDE,       \
-    K_RIGHT, K_1, K_2,     K_3,   K_PLUS,        K_MULTIPLY,     \
-    K_SPACE, K_0, K_COMMA, K_DOT, K_RETURN,      K_PRINT         \
-){ \
-    { K_RIGHT_PARENS, K_ESC,   K_4,           K_5,     K_6,      K_7     },\
-    { K_DIVIDE,       K_LEFT,  K_0,           K_1,     K_2,      K_3     },\
-    { K_PRINT,        K_SPACE, K_LEFT_PARENS, K_MINUS, K_RETURN, K_COMMA },\
-    { K_MULTIPLY,     K_RIGHT, K_8,           K_9,     K_DOT,    K_PLUS  },\
-}

keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h

@@ -1,28 +0,0 @@
-/* Copyright 2019 mini-ninja-64
- *
- * 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( k00 ) { { k00 } }

keyboards/copenhagen_click/click_pad_v1/info.json

@@ -21,7 +21,9 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}]
+            "layout": [
+                {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0}
+            ]
         }
     }
 }

keyboards/craftwalk/craftwalk.h

@@ -1,38 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * 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 is 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( \
-       k00, k01, k02, \
-  k10, k11, k12, k13, \
-  k20, k21, k22, k23, k24, k25, k26 \
-) \
-{ \
-  { KC_NO, k00, k01, k02, KC_NO, KC_NO, KC_NO }, \
-  { k10, k11, k12, k13, KC_NO, KC_NO, KC_NO },  \
-  { k20, k21, k22, k23, k24, k25, k26 } \
-}

keyboards/craftwalk/info.json

@@ -18,20 +18,23 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Q", "x":1.25, "y":0.25},
-              {"label":"W", "x":2.25, "y":0},
-              {"label":"E", "x":3.25, "y":0.25},
-              {"label":"Ctrl", "x":0, "y":1},
-              {"label":"A", "x":1.25, "y":1.25},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1.25},
-              {"label":"Shift", "x":0, "y":2},
-              {"label":"Adjust", "x":1.25, "y":2.25},
-              {"label":"Mouse", "x":2.25, "y":2},
-              {"label":"Mouse", "x":3.25, "y":2.25},
-              {"label":"F", "x":4.25, "y":2},
-              {"label":"Num", "x":5.25, "y":3, "h":1.5},
-              {"label":"Space", "x":6.25, "y":3, "h":1.5}
+                {"matrix": [0, 1], "x": 1.25, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+
+                {"matrix": [2, 5], "x": 5.25, "y": 3, "h": 1.5},
+                {"matrix": [2, 6], "x": 6.25, "y": 3, "h": 1.5}
             ]
         }
     }

keyboards/dailycraft/sandbox/rev1/info.json

@@ -18,17 +18,17 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":2, "y":0},
-                {"label":"4", "x":3, "y":0},
-                {"label":"5", "x":4, "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},
 
-                {"label":"6", "x":0, "y":1},
-                {"label":"7", "x":1, "y":1},
-                {"label":"8", "x":2, "y":1},
-                {"label":"9", "x":3, "y":1},
-                {"label":"0", "x":4, "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}
             ]
         }
     }

keyboards/dailycraft/sandbox/rev1/rev1.h

@@ -1,35 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * 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 is 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( \
-    k00, k01, k02, k03, k04, \
-    k10, k11, k12, k13, k14  \
-) { \
-    { k00, k01, k02, k03, k04 }, \
-    { k10, k11, k12, k13, k14 }  \
-}

keyboards/dailycraft/sandbox/rev2/info.json

@@ -21,27 +21,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":2, "y":0},
-                {"label":"4", "x":3, "y":0},
-                {"label":"5", "x":4, "y":0},
-                {"label":"A", "x":6, "y":0},
-                {"label":"B", "x":7, "y":0},
-                {"label":"C", "x":8, "y":0},
-                {"label":"D", "x":9, "y":0},
-                {"label":"E", "x":10, "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},
 
-                {"label":"6", "x":0, "y":1},
-                {"label":"7", "x":1, "y":1},
-                {"label":"8", "x":2, "y":1},
-                {"label":"9", "x":3, "y":1},
-                {"label":"0", "x":4, "y":1},
-                {"label":"F", "x":6, "y":1},
-                {"label":"G", "x":7, "y":1},
-                {"label":"H", "x":8, "y":1},
-                {"label":"I", "x":9, "y":1},
-                {"label":"J", "x":10, "y":1}
+                {"matrix": [2, 0], "x": 6, "y": 0},
+                {"matrix": [2, 1], "x": 7, "y": 0},
+                {"matrix": [2, 2], "x": 8, "y": 0},
+                {"matrix": [2, 3], "x": 9, "y": 0},
+                {"matrix": [2, 4], "x": 10, "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": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1}
             ]
         }
     }

keyboards/dailycraft/sandbox/rev2/rev2.h

@@ -1,37 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * 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 is 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( \
-    L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-    L10, L11, L12, L13, L14, R10, R11, R12, R13, R14  \
-) { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { R00, R01, R02, R03, R04 }, \
-    { R10, R11, R12, R13, R14 }  \
-}

keyboards/dmqdesign/spin/info.json

@@ -25,21 +25,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"x":0, "y":0},
-            {"x":1, "y":0},
-            {"x":2, "y":0},
-            {"x":3.5, "y":0},
-            {"x":0, "y":1},
-            {"x":1, "y":1}, 
-            {"x":2, "y":1},
-            {"x":3.5, "y":1.5},
-            {"x":0, "y":2},
-            {"x":1, "y":2},
-            {"x":2, "y":2},
-            {"x":3.5, "y":3},
-            {"x":0, "y":3}, 
-            {"x":1, "y":3},
-            {"x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+
+                {"matrix": [1, 4], "x": 3.5, "y": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [0, 4], "x": 3.5, "y": 3},
+                {"matrix": [0, 3], "x": 0, "y": 3},
+                {"matrix": [1, 3], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3}
             ]
         }
     }

keyboards/dmqdesign/spin/spin.h

@@ -1,29 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * 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 LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32 \
-) { \
-    {k00, k10, k20, k30, k23}, \
-    {k01, k11, k21, k31, k13}, \
-    {k02, k12, k22, k32, k03} \
-}

keyboards/doio/kb16/kb16.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb16.h"
+#include "quantum.h"
 
 // OLED animation
 #include "./lib/logo.h"

keyboards/doio/kb16/kb16.h

@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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
-
-/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
- * │00 │01 │02 │03 │  │04 │ │14 │
- * ├───┼───┼───┼───┤  └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │     ┌───┐
- * ├───┼───┼───┼───┤     │24 │
- * │30 │31 │32 │33 │     └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33       \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, XXX }  \
-}

keyboards/doio/kb16/rev1/info.json

@@ -25,31 +25,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1!", "x":0, "y":0},
-                {"label":"2@", "x":1, "y":0},
-                {"label":"3#", "x":2, "y":0},
-                {"label":"4$", "x":3, "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},
 
-                {"label":"Encoder 1", "x":4.75, "y":0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
 
-                {"label":"5%", "x":0, "y":1},
-                {"label":"6^", "x":1, "y":1},
-                {"label":"7&", "x":2, "y":1},
-                {"label":"8*", "x":3, "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},
 
-                {"label":"Encoder 2", "x":6, "y":0},
+                {"matrix": [1, 4], "x": 6, "y": 0},
 
-                {"label":"9(", "x":0, "y":2},
-                {"label":"0)", "x":1, "y":2},
-                {"label":"\u2191", "x":2, "y":2},
-                {"label":"Enter", "x":3, "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},
 
-                {"label":"Encoder 3", "x":5.375, "y":2.5},
+                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
 
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"\u2190", "x":1, "y":3},
-                {"label":"\u2193", "x":2, "y":3},
-                {"label":"\u2192", "x":3, "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}
             ]
         }
     }

keyboards/doio/kb16/rev2/info.json

@@ -25,31 +25,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1!", "x":0, "y":0},
-                {"label":"2@", "x":1, "y":0},
-                {"label":"3#", "x":2, "y":0},
-                {"label":"4$", "x":3, "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},
 
-                {"label":"Encoder 1", "x":4.75, "y":0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
 
-                {"label":"5%", "x":0, "y":1},
-                {"label":"6^", "x":1, "y":1},
-                {"label":"7&", "x":2, "y":1},
-                {"label":"8*", "x":3, "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},
 
-                {"label":"Encoder 2", "x":6, "y":0},
+                {"matrix": [1, 4], "x": 6, "y": 0},
 
-                {"label":"9(", "x":0, "y":2},
-                {"label":"0)", "x":1, "y":2},
-                {"label":"\u2191", "x":2, "y":2},
-                {"label":"Enter", "x":3, "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},
 
-                {"label":"Encoder 3", "x":5.375, "y":2.5},
+                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
 
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"\u2190", "x":1, "y":3},
-                {"label":"\u2193", "x":2, "y":3},
-                {"label":"\u2192", "x":3, "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}
             ]
         }
     }

keyboards/doio/kb30/info.json

@@ -25,46 +25,51 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4.25, "y":0},
-                {"label":"K05", "x":5.25, "y":0},
-                {"label":"K06", "x":6.25, "y":0},
-                
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1, "h":2},
-                {"label":"K14", "x":4.25, "y":1},
-                {"label":"K15", "x":5.25, "y":1},
-                {"label":"K16", "x":6.25, "y":1},
+                {"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},
 
-                {"label":"Encoder 1", "x":8.25, "y":2},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
 
-                {"label":"K20", "x":0, "y":2},
-                {"label":"K21", "x":1, "y":2},
-                {"label":"K22", "x":2, "y":2},
-                {"label":"K23", "x":4.25, "y":2},
-                {"label":"K24", "x":5.25, "y":2},
-                {"label":"K25", "x":6.25, "y":2},
+                {"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, "h": 2},
 
-                {"label":"Encoder 2", "x":11, "y":2},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
 
-                {"label":"K30", "x":0, "y":3},
-                {"label":"K31", "x":1, "y":3},
-                {"label":"K32", "x":2, "y":3},
-                {"label":"K33", "x":4.25, "y":3, "h":2},
-                {"label":"K35", "x":5.25, "y":3},
+                {"matrix": [2, 0], "x": 8.25, "y": 2},
 
-                {"label":"Encoder 3", "x":9, "y":4},
+                {"matrix": [2, 1], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
 
-                {"label":"K40", "x":0, "y":4, "w":2},
-                {"label":"K41", "x":2, "y":4},
-                {"label":"K42", "x":4.25, "y":4},
-                {"label":"K43", "x":5.25, "y":4},
-                {"label":"K44", "x":6.25, "y":4}
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [3, 0], "x": 6.25, "y": 2},
+
+                {"matrix": [3, 1], "x": 11, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [3, 3], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2},
+                {"matrix": [4, 1], "x": 5.25, "y": 3},
+
+                {"matrix": [4, 2], "x": 9, "y": 4},
+
+                {"matrix": [4, 3], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 2, "y": 4},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 5], "x": 5.25, "y": 4},
+                {"matrix": [5, 6], "x": 6.25, "y": 4}
             ]
         }
     }

keyboards/doio/kb30/kb30.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb30.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE

keyboards/doio/kb30/kb30.h

@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
- *
- * 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( \
-	K00, K01, K02, K03, K04, K05, K06, \
-	K10, K11, K12, K13, K14, K15, K16, \
-	K20, K21, K22, K23, K24, K25,      \
-	K30, K31, K32, K33,      K35,      \
-	K40, K41, K42, K43, K44,           \
-	                    K54, K55, K56  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06  }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16  }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   KC_NO}, \
-	{ K30,   K31,   K32,   K33,   KC_NO, K35,   KC_NO}, \
-	{ K40,   K41,   K42,   K43,   K44,   KC_NO, KC_NO}, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, K54,   K55,   K56 }  \
-}

keyboards/donutcables/scrabblepad/info.json

@@ -17,7 +17,247 @@
   "bootloader": "halfkay",
   "layouts": {
       "LAYOUT": {
-          "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}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "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}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "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}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "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":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "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":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":6}, {"x":4, "y":6}, {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":8, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, {"x":14, "y":6}, {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":7}, {"x":4, "y":7}, {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":8, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, {"x":14, "y":7}, {"x":0, "y":8}, {"x":1, "y":8}, {"x":2, "y":8}, {"x":3, "y":8}, {"x":4, "y":8}, {"x":5, "y":8}, {"x":6, "y":8}, {"x":7, "y":8}, {"x":8, "y":8}, {"x":9, "y":8}, {"x":10, "y":8}, {"x":11, "y":8}, {"x":12, "y":8}, {"x":13, "y":8}, {"x":14, "y":8}, {"x":0, "y":9}, {"x":1, "y":9}, {"x":2, "y":9}, {"x":3, "y":9}, {"x":4, "y":9}, {"x":5, "y":9}, {"x":6, "y":9}, {"x":7, "y":9}, {"x":8, "y":9}, {"x":9, "y":9}, {"x":10, "y":9}, {"x":11, "y":9}, {"x":12, "y":9}, {"x":13, "y":9}, {"x":14, "y":9}, {"x":0, "y":10}, {"x":1, "y":10}, {"x":2, "y":10}, {"x":3, "y":10}, {"x":4, "y":10}, {"x":5, "y":10}, {"x":6, "y":10}, {"x":7, "y":10}, {"x":8, "y":10}, {"x":9, "y":10}, {"x":10, "y":10}, {"x":11, "y":10}, {"x":12, "y":10}, {"x":13, "y":10}, {"x":14, "y":10}, {"x":0, "y":11}, {"x":1, "y":11}, {"x":2, "y":11}, {"x":3, "y":11}, {"x":4, "y":11}, {"x":5, "y":11}, {"x":6, "y":11}, {"x":7, "y":11}, {"x":8, "y":11}, {"x":9, "y":11}, {"x":10, "y":11}, {"x":11, "y":11}, {"x":12, "y":11}, {"x":13, "y":11}, {"x":14, "y":11}, {"x":0, "y":12}, {"x":1, "y":12}, {"x":2, "y":12}, {"x":3, "y":12}, {"x":4, "y":12}, {"x":5, "y":12}, {"x":6, "y":12}, {"x":7, "y":12}, {"x":8, "y":12}, {"x":9, "y":12}, {"x":10, "y":12}, {"x":11, "y":12}, {"x":12, "y":12}, {"x":13, "y":12}, {"x":14, "y":12}, {"x":0, "y":13}, {"x":1, "y":13}, {"x":2, "y":13}, {"x":3, "y":13}, {"x":4, "y":13}, {"x":5, "y":13}, {"x":6, "y":13}, {"x":7, "y":13}, {"x":8, "y":13}, {"x":9, "y":13}, {"x":10, "y":13}, {"x":11, "y":13}, {"x":12, "y":13}, {"x":13, "y":13}, {"x":14, "y":13}, {"x":0, "y":14}, {"x":1, "y":14}, {"x":2, "y":14}, {"x":3, "y":14}, {"x":4, "y":14}, {"x":5, "y":14}, {"x":6, "y":14}, {"x":7, "y":14}, {"x":8, "y":14}, {"x":9, "y":14}, {"x":10, "y":14}, {"x":11, "y":14}, {"x":12, "y":14}, {"x":13, "y":14}, {"x":14, "y":14}]
+          "layout": [
+              {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+              {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+              {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+              {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+              {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+              {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+              {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+              {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+              {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0},
+              {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0},
+              {"label": "k0A", "matrix": [0, 10], "x": 10, "y": 0},
+              {"label": "k0B", "matrix": [0, 11], "x": 11, "y": 0},
+              {"label": "k0C", "matrix": [0, 12], "x": 12, "y": 0},
+              {"label": "k0D", "matrix": [0, 13], "x": 13, "y": 0},
+              {"label": "k0E", "matrix": [0, 14], "x": 14, "y": 0},
+  
+              {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+              {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+              {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1},
+              {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1},
+              {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1},
+              {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1},
+              {"label": "k16", "matrix": [1, 6], "x": 6, "y": 1},
+              {"label": "k17", "matrix": [1, 7], "x": 7, "y": 1},
+              {"label": "k18", "matrix": [1, 8], "x": 8, "y": 1},
+              {"label": "k19", "matrix": [1, 9], "x": 9, "y": 1},
+              {"label": "k1A", "matrix": [1, 10], "x": 10, "y": 1},
+              {"label": "k1B", "matrix": [1, 11], "x": 11, "y": 1},
+              {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1},
+              {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1},
+              {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1},
+  
+              {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2},
+              {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2},
+              {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2},
+              {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2},
+              {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2},
+              {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2},
+              {"label": "k26", "matrix": [2, 6], "x": 6, "y": 2},
+              {"label": "k27", "matrix": [2, 7], "x": 7, "y": 2},
+              {"label": "k28", "matrix": [2, 8], "x": 8, "y": 2},
+              {"label": "k29", "matrix": [2, 9], "x": 9, "y": 2},
+              {"label": "k2A", "matrix": [2, 10], "x": 10, "y": 2},
+              {"label": "k2B", "matrix": [2, 11], "x": 11, "y": 2},
+              {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2},
+              {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2},
+              {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2},
+  
+              {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3},
+              {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3},
+              {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3},
+              {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3},
+              {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
+              {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3},
+              {"label": "k36", "matrix": [3, 6], "x": 6, "y": 3},
+              {"label": "k37", "matrix": [3, 7], "x": 7, "y": 3},
+              {"label": "k38", "matrix": [3, 8], "x": 8, "y": 3},
+              {"label": "k39", "matrix": [3, 9], "x": 9, "y": 3},
+              {"label": "k3A", "matrix": [3, 10], "x": 10, "y": 3},
+              {"label": "k3B", "matrix": [3, 11], "x": 11, "y": 3},
+              {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3},
+              {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3},
+              {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3},
+  
+              {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4},
+              {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4},
+              {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4},
+              {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4},
+              {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4},
+              {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4},
+              {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
+              {"label": "k47", "matrix": [4, 7], "x": 7, "y": 4},
+              {"label": "k48", "matrix": [4, 8], "x": 8, "y": 4},
+              {"label": "k49", "matrix": [4, 9], "x": 9, "y": 4},
+              {"label": "k4A", "matrix": [4, 10], "x": 10, "y": 4},
+              {"label": "k4B", "matrix": [4, 11], "x": 11, "y": 4},
+              {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4},
+              {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4},
+              {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4},
+  
+              {"label": "k50", "matrix": [5, 0], "x": 0, "y": 5},
+              {"label": "k51", "matrix": [5, 1], "x": 1, "y": 5},
+              {"label": "k52", "matrix": [5, 2], "x": 2, "y": 5},
+              {"label": "k53", "matrix": [5, 3], "x": 3, "y": 5},
+              {"label": "k54", "matrix": [5, 4], "x": 4, "y": 5},
+              {"label": "k55", "matrix": [5, 5], "x": 5, "y": 5},
+              {"label": "k56", "matrix": [5, 6], "x": 6, "y": 5},
+              {"label": "k57", "matrix": [5, 7], "x": 7, "y": 5},
+              {"label": "k58", "matrix": [5, 8], "x": 8, "y": 5},
+              {"label": "k59", "matrix": [5, 9], "x": 9, "y": 5},
+              {"label": "k5A", "matrix": [5, 10], "x": 10, "y": 5},
+              {"label": "k5B", "matrix": [5, 11], "x": 11, "y": 5},
+              {"label": "k5C", "matrix": [5, 12], "x": 12, "y": 5},
+              {"label": "k5D", "matrix": [5, 13], "x": 13, "y": 5},
+              {"label": "k5E", "matrix": [5, 14], "x": 14, "y": 5},
+  
+              {"label": "k60", "matrix": [6, 0], "x": 0, "y": 6},
+              {"label": "k61", "matrix": [6, 1], "x": 1, "y": 6},
+              {"label": "k62", "matrix": [6, 2], "x": 2, "y": 6},
+              {"label": "k63", "matrix": [6, 3], "x": 3, "y": 6},
+              {"label": "k64", "matrix": [6, 4], "x": 4, "y": 6},
+              {"label": "k65", "matrix": [6, 5], "x": 5, "y": 6},
+              {"label": "k66", "matrix": [6, 6], "x": 6, "y": 6},
+              {"label": "k67", "matrix": [6, 7], "x": 7, "y": 6},
+              {"label": "k68", "matrix": [6, 8], "x": 8, "y": 6},
+              {"label": "k69", "matrix": [6, 9], "x": 9, "y": 6},
+              {"label": "k6A", "matrix": [6, 10], "x": 10, "y": 6},
+              {"label": "k6B", "matrix": [6, 11], "x": 11, "y": 6},
+              {"label": "k6C", "matrix": [6, 12], "x": 12, "y": 6},
+              {"label": "k6D", "matrix": [6, 13], "x": 13, "y": 6},
+              {"label": "k6E", "matrix": [6, 14], "x": 14, "y": 6},
+  
+              {"label": "k70", "matrix": [7, 0], "x": 0, "y": 7},
+              {"label": "k71", "matrix": [7, 1], "x": 1, "y": 7},
+              {"label": "k72", "matrix": [7, 2], "x": 2, "y": 7},
+              {"label": "k73", "matrix": [7, 3], "x": 3, "y": 7},
+              {"label": "k74", "matrix": [7, 4], "x": 4, "y": 7},
+              {"label": "k75", "matrix": [7, 5], "x": 5, "y": 7},
+              {"label": "k76", "matrix": [7, 6], "x": 6, "y": 7},
+              {"label": "k77", "matrix": [7, 7], "x": 7, "y": 7},
+              {"label": "k78", "matrix": [7, 8], "x": 8, "y": 7},
+              {"label": "k79", "matrix": [7, 9], "x": 9, "y": 7},
+              {"label": "k7A", "matrix": [7, 10], "x": 10, "y": 7},
+              {"label": "k7B", "matrix": [7, 11], "x": 11, "y": 7},
+              {"label": "k7C", "matrix": [7, 12], "x": 12, "y": 7},
+              {"label": "k7D", "matrix": [7, 13], "x": 13, "y": 7},
+              {"label": "k7E", "matrix": [7, 14], "x": 14, "y": 7},
+  
+              {"label": "k80", "matrix": [8, 0], "x": 0, "y": 8},
+              {"label": "k81", "matrix": [8, 1], "x": 1, "y": 8},
+              {"label": "k82", "matrix": [8, 2], "x": 2, "y": 8},
+              {"label": "k83", "matrix": [8, 3], "x": 3, "y": 8},
+              {"label": "k84", "matrix": [8, 4], "x": 4, "y": 8},
+              {"label": "k85", "matrix": [8, 5], "x": 5, "y": 8},
+              {"label": "k86", "matrix": [8, 6], "x": 6, "y": 8},
+              {"label": "k87", "matrix": [8, 7], "x": 7, "y": 8},
+              {"label": "k88", "matrix": [8, 8], "x": 8, "y": 8},
+              {"label": "k89", "matrix": [8, 9], "x": 9, "y": 8},
+              {"label": "k8A", "matrix": [8, 10], "x": 10, "y": 8},
+              {"label": "k8B", "matrix": [8, 11], "x": 11, "y": 8},
+              {"label": "k8C", "matrix": [8, 12], "x": 12, "y": 8},
+              {"label": "k8D", "matrix": [8, 13], "x": 13, "y": 8},
+              {"label": "k8E", "matrix": [8, 14], "x": 14, "y": 8},
+  
+              {"label": "k90", "matrix": [9, 0], "x": 0, "y": 9},
+              {"label": "k91", "matrix": [9, 1], "x": 1, "y": 9},
+              {"label": "k92", "matrix": [9, 2], "x": 2, "y": 9},
+              {"label": "k93", "matrix": [9, 3], "x": 3, "y": 9},
+              {"label": "k94", "matrix": [9, 4], "x": 4, "y": 9},
+              {"label": "k95", "matrix": [9, 5], "x": 5, "y": 9},
+              {"label": "k96", "matrix": [9, 6], "x": 6, "y": 9},
+              {"label": "k97", "matrix": [9, 7], "x": 7, "y": 9},
+              {"label": "k98", "matrix": [9, 8], "x": 8, "y": 9},
+              {"label": "k99", "matrix": [9, 9], "x": 9, "y": 9},
+              {"label": "k9A", "matrix": [9, 10], "x": 10, "y": 9},
+              {"label": "k9B", "matrix": [9, 11], "x": 11, "y": 9},
+              {"label": "k9C", "matrix": [9, 12], "x": 12, "y": 9},
+              {"label": "k9D", "matrix": [9, 13], "x": 13, "y": 9},
+              {"label": "k9E", "matrix": [9, 14], "x": 14, "y": 9},
+  
+              {"label": "kA0", "matrix": [10, 0], "x": 0, "y": 10},
+              {"label": "kA1", "matrix": [10, 1], "x": 1, "y": 10},
+              {"label": "kA2", "matrix": [10, 2], "x": 2, "y": 10},
+              {"label": "kA3", "matrix": [10, 3], "x": 3, "y": 10},
+              {"label": "kA4", "matrix": [10, 4], "x": 4, "y": 10},
+              {"label": "kA5", "matrix": [10, 5], "x": 5, "y": 10},
+              {"label": "kA6", "matrix": [10, 6], "x": 6, "y": 10},
+              {"label": "kA7", "matrix": [10, 7], "x": 7, "y": 10},
+              {"label": "kA8", "matrix": [10, 8], "x": 8, "y": 10},
+              {"label": "kA9", "matrix": [10, 9], "x": 9, "y": 10},
+              {"label": "kAA", "matrix": [10, 10], "x": 10, "y": 10},
+              {"label": "kAB", "matrix": [10, 11], "x": 11, "y": 10},
+              {"label": "kAC", "matrix": [10, 12], "x": 12, "y": 10},
+              {"label": "kAD", "matrix": [10, 13], "x": 13, "y": 10},
+              {"label": "kAE", "matrix": [10, 14], "x": 14, "y": 10},
+  
+              {"label": "kB0", "matrix": [11, 0], "x": 0, "y": 11},
+              {"label": "kB1", "matrix": [11, 1], "x": 1, "y": 11},
+              {"label": "kB2", "matrix": [11, 2], "x": 2, "y": 11},
+              {"label": "kB3", "matrix": [11, 3], "x": 3, "y": 11},
+              {"label": "kB4", "matrix": [11, 4], "x": 4, "y": 11},
+              {"label": "kB5", "matrix": [11, 5], "x": 5, "y": 11},
+              {"label": "kB6", "matrix": [11, 6], "x": 6, "y": 11},
+              {"label": "kB7", "matrix": [11, 7], "x": 7, "y": 11},
+              {"label": "kB8", "matrix": [11, 8], "x": 8, "y": 11},
+              {"label": "kB9", "matrix": [11, 9], "x": 9, "y": 11},
+              {"label": "kBA", "matrix": [11, 10], "x": 10, "y": 11},
+              {"label": "kBB", "matrix": [11, 11], "x": 11, "y": 11},
+              {"label": "kBC", "matrix": [11, 12], "x": 12, "y": 11},
+              {"label": "kBD", "matrix": [11, 13], "x": 13, "y": 11},
+              {"label": "kBE", "matrix": [11, 14], "x": 14, "y": 11},
+  
+              {"label": "kC0", "matrix": [12, 0], "x": 0, "y": 12},
+              {"label": "kC1", "matrix": [12, 1], "x": 1, "y": 12},
+              {"label": "kC2", "matrix": [12, 2], "x": 2, "y": 12},
+              {"label": "kC3", "matrix": [12, 3], "x": 3, "y": 12},
+              {"label": "kC4", "matrix": [12, 4], "x": 4, "y": 12},
+              {"label": "kC5", "matrix": [12, 5], "x": 5, "y": 12},
+              {"label": "kC6", "matrix": [12, 6], "x": 6, "y": 12},
+              {"label": "kC7", "matrix": [12, 7], "x": 7, "y": 12},
+              {"label": "kC8", "matrix": [12, 8], "x": 8, "y": 12},
+              {"label": "kC9", "matrix": [12, 9], "x": 9, "y": 12},
+              {"label": "kCA", "matrix": [12, 10], "x": 10, "y": 12},
+              {"label": "kCB", "matrix": [12, 11], "x": 11, "y": 12},
+              {"label": "kCC", "matrix": [12, 12], "x": 12, "y": 12},
+              {"label": "kCD", "matrix": [12, 13], "x": 13, "y": 12},
+              {"label": "kCE", "matrix": [12, 14], "x": 14, "y": 12},
+  
+              {"label": "kD0", "matrix": [13, 0], "x": 0, "y": 13},
+              {"label": "kD1", "matrix": [13, 1], "x": 1, "y": 13},
+              {"label": "kD2", "matrix": [13, 2], "x": 2, "y": 13},
+              {"label": "kD3", "matrix": [13, 3], "x": 3, "y": 13},
+              {"label": "kD4", "matrix": [13, 4], "x": 4, "y": 13},
+              {"label": "kD5", "matrix": [13, 5], "x": 5, "y": 13},
+              {"label": "kD6", "matrix": [13, 6], "x": 6, "y": 13},
+              {"label": "kD7", "matrix": [13, 7], "x": 7, "y": 13},
+              {"label": "kD8", "matrix": [13, 8], "x": 8, "y": 13},
+              {"label": "kD9", "matrix": [13, 9], "x": 9, "y": 13},
+              {"label": "kDA", "matrix": [13, 10], "x": 10, "y": 13},
+              {"label": "kDB", "matrix": [13, 11], "x": 11, "y": 13},
+              {"label": "kDC", "matrix": [13, 12], "x": 12, "y": 13},
+              {"label": "kDD", "matrix": [13, 13], "x": 13, "y": 13},
+              {"label": "kDE", "matrix": [13, 14], "x": 14, "y": 13},
+  
+              {"label": "kE0", "matrix": [14, 0], "x": 0, "y": 14},
+              {"label": "kE1", "matrix": [14, 1], "x": 1, "y": 14},
+              {"label": "kE2", "matrix": [14, 2], "x": 2, "y": 14},
+              {"label": "kE3", "matrix": [14, 3], "x": 3, "y": 14},
+              {"label": "kE4", "matrix": [14, 4], "x": 4, "y": 14},
+              {"label": "kE5", "matrix": [14, 5], "x": 5, "y": 14},
+              {"label": "kE6", "matrix": [14, 6], "x": 6, "y": 14},
+              {"label": "kE7", "matrix": [14, 7], "x": 7, "y": 14},
+              {"label": "kE8", "matrix": [14, 8], "x": 8, "y": 14},
+              {"label": "kE9", "matrix": [14, 9], "x": 9, "y": 14},
+              {"label": "kEA", "matrix": [14, 10], "x": 10, "y": 14},
+              {"label": "kEB", "matrix": [14, 11], "x": 11, "y": 14},
+              {"label": "kEC", "matrix": [14, 12], "x": 12, "y": 14},
+              {"label": "kED", "matrix": [14, 13], "x": 13, "y": 14},
+              {"label": "kEE", "matrix": [14, 14], "x": 14, "y": 14}
+          ]
       }
   }
 }

keyboards/donutcables/scrabblepad/scrabblepad.h

@@ -1,53 +0,0 @@
-/* Copyright 2021 DonutCables <contact@donutcables.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"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,  \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,  \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E,  \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E,  \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E,  \
-    k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E,  \
-    k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E,  \
-    k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E,  \
-    k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E,  \
-    kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE,  \
-    kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE,  \
-    kC0, kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kCA, kCB, kCC, kCD, kCE,  \
-    kD0, kD1, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kDA, kDB, kDC, kDD, kDE,  \
-    kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, kE8, kE9, kEA, kEB, kEC, kED, kEE  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, }, \
-    { kC0, kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kCA, kCB, kCC, kCD, kCE, }, \
-    { kD0, kD1, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kDA, kDB, kDC, kDD, kDE, }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, kE8, kE9, kEA, kEB, kEC, kED, kEE  } \
-}

keyboards/doodboard/duckboard/duckboard.h

@@ -1,33 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * 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 LAYOUT( \
-         K01, K02, K03, K04, \
-         K11, K12, K13,      \
-         K21, K22, K23, K24, \
-         K31, K32, K33,      \
-    K40, K41, K42, K43, K44  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04 },   \
-    { KC_NO, K11,   K12,   K13,   KC_NO }, \
-    { KC_NO, K21,   K22,   K23,   K24 },   \
-    { KC_NO, K31,   K32,   K33,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44 }    \
-}

keyboards/doodboard/duckboard/info.json

@@ -23,29 +23,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "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},
 
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "y": 1, "h": 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": 1, "h": 2},
 
-                { "x": 1, "y": 3 },
-                { "x": 2, "y": 3 },
-                { "x": 3, "y": 3 },
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                { "x": 0, "y": 4 },
-                { "x": 1, "y": 4 },
-                { "x": 2, "y": 4 },
-                { "x": 3, "y": 4 },
-                { "x": 4, "y": 3, "h": 2 }
+                {"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": 3, "h": 2}
             ]
         }
     }

keyboards/doodboard/duckboard_r2/duckboard_r2.h

@@ -1,33 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * 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 LAYOUT( \
-         K01, K02, K03, K04, \
-         K11, K12, K13, K14, \
-         K21, K22, K23, K24, \
-    K30, K31, K32, K33, K34, \
-    K40, K41, K42, K43, K44  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04 }, \
-    { KC_NO, K11,   K12,   K13,   K14 }, \
-    { KC_NO, K21,   K22,   K23,   K24 }, \
-    { K30,   K31,   K32,   K33,   K34 }, \
-    { K40,   K41,   K42,   K43,   K44 }  \
-}

keyboards/doodboard/duckboard_r2/info.json

@@ -26,32 +26,32 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "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},
 
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
-                { "x": 4, "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},
 
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "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},
 
-                { "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": 0, "y": 4 },
-                { "x": 1, "y": 4 },
-                { "x": 2, "y": 4 },
-                { "x": 3, "y": 4 },
-                { "x": 4, "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},
+                {"matrix": [4, 4], "x": 4, "y": 4}
             ]
         }
     }

keyboards/draytronics/daisy/daisy.h

@@ -1,33 +0,0 @@
-/*Copyright 2021 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-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
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00,           K03, \
-  K10, K11, K12, K13, \
-  K20, K21, K22, K23  \
-) { \
-{ K00, _x_, _x_, K03, }, \
-{ K10, K11, K12, K13, }, \
-{ K20, K21, K22, K23, }, \
-}

keyboards/draytronics/daisy/info.json

@@ -27,18 +27,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"", "x":0, "y":0},
-                {"label":"", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"", "x":0, "y":1},
-                {"label":"", "x":1, "y":1},
-                {"label":"", "x":2, "y":1},
-                {"label":"", "x":3, "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},
 
-                {"label":"", "x":0, "y":2},
-                {"label":"", "x":1, "y":2},
-                {"label":"", "x":2, "y":2},
-                {"label":"", "x":3, "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}
             ]
         }
     }

keyboards/dumbpad/v0x/info.json

@@ -20,10 +20,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"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, 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": [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": [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}
             ]
         }
     }

keyboards/dumbpad/v0x/v0x.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v0x.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs

keyboards/dumbpad/v0x/v0x.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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 LAYOUT( \
-             k01, k02, k03, k04, \
-             k11, k12, k13, k14, \
-             k21, k22, k23, k24, \
-        k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    { k30,   k31, k32, k33, k34 }, \
-}

keyboards/dumbpad/v0x_dualencoder/info.json

@@ -21,10 +21,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}
+                {"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": [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": [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": [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}
             ]
         }
     }

keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v0x_dualencoder.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs

keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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 LAYOUT( \
-	  k00, k01, k02, k03, \
-	  k10, k11, k12, k13, \
-	  k20, k21, k22, k23, \
-	  k30, k31, k32, k33 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-}

keyboards/dumbpad/v0x_right/info.json

@@ -20,10 +20,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"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": [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": [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": [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}
             ]
         }
     }

keyboards/dumbpad/v0x_right/v0x_right.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v0x_right.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs

keyboards/dumbpad/v0x_right/v0x_right.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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 LAYOUT( \
-      k00, k01, k02, k03, \
-      k10, k11, k12, k13, \
-      k20, k21, k22, k23, \
-      k30, k31, k32, k33, k34 \
-) \
-{ \
-    { k00, k01, k02, k03, KC_NO }, \
-    { k10, k11, k12, k13, KC_NO }, \
-    { k20, k21, k22, k23, KC_NO }, \
-    { k30, k31, k32, k33, k34 }, \
-}

keyboards/dumbpad/v1x/info.json

@@ -20,10 +20,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"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, 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": [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": [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}
             ]
         }
     }

keyboards/dumbpad/v1x/v1x.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1x.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs

keyboards/dumbpad/v1x/v1x.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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 LAYOUT( \
-             k01, k02, k03, k04, \
-             k11, k12, k13, k14, \
-             k21, k22, k23, k24, \
-        k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    { k30,   k31, k32, k33, k34 }, \
-}

keyboards/dumbpad/v1x_dualencoder/info.json

@@ -21,10 +21,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"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, 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": [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": [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}
             ]
         }
     }

keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1x_dualencoder.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs

keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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 LAYOUT( \
-	       k01, k02, k03, k04, \
-	       k11, k12, k13, k14, \
-	       k21, k22, k23, k24, \
-	  k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    {   k30, k31, k32, k33, k34 }, \
-}

keyboards/dumbpad/v1x_oled/info.json

@@ -18,10 +18,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"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, 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": [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": [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}
             ]
         }
     }

keyboards/dumbpad/v1x_oled/v1x_oled.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1x_oled.h"
+#include "quantum.h"
 
 #include <stdio.h>
 char wpm_str[10];

keyboards/dumbpad/v1x_oled/v1x_oled.h

@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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 LAYOUT( \
-	       k01, k02, k03, k04, \
-	       k11, k12, k13, k14, \
-	       k21, k22, k23, k24, \
-	  k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    {   k30, k31, k32, k33, k34 }, \
-}