Move layouts for direct_pins boards to data driven (#19872)

keyboards/0xcb/1337/1337.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 "1337.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE

keyboards/0xcb/1337/1337.h

@@ -1,40 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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.
- */
-// clang-format off
- #define LAYOUT( \
-     KA1, KA2, KA3, \
-     KB1, KB2, KB3, \
-     KC1, KC2, KC3 \
- ) \
- { \
-     { KA1, KA2, KA3 }, \
-     { KB1, KB2, KB3 }, \
-     { KC1, KC2, KC3 } \
- }
-// clang-format on

keyboards/0xcb/1337/info.json

@@ -20,15 +20,15 @@
   "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}
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]},
+        {"x":0, "y":2, "matrix": [2, 0]},
+        {"x":1, "y":2, "matrix": [2, 1]},
+        {"x":2, "y":2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/0xcb/tutelpad/info.json

@@ -22,15 +22,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k03", "x": 0, "y": 0},
-                {"label": "k02", "x": 1, "y": 0},
-                {"label": "k01", "x": 2, "y": 0},
-                {"label": "k00", "x": 3, "y": 0},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
 
-                {"label": "k13", "x": 0, "y": 1},
-                {"label": "k12", "x": 1, "y": 1},
-                {"label": "k11", "x": 2, "y": 1},
-                {"label": "k10", "x": 3, "y": 1}
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]}
             ]
         }
     }

keyboards/0xcb/tutelpad/tutelpad.c

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

keyboards/0xcb/tutelpad/tutelpad.h

@@ -1,35 +0,0 @@
-/* Copyright 2022 ItsFiremanSam
- *
- * 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  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }  \
-}

keyboards/1k/1k.c

@@ -1,16 +0,0 @@
-/* Copyright 2020 zvecr<git@zvecr.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/>.
- */
-#include "1k.h"

keyboards/1k/1k.h

@@ -1,33 +0,0 @@
-/* Copyright 2020 zvecr<git@zvecr.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"
-
-/* 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_ortho_1x1( \
-	K01 \
-) \
-{ \
-  { K01 }, \
-}

keyboards/1k/info.json

@@ -16,7 +16,7 @@
   "layouts": {
     "LAYOUT_ortho_1x1": {
       "layout": [
-        {"x":0, "y":0}
+        {"x":0, "y":0, "matrix": [0, 0]}
       ]
     }
   }

keyboards/25keys/cassette42/cassette42.c

@@ -1,16 +0,0 @@
-/* Copyright 2019 monksoffunk
- *
- * 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/>.
- */
-#include "cassette42.h"

keyboards/25keys/cassette42/cassette42.h

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

keyboards/25keys/cassette42/info.json

@@ -17,7 +17,14 @@
     },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}]
+            "layout": [
+                {"x":0.5, "y":0.75, "matrix": [0, 4]},
+                {"x":2.5, "y":0.75, "matrix": [0, 5]},
+                {"x":0, "y":1.75, "matrix": [0, 0]},
+                {"x":1, "y":1.75, "matrix": [0, 1]},
+                {"x":2, "y":1.75, "matrix": [0, 2]},
+                {"x":3, "y":1.75, "matrix": [0, 3]}
+            ]
         }
     }
 }

keyboards/40percentclub/4pack/4pack.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 "4pack.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.

keyboards/40percentclub/4pack/4pack.h

@@ -1,33 +0,0 @@
-/* Copyright 2019 Arda Kilicdagi
- *
- * 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/40percentclub/4pack/info.json

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

keyboards/40percentclub/nano/info.json

@@ -16,9 +16,21 @@
       ["D1", "D0", "D4", "C6"]
     ]
   },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_2x4"
+  },
   "layouts": {
     "LAYOUT_ortho_2x4": {
-      "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}]
+      "layout": [
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":3, "y":0, "matrix": [0, 3]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]},
+        {"x":3, "y":1, "matrix": [1, 3]}
+      ]
     }
   }
 }

keyboards/40percentclub/nano/nano.c

@@ -1 +0,0 @@
-#include "nano.h"

keyboards/40percentclub/nano/nano.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4( \
-    k01, k02, k03, k04, \
-    k05, k06, k07, k08  \
-  ) { \
-    { k01, k02, k03, k04 }, \
-    { k05, k06, k07, k08 } \
-}
-
-#define LAYOUT LAYOUT_ortho_2x4 

keyboards/40percentclub/nein/info.json

@@ -20,15 +20,15 @@
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "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":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]},
+        {"x":0, "y":2, "matrix": [2, 0]},
+        {"x":1, "y":2, "matrix": [2, 1]},
+        {"x":2, "y":2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/40percentclub/nein/nein.c

@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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/>.
- */
-#include "nein.h"

keyboards/40percentclub/nein/nein.h

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

keyboards/40percentclub/sixpack/info.json

@@ -25,8 +25,12 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
           "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":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]}
           ]
         }
     }

keyboards/40percentclub/sixpack/sixpack.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 "sixpack.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     setPinOutput(B6);  // Backlight cathodes Col.3

keyboards/40percentclub/sixpack/sixpack.h

@@ -1,34 +0,0 @@
-/* Copyright 2020
- *
- * 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_ortho_2x3( \
-    k00, k01, k02, \
-    k10, k11, k12  \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }  \
-}

keyboards/8pack/8pack.c

@@ -1 +0,0 @@
-#include "8pack.h"

keyboards/8pack/8pack.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_8pack_rev11
-  #include "rev11.h"
-#endif
-
-#ifdef KEYBOARD_8pack_rev12
-  #include "rev12.h"
-#endif

keyboards/8pack/info.json

@@ -14,19 +14,5 @@
       ["F4", "F5", "F6", "F7"],
       ["B1", "B3", "B2", "B6"]
     ]
-  },
-  "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}
-      ]
-    }
   }
 }

keyboards/8pack/rev11/info.json

@@ -1,5 +1,19 @@
 {
     "usb": {
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0, "matrix": [1, 3]},
+                {"x":1, "y":0, "matrix": [1, 2]},
+                {"x":2, "y":0, "matrix": [1, 1]},
+                {"x":3, "y":0, "matrix": [1, 0]},
+                {"x":0, "y":1, "matrix": [0, 3]},
+                {"x":1, "y":1, "matrix": [0, 2]},
+                {"x":2, "y":1, "matrix": [0, 1]},
+                {"x":3, "y":1, "matrix": [0, 0]}
+            ]
+        }
     }
 }

keyboards/8pack/rev11/rev11.c

@@ -1 +0,0 @@
-#include "rev11.h"

keyboards/8pack/rev11/rev11.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "8pack.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-	K10, K11, K12, K13 \
-) { \
-	{ K13, K12, K11, K10 }, \
-    { K03, K02, K01, K00 } \
-}

keyboards/8pack/rev12/info.json

@@ -1,5 +1,19 @@
 {
     "usb": {
         "device_version": "0.0.2"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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":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]}
+            ]
+        }
     }
 }

keyboards/8pack/rev12/rev12.c

@@ -1 +0,0 @@
-#include "rev12.h"

keyboards/8pack/rev12/rev12.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "8pack.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-	K10, K11, K12, K13 \
-) { \
-    { K03, K02, K01, K00 }, \
-	{ K13, K12, K11, K10 } \
-}

keyboards/a_dux/a_dux.c

@@ -17,7 +17,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 "a_dux.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))

keyboards/a_dux/a_dux.h

@@ -1,49 +0,0 @@
-/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.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/>.
- */
-
-#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.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_2( \
-        L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
-        L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
-        L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
-                       L16, L17, R16, R17                 \
-    ) \
-    { \
-        { L01, L02, L03, L04, L05 }, \
-        { L06, L07, L08, L09, L10 }, \
-        { L11, L12, L13, L14, L15 }, \
-        { L16, L17, ___, ___, ___ }, \
-        { R01, R02, R03, R04, R05 }, \
-        { R06, R07, R08, R09, R10 }, \
-        { R11, R12, R13, R14, R15 }, \
-        { R16, R17, ___, ___, ___ }  \
-    }
-
-#define LAYOUT LAYOUT_split_3x5_2
-

keyboards/a_dux/info.json

@@ -35,50 +35,53 @@
         }
     },
     "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"x": 0, "y": 1.33},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
+                {"x": 0, "y": 1.33, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
 
-                {"x": 8, "y": 0.42},
-                {"x": 9, "y": 0.28},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0.31},
-                {"x": 12, "y": 1.33},
+                {"x": 8, "y": 0.42, "matrix": [4, 0]},
+                {"x": 9, "y": 0.28, "matrix": [4, 1]},
+                {"x": 10, "y": 0, "matrix": [4, 2]},
+                {"x": 11, "y": 0.31, "matrix": [4, 3]},
+                {"x": 12, "y": 1.33, "matrix": [4, 4]},
 
-                {"x": 0, "y": 2.33},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
+                {"x": 0, "y": 2.33, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
 
-                {"x": 8, "y": 1.42},
-                {"x": 9, "y": 1.28},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1.31},
-                {"x": 12, "y": 2.33},
+                {"x": 8, "y": 1.42, "matrix": [5, 0]},
+                {"x": 9, "y": 1.28, "matrix": [5, 1]},
+                {"x": 10, "y": 1, "matrix": [5, 2]},
+                {"x": 11, "y": 1.31, "matrix": [5, 3]},
+                {"x": 12, "y": 2.33, "matrix": [5, 4]},
 
-                {"x": 0, "y": 3.33},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
+                {"x": 0, "y": 3.33, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
 
-                {"x": 8, "y": 2.42},
-                {"x": 9, "y": 2.28},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2.31},
-                {"x": 12, "y": 3.33},
+                {"x": 8, "y": 2.42, "matrix": [6, 0]},
+                {"x": 9, "y": 2.28, "matrix": [6, 1]},
+                {"x": 10, "y": 2, "matrix": [6, 2]},
+                {"x": 11, "y": 2.31, "matrix": [6, 3]},
+                {"x": 12, "y": 3.33, "matrix": [6, 4]},
 
-                {"x": 4, "y": 3.75},
-                {"x": 5, "y": 4},
+                {"x": 4, "y": 3.75, "matrix": [3, 0]},
+                {"x": 5, "y": 4, "matrix": [3, 1]},
 
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 3.75}
+                {"x": 7, "y": 4, "matrix": [7, 0]},
+                {"x": 8, "y": 3.75, "matrix": [7, 1]}
             ]
         }
     }

keyboards/adafruit/macropad/info.json

@@ -25,19 +25,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":2, "y":0},
-                {"label":"Enter", "x":0, "y":1},
-                {"label":"KC_0", "x":1, "y":1},
-                {"label":"BackSpace", "x":2, "y":1},
-                {"label":"KC_7", "x":0, "y":2},
-                {"label":"KC_8", "x":1, "y":2},
-                {"label":"KC_9", "x":2, "y":2},
-                {"label":"KC_4", "x":0, "y":3},
-                {"label":"KC_5", "x":1, "y":3},
-                {"label":"KC_6", "x":2, "y":3},
-                {"label":"KC_1", "x":0, "y":4},
-                {"label":"KC_2", "x":1, "y":4},
-                {"label":"KC_3", "x":2, "y":4}
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":0, "y":4, "matrix": [4, 0]},
+                {"x":1, "y":4, "matrix": [4, 1]},
+                {"x":2, "y":4, "matrix": [4, 2]}
             ]
         }
     }

keyboards/adafruit/macropad/macropad.c

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

keyboards/adafruit/macropad/macropad.h

@@ -1,38 +0,0 @@
-/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.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 ___ KC_NO
-
-// clang-format off
- #define LAYOUT(  \
-             K02, \
-   K10, K11, K12, \
-   K20, K21, K22, \
-   K30, K31, K32, \
-   K40, K41, K42  \
- ) \
- { \
-   { ___, ___, K02 }, \
-   { K10, K11, K12 }, \
-   { K20, K21, K22 }, \
-   { K30, K31, K32 }, \
-   { K40, K41, K42 }  \
- }
-// clang-format on

keyboards/anavi/knob1/info.json

@@ -52,7 +52,7 @@
     "layouts": {
         "LAYOUT_k1": {
             "layout": [
-                { "label":"Mute", "x": 0, "y": 0 }
+                { "x": 0, "y": 0, "matrix": [0, 0] }
             ]
         }
     },

keyboards/anavi/knob1/knob1.c

@@ -1,7 +1,7 @@
 // Copyright 2022 Leon Anavi <leon@anavi.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "encoder.h"
+#include "quantum.h"
 #include <stdio.h>
 
 void keyboard_post_init_kb(void) {

keyboards/anavi/knob1/knob1.h

@@ -1,30 +0,0 @@
-/* Copyright 2022 Leon Anavi <leon@anavi.org>
- *
- * 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 ___ KC_NO
-
-// clang-format off
- #define LAYOUT_k1(  \
-   K02 \
- ) \
- { \
-   { K02 } \
- }
-// clang-format on

keyboards/anavi/macropad8/info.json

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

keyboards/anavi/macropad8/macropad8.c

@@ -1 +0,0 @@
-#include "macropad8.h"

keyboards/anavi/macropad8/macropad8.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4( \
-    k01, k02, k03, k04, \
-    k05, k06, k07, k08  \
-  ) { \
-    { k01, k02, k03, k04 }, \
-    { k05, k06, k07, k08 } \
-}

keyboards/arrayperipherals/1x4p1/1x4p1.c

@@ -1,18 +0,0 @@
-/*
-Copyright 2020 David Doan
-
-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/>.
-*/
-
-#include "1x4p1.h"

keyboards/arrayperipherals/1x4p1/1x4p1.h

@@ -1,26 +0,0 @@
-/*
-Copyright 2020 David Doan
-
-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_ortho_1x5( \
-    k01, k02, k03, k04, k05\
-  ) { \
-    { k01, k02, k03, k04, k05} \
-}

keyboards/arrayperipherals/1x4p1/info.json

@@ -18,11 +18,11 @@
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [
-        {"label": "K01", "x":0, "y":0}, 
-        {"label": "K02", "x":1, "y":0},
-        {"label": "K03", "x":2, "y":0},
-        {"label": "K04", "x":3, "y":0},
-        {"label": "K05", "x":4, "y":0}
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":3, "y":0, "matrix": [0, 3]},
+        {"x":4, "y":0, "matrix": [0, 4]}
       ]
     }
   }

keyboards/botanicalkeyboards/fm2u/fm2u.c

@@ -1,17 +0,0 @@
-/* Copyright 2020 mechmerlin
- *
- * 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/>.
- */
-
-#include "fm2u.h"

keyboards/botanicalkeyboards/fm2u/fm2u.h

@@ -1,113 +0,0 @@
-/* Copyright 2020 mechmerlin
- *
- * 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_1u( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_1u25( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_1u5( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_1u75( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_2u( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_2u25( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_2u75( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_3u( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_6u( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_6u25( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_7u( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT_isoenter( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-// Backward compatibility TODO: remove these
-#define LAYOUT_100u LAYOUT_1u
-#define LAYOUT_125u LAYOUT_1u25
-#define LAYOUT_150u LAYOUT_1u5
-#define LAYOUT_175u LAYOUT_1u75
-#define LAYOUT_200u LAYOUT_2u
-#define LAYOUT_225u LAYOUT_2u25
-#define LAYOUT_275u LAYOUT_2u75
-#define LAYOUT_300u LAYOUT_3u
-#define LAYOUT_600u LAYOUT_6u
-#define LAYOUT_625u LAYOUT_6u25
-#define LAYOUT_700u LAYOUT_7u
-#define LAYOUT_iso LAYOUT_isoenter

keyboards/botanicalkeyboards/fm2u/info.json

@@ -15,65 +15,79 @@
             ["C4"]
         ]
     },
+    "layout_aliases": {
+        "LAYOUT_100u": "LAYOUT_1u",
+        "LAYOUT_125u": "LAYOUT_1u25",
+        "LAYOUT_150u": "LAYOUT_1u5",
+        "LAYOUT_175u": "LAYOUT_1u75",
+        "LAYOUT_200u": "LAYOUT_2u",
+        "LAYOUT_225u": "LAYOUT_2u25",
+        "LAYOUT_275u": "LAYOUT_2u75",
+        "LAYOUT_300u": "LAYOUT_3u",
+        "LAYOUT_600u": "LAYOUT_6u",
+        "LAYOUT_625u": "LAYOUT_6u25",
+        "LAYOUT_700u": "LAYOUT_7u",
+        "LAYOUT_iso": "LAYOUT_isoenter"
+    },
     "layouts": {
         "LAYOUT_1u": {
             "layout": [
-                {"x": 0, "y": 0}
+                {"x": 0, "y": 0, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_1u25": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.25}
+                {"x": 0, "y": 0, "w": 1.25, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_1u5": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.50}
+                {"x": 0, "y": 0, "w": 1.50, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_1u75": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.75}
+                {"x": 0, "y": 0, "w": 1.75, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_2u": {
             "layout": [
-                {"x": 0, "y": 0, "w": 2}
+                {"x": 0, "y": 0, "w": 2, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_2u25": {
             "layout": [
-                {"x": 0, "y": 0, "w": 2.25}
+                {"x": 0, "y": 0, "w": 2.25, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_2u75": {
             "layout": [
-                {"x": 0, "y": 0, "w": 2.75}
+                {"x": 0, "y": 0, "w": 2.75, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_3u": {
             "layout": [
-                {"x": 0, "y": 0, "w": 3}
+                {"x": 0, "y": 0, "w": 3, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_6u": {
             "layout": [
-                {"x": 0, "y": 0, "w": 6}
+                {"x": 0, "y": 0, "w": 6, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_6u25": {
             "layout": [
-                {"x": 0, "y": 0, "w": 6.25}
+                {"x": 0, "y": 0, "w": 6.25, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_7u": {
             "layout": [
-                {"x": 0, "y": 0, "w": 7}
+                {"x": 0, "y": 0, "w": 7, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_isoenter": {
             "layout": [
-                {"x": 0.25, "y": 0, "w": 1.25, "h": 2}
+                {"x": 0.25, "y": 0, "w": 1.25, "h": 2, "matrix": [0, 0]}
             ]
         }
     }

keyboards/bpiphany/sixshooter/info.json

@@ -18,7 +18,14 @@
   },
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}]
+      "layout": [
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]}
+      ]
     }
   }
 }

keyboards/bpiphany/sixshooter/sixshooter.h

@@ -2,14 +2,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 } \
-}
-
 inline void sixshooter_led_0_on(void)    { DDRB |=  (1<<6); PORTB |=  (1<<6); }
 inline void sixshooter_led_1_on(void)    { DDRC |=  (1<<7); PORTC |=  (1<<7); }
 inline void sixshooter_led_2_on(void)    { DDRD |=  (1<<0); PORTD |=  (1<<0); }

keyboards/clueboard/california/california.c

@@ -1 +0,0 @@
-#include "california.h"

keyboards/clueboard/california/california.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "quantum.h"

keyboards/crypt_macro/crypt_macro.c

@@ -1,16 +0,0 @@
-/* Copyright 2022 Yiancar-Designs
- *
- * 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/>.
- */
-#include "crypt_macro.h"

keyboards/crypt_macro/crypt_macro.h

@@ -1,28 +0,0 @@
-/* Copyright 2022 Yiancar-Designs
- *
- * 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 XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, \
-         K11       \
-) { \
-    { K00, K01, K02 }, \
-    { XXX, K11, XXX }  \
-}

keyboards/crypt_macro/info.json

@@ -18,7 +18,12 @@
     },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}]
+            "layout": [
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":0.5, "y":1, "w":2, "matrix": [1, 1]}
+            ]
         }
     }
 }

keyboards/dailycraft/owl8/info.json

@@ -18,25 +18,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"x":0, "y":0, "matrix": [0, 12]},
+                {"x":1, "y":0, "matrix": [0, 13]},
+                {"x":2, "y":0, "matrix": [0, 14]},
+                {"x":3, "y":0, "matrix": [0, 15]},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
+                {"x":0, "y":1.25, "matrix": [0, 8]},
+                {"x":1, "y":1.25, "matrix": [0, 9]},
+                {"x":2, "y":1.25, "matrix": [0, 10]},
+                {"x":3, "y":1.25, "matrix": [0, 11]},
 
-                {"x":0, "y":2.5},
-                {"x":1, "y":2.5},
-                {"x":2, "y":2.5},
-                {"x":3, "y":2.5},
+                {"x":0, "y":2.5, "matrix": [0, 0]},
+                {"x":1, "y":2.5, "matrix": [0, 1]},
+                {"x":2, "y":2.5, "matrix": [0, 2]},
+                {"x":3, "y":2.5, "matrix": [0, 3]},
 
-                {"x":0, "y":3.5},
-                {"x":1, "y":3.5},
-                {"x":2, "y":3.5},
-                {"x":3, "y":3.5}
+                {"x":0, "y":3.5, "matrix": [0, 4]},
+                {"x":1, "y":3.5, "matrix": [0, 5]},
+                {"x":2, "y":3.5, "matrix": [0, 6]},
+                {"x":3, "y":3.5, "matrix": [0, 7]}
             ]
         }
     }

keyboards/dailycraft/owl8/owl8.c

@@ -1,17 +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/>.
- */
-
-#include "owl8.h"

keyboards/dailycraft/owl8/owl8.h

@@ -1,38 +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( \
-    k012, k013, k014, k015, \
-    k008, k009, k010, k011, \
-    k000, k001, k002, k003, \
-    k004, k005, k006, k007 \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 } \
-}

keyboards/dailycraft/stickey4/info.json

@@ -18,15 +18,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
 
-                {"label": "Encoder 1 CCW", "x": 0, "y": 1},
-                {"label": "Encoder 1 CW", "x": 1, "y": 1},
-                {"label": "Encoder 2 CCW", "x": 2, "y": 1},
-                {"label": "Encoder 2 CW", "x": 3, "y": 1}
+                {"label": "Encoder 1 CCW", "x": 0, "y": 1, "matrix": [0, 4]},
+                {"label": "Encoder 1 CW", "x": 1, "y": 1, "matrix": [0, 5]},
+                {"label": "Encoder 2 CCW", "x": 2, "y": 1, "matrix": [0, 6]},
+                {"label": "Encoder 2 CW", "x": 3, "y": 1, "matrix": [0, 7]}
             ]
         }
     }

keyboards/dailycraft/stickey4/stickey4.c

@@ -1,17 +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/>.
- */
-
-#include "stickey4.h"

keyboards/dailycraft/stickey4/stickey4.h

@@ -1,36 +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, k05, k06, k07 \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07 } \
-}

keyboards/dekunukem/duckypad/duckypad.c

@@ -18,7 +18,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 "duckypad.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 

keyboards/dekunukem/duckypad/duckypad.h

@@ -1,32 +0,0 @@
-/*
-
-QMK Firmware for dekuNukem/duckyPad
-
-Copyright (C) 2020 Anthony Som
-
-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 3 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, k010, k011, \
-    k012, k013, k014, \
-    k015, k016 \
-) {{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, k015, k016}}

keyboards/dekunukem/duckypad/info.json

@@ -18,23 +18,23 @@
     "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},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [0, 3]},
+                {"x": 1, "y": 1, "matrix": [0, 4]},
+                {"x": 2, "y": 1, "matrix": [0, 5]},
+                {"x": 0, "y": 2, "matrix": [0, 6]},
+                {"x": 1, "y": 2, "matrix": [0, 7]},
+                {"x": 2, "y": 2, "matrix": [0, 8]},
+                {"x": 0, "y": 3, "matrix": [0, 9]},
+                {"x": 1, "y": 3, "matrix": [0, 10]},
+                {"x": 2, "y": 3, "matrix": [0, 11]},
+                {"x": 0, "y": 4, "matrix": [0, 12]},
+                {"x": 1, "y": 4, "matrix": [0, 13]},
+                {"x": 2, "y": 4, "matrix": [0, 14]},
+                {"x": 3, "y": 4, "matrix": [0, 15]},
+                {"x": 4, "y": 4, "matrix": [0, 16]}
             ]
         }
     }

keyboards/ferris/0_1/info.json

@@ -7,5 +7,53 @@
         "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["split_3x5_2"],
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"x": 0, "y": 0.93},
+                {"x": 1, "y": 0.31},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0.28},
+                {"x": 4, "y": 0.42},
+
+                {"x": 7, "y": 0.42},
+                {"x": 8, "y": 0.28},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0.31},
+                {"x": 11, "y": 0.93},
+
+                {"x": 0, "y": 1.93},
+                {"x": 1, "y": 1.31},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1.28},
+                {"x": 4, "y": 1.42},
+
+                {"x": 7, "y": 1.42},
+                {"x": 8, "y": 1.28},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1.31},
+                {"x": 11, "y": 1.93},
+
+                {"x": 0, "y": 2.93},
+                {"x": 1, "y": 2.31},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2.28},
+                {"x": 4, "y": 2.42},
+
+                {"x": 7, "y": 2.42},
+                {"x": 8, "y": 2.28},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2.31},
+                {"x": 11, "y": 2.93},
+
+                {"x": 3.5, "y": 3.75},
+                {"x": 4.5, "y": 4},
+
+                {"x": 6.5, "y": 4},
+                {"x": 7.5, "y": 3.75}
+            ]
+        }
+    }
 }

keyboards/ferris/0_2/info.json

@@ -5,5 +5,53 @@
         "device_version": "0.0.2"
     },
     "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["split_3x5_2"],
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"x": 0, "y": 0.93},
+                {"x": 1, "y": 0.31},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0.28},
+                {"x": 4, "y": 0.42},
+
+                {"x": 7, "y": 0.42},
+                {"x": 8, "y": 0.28},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0.31},
+                {"x": 11, "y": 0.93},
+
+                {"x": 0, "y": 1.93},
+                {"x": 1, "y": 1.31},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1.28},
+                {"x": 4, "y": 1.42},
+
+                {"x": 7, "y": 1.42},
+                {"x": 8, "y": 1.28},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1.31},
+                {"x": 11, "y": 1.93},
+
+                {"x": 0, "y": 2.93},
+                {"x": 1, "y": 2.31},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2.28},
+                {"x": 4, "y": 2.42},
+
+                {"x": 7, "y": 2.42},
+                {"x": 8, "y": 2.28},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2.31},
+                {"x": 11, "y": 2.93},
+
+                {"x": 3.5, "y": 3.75},
+                {"x": 4.5, "y": 4},
+
+                {"x": 6.5, "y": 4},
+                {"x": 7.5, "y": 3.75}
+            ]
+        }
+    }
 }

keyboards/ferris/info.json

@@ -1,52 +1,4 @@
 {
     "url": "https://github.com/pierrechevalier83/ferris/",
-    "maintainer": "@pierrec83",
-    "community_layouts": ["split_3x5_2"],
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"x": 0, "y": 0.93},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
-
-                {"x": 7, "y": 0.42},
-                {"x": 8, "y": 0.28},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0.31},
-                {"x": 11, "y": 0.93},
-
-                {"x": 0, "y": 1.93},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
-
-                {"x": 7, "y": 1.42},
-                {"x": 8, "y": 1.28},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1.31},
-                {"x": 11, "y": 1.93},
-
-                {"x": 0, "y": 2.93},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
-
-                {"x": 7, "y": 2.42},
-                {"x": 8, "y": 2.28},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2.31},
-                {"x": 11, "y": 2.93},
-
-                {"x": 3.5, "y": 3.75},
-                {"x": 4.5, "y": 4},
-
-                {"x": 6.5, "y": 4},
-                {"x": 7.5, "y": 3.75}
-            ]
-        }
-    }
+    "maintainer": "@pierrec83"
 }

keyboards/ferris/sweep/info.json

@@ -31,5 +31,56 @@
                 ]
             }
         }
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"x": 0, "y": 0.93, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
+
+                {"x": 7, "y": 0.42, "matrix": [4, 0]},
+                {"x": 8, "y": 0.28, "matrix": [4, 1]},
+                {"x": 9, "y": 0, "matrix": [4, 2]},
+                {"x": 10, "y": 0.31, "matrix": [4, 3]},
+                {"x": 11, "y": 0.93, "matrix": [4, 4]},
+
+                {"x": 0, "y": 1.93, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
+
+                {"x": 7, "y": 1.42, "matrix": [5, 0]},
+                {"x": 8, "y": 1.28, "matrix": [5, 1]},
+                {"x": 9, "y": 1, "matrix": [5, 2]},
+                {"x": 10, "y": 1.31, "matrix": [5, 3]},
+                {"x": 11, "y": 1.93, "matrix": [5, 4]},
+
+                {"x": 0, "y": 2.93, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
+
+                {"x": 7, "y": 2.42, "matrix": [6, 0]},
+                {"x": 8, "y": 2.28, "matrix": [6, 1]},
+                {"x": 9, "y": 2, "matrix": [6, 2]},
+                {"x": 10, "y": 2.31, "matrix": [6, 3]},
+                {"x": 11, "y": 2.93, "matrix": [6, 4]},
+
+                {"x": 3.5, "y": 3.75, "matrix": [3, 0]},
+                {"x": 4.5, "y": 4, "matrix": [3, 1]},
+
+                {"x": 6.5, "y": 4, "matrix": [7, 0]},
+                {"x": 7.5, "y": 3.75, "matrix": [7, 1]}
+            ]
+        }
     }
 }

keyboards/ferris/sweep/sweep.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 "sweep.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))

keyboards/ferris/sweep/sweep.h

@@ -1,48 +0,0 @@
-/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.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/>.
- */
-
-#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.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_2( \
-        L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
-        L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
-        L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
-                  L16, L17, R16, R17       \
-    ) \
-    { \
-        { L01, L02, L03, L04, L05 }, \
-        { L06, L07, L08, L09, L10 }, \
-        { L11, L12, L13, L14, L15 }, \
-        { L16, L17, ___, ___ , ___}, \
-        { R01, R02, R03, R04, R05 }, \
-        { R06, R07, R08, R09, R10 }, \
-        { R11, R12, R13, R14, R15 }, \
-        { R16, R17, ___, ___, ___ }  \
-    }
-
-#define LAYOUT LAYOUT_split_3x5_2

keyboards/geekboards/macropad_v2/info.json

@@ -20,15 +20,15 @@
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [
-        {"label": "K0", "x": 0, "y": 0},
-        {"label": "K1", "x": 1, "y": 0},
-        {"label": "K2", "x": 2, "y": 0},
-        {"label": "K3", "x": 3, "y": 0},
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
 
-        {"label": "K4", "x": 0, "y": 1},
-        {"label": "K5", "x": 1, "y": 1},
-        {"label": "K6", "x": 2, "y": 1},
-        {"label": "K7", "x": 3, "y": 1}
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]}
       ]
     }
   }

keyboards/geekboards/macropad_v2/macropad_v2.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 QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {

keyboards/geekboards/macropad_v2/macropad_v2.h

@@ -1,26 +0,0 @@
-/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 } \
-}

keyboards/handwired/aball/aball.c

@@ -1,17 +0,0 @@
-/* Copyright 2020 Richard Sutherland
- *
- * 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/>.
- */
-
-#include "aball.h"

keyboards/handwired/aball/aball.h

@@ -1,21 +0,0 @@
-/* Copyright 2020 Richard Sutherland
- *
- * 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) {{ k00 }}

keyboards/handwired/aball/info.json

@@ -18,7 +18,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}
+                {"x":0, "y":0, "matrix": [0, 0]}
             ]
         }
     }

keyboards/handwired/bdn9_ble/bdn9_ble.c

@@ -1 +0,0 @@
-#include "bdn9_ble.h"

keyboards/handwired/bdn9_ble/bdn9_ble.h

@@ -1,37 +0,0 @@
-/* Copyright 2019 Danny Nguyen <danny@keeb.io>
- *
- * 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( \
-    KA1, KA2, KA3, \
-    KB1, KB2, KB3, \
-    KC1, KC2, KC3 \
-) \
-{ \
-    { KA1, KA2, KA3 }, \
-    { KB1, KB2, KB3 }, \
-    { KC1, KC2, KC3 } \
-}

keyboards/handwired/bdn9_ble/info.json

@@ -20,15 +20,15 @@
   "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}
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]},
+        {"x":0, "y":2, "matrix": [2, 0]},
+        {"x":1, "y":2, "matrix": [2, 1]},
+        {"x":2, "y":2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/handwired/bento/bento.c

@@ -1,16 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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/>.
- */
-#include "bento.h"

keyboards/handwired/bento/bento.h

@@ -1,20 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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
-
-#ifdef KEYBOARD_handwired_bento_rev1
-    #include "rev1.h"
-#endif

keyboards/handwired/bento/rev1/info.json

@@ -19,12 +19,12 @@
   "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":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]}
       ]
     }
   }

keyboards/handwired/bento/rev1/rev1.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 "rev1.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE

keyboards/handwired/bento/rev1/rev1.h

@@ -1,36 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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 "bento.h"
-#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( \
-    KA1, KA2, KA3, \
-    KB1, KB2, KB3 \
-) \
-{ \
-    { KA1, KA2, KA3 }, \
-    { KB1, KB2, KB3 } \
-}

keyboards/handwired/dc/mc/001/001.c

@@ -1,17 +0,0 @@
-/* Copyright 2021 Daniel Cormier
- *
- * 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/>.
- */
-
-#include "001.h"

keyboards/handwired/dc/mc/001/001.h

@@ -1,33 +0,0 @@
-/* Copyright 2021 Daniel Cormier
- *
- * 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 \
-) { \
-    { k00, k01, k02, k03, k04 } \
-}

keyboards/handwired/dc/mc/001/info.json

@@ -22,11 +22,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Mute", "x": 0, "y": 0},
-                {"label": "Stop", "x": 1, "y": 0},
-                {"label": "Previous", "x": 2, "y": 0},
-                {"label": "Next", "x": 3, "y": 0},
-                {"label": "Play/Pause", "x": 4, "y": 0}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]}
             ]
         }
     }

keyboards/handwired/lemonpad/info.json

@@ -19,13 +19,13 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
 
-                {"label": "k10", "x": 0, "y": 1},
-                {"label": "k11", "x": 1, "y": 1},
-                {"label": "k12", "x": 2, "y": 1}
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }

keyboards/handwired/lemonpad/lemonpad.c

@@ -1,17 +0,0 @@
-/* Copyright 2022 dari-studios (@dari-studios)
- *
- * 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/>.
- */
-
-#include "lemonpad.h"

keyboards/handwired/lemonpad/lemonpad.h

@@ -1,38 +0,0 @@
-/* Copyright 2022 dari-studios (@dari-studios)
- *
- * 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.
- */
-
-//Top 3 on the usb port side, bottom 3 on the opposite side
- 
-#define LAYOUT(         \
-      k00, k01, k02,    \
-      k10, k11, k12    	\
-) {                     \
-    { k00, k01, k02 },  \
-    { k10, k11, k12 },  \
-}

keyboards/handwired/stream_cheap/2x3/2x3.c

@@ -1 +0,0 @@
-#include "2x3.h"

keyboards/handwired/stream_cheap/2x3/2x3.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x3( \
-	K00, K01, K02, \
-	K03, K04, K05  \
-) { \
-	{ K00,   K01,   K02}, \
-	{ K03,   K04,   K05}  \
-}

keyboards/handwired/stream_cheap/2x3/info.json

@@ -20,12 +20,12 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":0, "y":1},
-                {"label":"K04", "x":1, "y":1},
-                {"label":"K05", "x":2, "y":1}
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]}
             ]
         }
     }

keyboards/handwired/stream_cheap/2x4/2x4.c

@@ -1 +0,0 @@
-#include "2x4.h"

keyboards/handwired/stream_cheap/2x4/2x4.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4(\
-    K00, K01, K02, K03, \
-    K04, K05, K06, K07  \
-) \
-  { \
-    { K00,K01,K02,K03}, \
-	{ K04,K05,K06,K07}  \
-}

keyboards/handwired/stream_cheap/2x4/info.json

@@ -19,14 +19,14 @@
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "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":0, "y":1},
-                {"label":"K05", "x":1, "y":1},
-                {"label":"K06", "x":2, "y":1},
-                {"label":"K07", "x":3, "y":1}
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]}
             ]
         }
     }

keyboards/handwired/stream_cheap/2x5/2x5.c

@@ -1 +0,0 @@
-#include "2x5.h"