diff --git a/keyboards/10bleoledhub/10bleoledhub.h b/keyboards/10bleoledhub/10bleoledhub.h
deleted file mode 100644
index ad73017e1238..000000000000
--- a/keyboards/10bleoledhub/10bleoledhub.h
+++ /dev/null
@@ -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 .
- */
-#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 } \
-}
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index 4f5cd9564a04..f6db49b9e620 100644
--- a/keyboards/10bleoledhub/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/2key2crawl/2key2crawl.h b/keyboards/2key2crawl/2key2crawl.h
deleted file mode 100644
index 6e8ee6420851..000000000000
--- a/keyboards/2key2crawl/2key2crawl.h
+++ /dev/null
@@ -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 }, \
-}
-
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
index 1421a7b1e038..e5f9dc2942bf 100644
--- a/keyboards/2key2crawl/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/3keyecosystem/2key2/2key2.c b/keyboards/3keyecosystem/2key2/2key2.c
index 17e87b412eae..11f4b8b21755 100644
--- a/keyboards/3keyecosystem/2key2/2key2.c
+++ b/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 .
*/
-#include "2key2.h"
+#include "quantum.h"
// RGB Matrix configuration
// based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration
diff --git a/keyboards/3keyecosystem/2key2/2key2.h b/keyboards/3keyecosystem/2key2/2key2.h
deleted file mode 100644
index 05af99101a47..000000000000
--- a/keyboards/3keyecosystem/2key2/2key2.h
+++ /dev/null
@@ -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 .
-*/
-#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 } \
-}
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index 398a4d3439a5..acfb024da22a 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/4by3/4by3.h b/keyboards/4by3/4by3.h
deleted file mode 100644
index b41628137a6f..000000000000
--- a/keyboards/4by3/4by3.h
+++ /dev/null
@@ -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
diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json
index ade503696c50..5a64ffcd5312 100644
--- a/keyboards/4by3/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/9key/9key.h b/keyboards/9key/9key.h
deleted file mode 100644
index ad809da4b814..000000000000
--- a/keyboards/9key/9key.h
+++ /dev/null
@@ -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 } \
-}
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
index e4109ef2aa91..7d1538ee716c 100644
--- a/keyboards/9key/info.json
+++ b/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}
+ ]
}
}
}
diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
index 693faa86b520..bf986589f043 100644
--- a/keyboards/abstract/ellipse/rev1/info.json
+++ b/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}
+ ]
}
}
}
diff --git a/keyboards/abstract/ellipse/rev1/rev1.h b/keyboards/abstract/ellipse/rev1/rev1.h
deleted file mode 100644
index de8b9bacb6c5..000000000000
--- a/keyboards/abstract/ellipse/rev1/rev1.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
-
diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json
index e031108f5119..4cfac9dc5923 100644
--- a/keyboards/afternoonlabs/gust/rev1/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h
deleted file mode 100644
index 635a5877bbf5..000000000000
--- a/keyboards/afternoonlabs/gust/rev1/rev1.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json
index 0bd317c1a43a..9f86182a3364 100644
--- a/keyboards/aplyard/aplx6/info.json
+++ b/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}
- ]
- }
}
}
diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json
index 167699150fb8..943624fb8f22 100644
--- a/keyboards/aplyard/aplx6/rev1/info.json
+++ b/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}
+ ]
+ }
+ }
}
diff --git a/keyboards/aplyard/aplx6/rev1/rev1.h b/keyboards/aplyard/aplx6/rev1/rev1.h
deleted file mode 100644
index 6990d388e734..000000000000
--- a/keyboards/aplyard/aplx6/rev1/rev1.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
- k000, k001, k002, \
- k100, k101, k102 \
-) \
-{ \
- { k000, k001, k002 }, \
- { k100, k101, k102 } \
-}
-
diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json
index 726dab814c88..2dc54180eb5c 100644
--- a/keyboards/aplyard/aplx6/rev2/info.json
+++ b/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}
+ ]
+ }
+ }
}
diff --git a/keyboards/aplyard/aplx6/rev2/rev2.h b/keyboards/aplyard/aplx6/rev2/rev2.h
deleted file mode 100644
index 193c6cd51c38..000000000000
--- a/keyboards/aplyard/aplx6/rev2/rev2.h
+++ /dev/null
@@ -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 .
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
- k000, k001, k002, \
- k100, k101, k102 \
-) \
-{ \
- { k000, k001, k002 }, \
- { k100, k101, k102 } \
-}
-
-
diff --git a/keyboards/axolstudio/helpo/helpo.h b/keyboards/axolstudio/helpo/helpo.h
deleted file mode 100644
index f6b0e07964ec..000000000000
--- a/keyboards/axolstudio/helpo/helpo.h
+++ /dev/null
@@ -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 .
- */
-
-#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, } \
-}
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json
index c6d1d58f6c57..cf74098bf5ab 100644
--- a/keyboards/axolstudio/helpo/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json
index 73b8a74f2a32..96e67d507839 100644
--- a/keyboards/biacco42/meishi/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/biacco42/meishi/meishi.h b/keyboards/biacco42/meishi/meishi.h
deleted file mode 100644
index 61b9f628dbc7..000000000000
--- a/keyboards/biacco42/meishi/meishi.h
+++ /dev/null
@@ -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 .
- */
-
-#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 }\
-}
-
diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json
index ae5c28ddfc73..fb883569680e 100644
--- a/keyboards/biacco42/meishi2/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/biacco42/meishi2/meishi2.h b/keyboards/biacco42/meishi2/meishi2.h
deleted file mode 100644
index 776e0b0e1d6c..000000000000
--- a/keyboards/biacco42/meishi2/meishi2.h
+++ /dev/null
@@ -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 .
- */
-#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 } \
-}
diff --git a/keyboards/boston_meetup/boston_meetup.h b/keyboards/boston_meetup/boston_meetup.h
deleted file mode 100644
index 4b000a1ca51a..000000000000
--- a/keyboards/boston_meetup/boston_meetup.h
+++ /dev/null
@@ -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 } \
-}
diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json
index 2c25d4ff0685..6be55c249cd6 100644
--- a/keyboards/boston_meetup/info.json
+++ b/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}
+ ]
+ }
}
}
diff --git a/keyboards/bthlabs/geekpad/geekpad.h b/keyboards/bthlabs/geekpad/geekpad.h
deleted file mode 100644
index 4dc6800fe592..000000000000
--- a/keyboards/bthlabs/geekpad/geekpad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019-present Tomek Wójcik
- *
- * 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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/info.json
index 8200e7d03657..c1b0ef54c03b 100644
--- a/keyboards/bthlabs/geekpad/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/capsunlocked/cu7/cu7.h b/keyboards/capsunlocked/cu7/cu7.h
deleted file mode 100644
index 2f30dbb2d57e..000000000000
--- a/keyboards/capsunlocked/cu7/cu7.h
+++ /dev/null
@@ -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 .
-*/
-#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 } \
-}
-
diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
index c210f9a96c4f..ba3d10471bde 100644
--- a/keyboards/capsunlocked/cu7/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/catch22/catch22.h b/keyboards/catch22/catch22.h
deleted file mode 100644
index 6eefb9cd5167..000000000000
--- a/keyboards/catch22/catch22.h
+++ /dev/null
@@ -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 .
-*/
-#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 }, \
-}
diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json
index f9a9b08ff73d..1aa4664ef513 100644
--- a/keyboards/catch22/info.json
+++ b/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}
+ ]
}
}
}
diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json
index a442db236d1c..e86d162ace12 100644
--- a/keyboards/ckeys/thedora/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c
index 58953f7437ee..c9c4069534e5 100755
--- a/keyboards/ckeys/thedora/thedora.c
+++ b/keyboards/ckeys/thedora/thedora.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "thedora.h"
+#include "quantum.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) {
diff --git a/keyboards/ckeys/thedora/thedora.h b/keyboards/ckeys/thedora/thedora.h
deleted file mode 100755
index 5e66f6716680..000000000000
--- a/keyboards/ckeys/thedora/thedora.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json
index 03649056f26f..d6029eeabb84 100644
--- a/keyboards/ckeys/washington/info.json
+++ b/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}
+ ]
}
}
}
diff --git a/keyboards/ckeys/washington/washington.h b/keyboards/ckeys/washington/washington.h
deleted file mode 100644
index 6fba7b328110..000000000000
--- a/keyboards/ckeys/washington/washington.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/clawsome/bookerboard/bookerboard.h b/keyboards/clawsome/bookerboard/bookerboard.h
deleted file mode 100644
index 11ece7594bdc..000000000000
--- a/keyboards/clawsome/bookerboard/bookerboard.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/info.json
index d0ac88f54806..8c6a4dc0f9f4 100644
--- a/keyboards/clawsome/bookerboard/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/clawsome/doodle/doodle.h b/keyboards/clawsome/doodle/doodle.h
deleted file mode 100644
index 131d50ad2600..000000000000
--- a/keyboards/clawsome/doodle/doodle.h
+++ /dev/null
@@ -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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, \
- K10, K11, K12 \
-) { \
- { K00, K01, K02 }, \
- { K10, K11, K12 } \
-}
diff --git a/keyboards/clawsome/doodle/info.json b/keyboards/clawsome/doodle/info.json
index 8b675684eb59..e7883a6f1a3b 100644
--- a/keyboards/clawsome/doodle/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/clawsome/fightpad/fightpad.h b/keyboards/clawsome/fightpad/fightpad.h
deleted file mode 100644
index ff92afd6bb23..000000000000
--- a/keyboards/clawsome/fightpad/fightpad.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/clawsome/fightpad/info.json b/keyboards/clawsome/fightpad/info.json
index 3aad0874869f..fbd4673dd781 100644
--- a/keyboards/clawsome/fightpad/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/info.json
index b4875077f463..269c4b86027b 100644
--- a/keyboards/clawsome/gamebuddy/v1_0/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h b/keyboards/clawsome/gamebuddy/v1_0/v1_0.h
deleted file mode 100644
index f1ee9ab357fd..000000000000
--- a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/info.json
index 3330139b5939..3709bbbe3c49 100644
--- a/keyboards/clawsome/gamebuddy/v1_m/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h b/keyboards/clawsome/gamebuddy/v1_m/v1_m.h
deleted file mode 100644
index 23e4d03bbc7f..000000000000
--- a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h
+++ /dev/null
@@ -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 .
- */
-
-#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 }, \
-}
diff --git a/keyboards/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/info.json
index 3c813bd36a09..5996c9d8f482 100644
--- a/keyboards/clawsome/luggage_rack/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/clawsome/luggage_rack/luggage_rack.h b/keyboards/clawsome/luggage_rack/luggage_rack.h
deleted file mode 100644
index 20c4947bd250..000000000000
--- a/keyboards/clawsome/luggage_rack/luggage_rack.h
+++ /dev/null
@@ -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 .
- */
-
-#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 }, \
-}
diff --git a/keyboards/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/info.json
index cfc028476fe7..ee4df7538ca5 100644
--- a/keyboards/clawsome/sidekick/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/clawsome/sidekick/sidekick.h b/keyboards/clawsome/sidekick/sidekick.h
deleted file mode 100644
index fcb93a9bb1b7..000000000000
--- a/keyboards/clawsome/sidekick/sidekick.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
-
diff --git a/keyboards/contender/contender.h b/keyboards/contender/contender.h
deleted file mode 100644
index 4dd71a5d2430..000000000000
--- a/keyboards/contender/contender.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json
index 385aad6e0ef6..14692509ec5b 100644
--- a/keyboards/contender/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json
index ae160c70380b..a6a81507ec09 100644
--- a/keyboards/converter/numeric_keypad_iie/info.json
+++ b/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}
+ ]
}
}
}
diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
deleted file mode 100644
index 8892b5553b79..000000000000
--- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright Adam Newbold
- *
- * 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 .
- */
-
-#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 },\
-}
diff --git a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h b/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h
deleted file mode 100755
index a5a8d9d6994d..000000000000
--- a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h
+++ /dev/null
@@ -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 .
- */
-#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 } }
\ No newline at end of file
diff --git a/keyboards/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/info.json
index 1298de4c8997..213425abc0ea 100755
--- a/keyboards/copenhagen_click/click_pad_v1/info.json
+++ b/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}
+ ]
}
}
}
diff --git a/keyboards/craftwalk/craftwalk.h b/keyboards/craftwalk/craftwalk.h
deleted file mode 100644
index 80c32ef05ea6..000000000000
--- a/keyboards/craftwalk/craftwalk.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json
index 67c7fe6525ea..1f8bd3e0f74d 100644
--- a/keyboards/craftwalk/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json
index 032023388d3a..8ff7c65a2f01 100644
--- a/keyboards/dailycraft/sandbox/rev1/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.h b/keyboards/dailycraft/sandbox/rev1/rev1.h
deleted file mode 100644
index d15cffe1ae24..000000000000
--- a/keyboards/dailycraft/sandbox/rev1/rev1.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json
index e20a1a2692d2..99535b94738a 100644
--- a/keyboards/dailycraft/sandbox/rev2/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.h b/keyboards/dailycraft/sandbox/rev2/rev2.h
deleted file mode 100644
index f5cc3de8a05c..000000000000
--- a/keyboards/dailycraft/sandbox/rev2/rev2.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json
index 47804ea5421f..b7369bf33173 100644
--- a/keyboards/dmqdesign/spin/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dmqdesign/spin/spin.h b/keyboards/dmqdesign/spin/spin.h
deleted file mode 100644
index d60dbe82fb64..000000000000
--- a/keyboards/dmqdesign/spin/spin.h
+++ /dev/null
@@ -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 .
- */
-#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} \
-}
diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index c0f7f96b9e70..34b315a87b15 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-#include "kb16.h"
+#include "quantum.h"
// OLED animation
#include "./lib/logo.h"
diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h
deleted file mode 100644
index 6e6ab2f7f494..000000000000
--- a/keyboards/doio/kb16/kb16.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index 03deae0cbc45..7cc263246c07 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 6e90528e0f4c..839708ada0a9 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index f4e43522d5c2..570d0d9ab030 100644
--- a/keyboards/doio/kb30/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/doio/kb30/kb30.c b/keyboards/doio/kb30/kb30.c
index 3272863ad133..53a4546e0627 100644
--- a/keyboards/doio/kb30/kb30.c
+++ b/keyboards/doio/kb30/kb30.c
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-#include "kb30.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/doio/kb30/kb30.h b/keyboards/doio/kb30/kb30.h
deleted file mode 100644
index 1a294c973582..000000000000
--- a/keyboards/doio/kb30/kb30.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/donutcables/scrabblepad/info.json b/keyboards/donutcables/scrabblepad/info.json
index ea0659607c14..8642865cd946 100644
--- a/keyboards/donutcables/scrabblepad/info.json
+++ b/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}
+ ]
}
}
}
diff --git a/keyboards/donutcables/scrabblepad/scrabblepad.h b/keyboards/donutcables/scrabblepad/scrabblepad.h
deleted file mode 100644
index f27d990eb2d0..000000000000
--- a/keyboards/donutcables/scrabblepad/scrabblepad.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021 DonutCables
- *
- * 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 .
- */
-#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 } \
-}
diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
deleted file mode 100644
index c98c9a703a6d..000000000000
--- a/keyboards/doodboard/duckboard/duckboard.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index b79348d03c4d..6153c3e2c0da 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/doodboard/duckboard_r2/duckboard_r2.h b/keyboards/doodboard/duckboard_r2/duckboard_r2.h
deleted file mode 100644
index 1f3c462da872..000000000000
--- a/keyboards/doodboard/duckboard_r2/duckboard_r2.h
+++ /dev/null
@@ -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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json
index bc3c8661f24f..da1c3342ed64 100644
--- a/keyboards/doodboard/duckboard_r2/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/draytronics/daisy/daisy.h b/keyboards/draytronics/daisy/daisy.h
deleted file mode 100644
index 2c4798943388..000000000000
--- a/keyboards/draytronics/daisy/daisy.h
+++ /dev/null
@@ -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 .
-*/
-
-#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, }, \
-}
diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json
index c149e3e7de8c..51776a9a0868 100644
--- a/keyboards/draytronics/daisy/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json
index a3846ef5e588..84594e01afe0 100644
--- a/keyboards/dumbpad/v0x/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dumbpad/v0x/v0x.c b/keyboards/dumbpad/v0x/v0x.c
index a225a2641c87..6c89edaa110c 100644
--- a/keyboards/dumbpad/v0x/v0x.c
+++ b/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 .
*/
-#include "v0x.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/dumbpad/v0x/v0x.h b/keyboards/dumbpad/v0x/v0x.h
deleted file mode 100644
index 578250f91711..000000000000
--- a/keyboards/dumbpad/v0x/v0x.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json
index 6555d4ac7a1d..a841d9d64256 100644
--- a/keyboards/dumbpad/v0x_dualencoder/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
index 8f571ca30609..6c89edaa110c 100644
--- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
+++ b/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 .
*/
-#include "v0x_dualencoder.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h
deleted file mode 100644
index f38d3988577f..000000000000
--- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json
index 1b5e9e87798e..d0530abd7d1c 100644
--- a/keyboards/dumbpad/v0x_right/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dumbpad/v0x_right/v0x_right.c b/keyboards/dumbpad/v0x_right/v0x_right.c
index c5c0d670c691..6c89edaa110c 100644
--- a/keyboards/dumbpad/v0x_right/v0x_right.c
+++ b/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 .
*/
-#include "v0x_right.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/dumbpad/v0x_right/v0x_right.h b/keyboards/dumbpad/v0x_right/v0x_right.h
deleted file mode 100644
index 169f391e824a..000000000000
--- a/keyboards/dumbpad/v0x_right/v0x_right.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json
index 989abb6dc682..f790bb80ecdc 100644
--- a/keyboards/dumbpad/v1x/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dumbpad/v1x/v1x.c b/keyboards/dumbpad/v1x/v1x.c
index 1a1eb1e9c5f1..f1b1d66c7ff7 100644
--- a/keyboards/dumbpad/v1x/v1x.c
+++ b/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 .
*/
-#include "v1x.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/dumbpad/v1x/v1x.h b/keyboards/dumbpad/v1x/v1x.h
deleted file mode 100644
index 578250f91711..000000000000
--- a/keyboards/dumbpad/v1x/v1x.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
index 742eaabd91ac..ad16fa4417a8 100644
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
index 33a867998524..f1b1d66c7ff7 100644
--- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
+++ b/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 .
*/
-#include "v1x_dualencoder.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h
deleted file mode 100644
index b8bb84fe5fa8..000000000000
--- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json
index d0362f056164..b4dd15c76b74 100644
--- a/keyboards/dumbpad/v1x_oled/info.json
+++ b/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}
]
}
}
diff --git a/keyboards/dumbpad/v1x_oled/v1x_oled.c b/keyboards/dumbpad/v1x_oled/v1x_oled.c
index acc9b8bbb17c..ef91d4d416f0 100644
--- a/keyboards/dumbpad/v1x_oled/v1x_oled.c
+++ b/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 .
*/
-#include "v1x_oled.h"
+#include "quantum.h"
#include
char wpm_str[10];
diff --git a/keyboards/dumbpad/v1x_oled/v1x_oled.h b/keyboards/dumbpad/v1x_oled/v1x_oled.h
deleted file mode 100644
index b8bb84fe5fa8..000000000000
--- a/keyboards/dumbpad/v1x_oled/v1x_oled.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
index ff07570f9e13..55b898b701ab 100644
--- a/keyboards/dumbpad/v1x_right/info.json
+++ b/keyboards/dumbpad/v1x_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}
]
}
}
diff --git a/keyboards/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c
index 2a2da68d5c7b..f1b1d66c7ff7 100644
--- a/keyboards/dumbpad/v1x_right/v1x_right.c
+++ b/keyboards/dumbpad/v1x_right/v1x_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 .
*/
-#include "v1x_right.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/dumbpad/v1x_right/v1x_right.h b/keyboards/dumbpad/v1x_right/v1x_right.h
deleted file mode 100644
index 169f391e824a..000000000000
--- a/keyboards/dumbpad/v1x_right/v1x_right.h
+++ /dev/null
@@ -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 .
- */
-#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 }, \
-}
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
index 8e613d3f3805..045fe2230636 100644
--- a/keyboards/dumbpad/v3x/info.json
+++ b/keyboards/dumbpad/v3x/info.json
@@ -23,10 +23,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}
]
}
}
diff --git a/keyboards/dumbpad/v3x/v3x.c b/keyboards/dumbpad/v3x/v3x.c
index 9a4c8f444273..d0acca1947fd 100644
--- a/keyboards/dumbpad/v3x/v3x.c
+++ b/keyboards/dumbpad/v3x/v3x.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "v3x.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {{// Key Matrix to LED Index
diff --git a/keyboards/dumbpad/v3x/v3x.h b/keyboards/dumbpad/v3x/v3x.h
deleted file mode 100644
index f939b6a59472..000000000000
--- a/keyboards/dumbpad/v3x/v3x.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 imchipwood && deveth0
- *
- * 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 .
- */
-
-#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 }, \
-}
diff --git a/keyboards/earth_rover/earth_rover.h b/keyboards/earth_rover/earth_rover.h
deleted file mode 100644
index a0676beeb2eb..000000000000
--- a/keyboards/earth_rover/earth_rover.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 k.bigwheel
- *
- * 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 .
- */
-
-#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.
- */
-// clang-format off
-#define LAYOUT( \
- k00, k01, \
- k10, k12, k13, k14, \
- k20, k22, k23, k24, \
- k30, k32, k33, k34 \
-) { \
- { KC_NO, k00, k01, KC_NO }, \
- { k10, k12, k13, k14 }, \
- { k20, k22, k23, k24 }, \
- { k30, k32, k33, k34 }, \
-}
-// clang-format on
diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/info.json
index 329f4d90e156..f53eb4d6108c 100644
--- a/keyboards/earth_rover/info.json
+++ b/keyboards/earth_rover/info.json
@@ -18,23 +18,23 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k10", "x": 1.25, "y": 0},
- {"label": "k20", "x": 2.25, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "k01", "x": 0, "y": 1.25},
- {"label": "k11", "x": 1.25, "y": 1.25},
- {"label": "k21", "x": 2.25, "y": 1.25},
- {"label": "k31", "x": 3.5, "y": 1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.25},
- {"label": "k02", "x": 0, "y": 2.25},
- {"label": "k12", "x": 1.25, "y": 2.25},
- {"label": "k22", "x": 2.25, "y": 2.25},
- {"label": "k32", "x": 3.5, "y": 2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "k03", "x": 0, "y": 3.25},
- {"label": "k13", "x": 1.25, "y": 3.25},
- {"label": "k23", "x": 2.25, "y": 3.25},
- {"label": "k33", "x": 3.5, "y": 3.25}
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.25}
]
}
}
diff --git a/keyboards/flehrad/bigswitch/bigswitch.c b/keyboards/flehrad/bigswitch/bigswitch.c
index 32f9f7fab82a..987e816ee9b1 100644
--- a/keyboards/flehrad/bigswitch/bigswitch.c
+++ b/keyboards/flehrad/bigswitch/bigswitch.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 .
*/
-#include "bigswitch.h"
+#include "quantum.h"
volatile uint8_t runonce = true;
static uint16_t my_timer;
diff --git a/keyboards/flehrad/bigswitch/bigswitch.h b/keyboards/flehrad/bigswitch/bigswitch.h
deleted file mode 100644
index c6c2f026d5cd..000000000000
--- a/keyboards/flehrad/bigswitch/bigswitch.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 QMK Contributors
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00 \
-) { \
- { k00 } \
-}
diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index e19da4fb6129..aa07eb114d69 100644
--- a/keyboards/flehrad/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
@@ -17,7 +17,9 @@
"debounce": 50,
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0, "w":4, "h":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
+ ]
}
}
}
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
index fae1349a658d..8cdffd26546b 100644
--- a/keyboards/frooastboard/nano/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -7,26 +7,11 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "Z",
- "x": 0,
- "y": 0
- },
- {
- "label": "X",
- "x": 1,
- "y": 0
- },
- {
- "label": "Esc",
- "x": 0,
- "y": 1
- },
- {
- "label": "~",
- "x": 1,
- "y": 1
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1}
]
}
},
diff --git a/keyboards/frooastboard/nano/nano.h b/keyboards/frooastboard/nano/nano.h
deleted file mode 100644
index 76d1a42eac5f..000000000000
--- a/keyboards/frooastboard/nano/nano.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021-2022 frooastside
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, \
- K10, K11 \
-) { \
- { K00, K01 }, \
- { K10, K11 } \
-}
diff --git a/keyboards/gboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
index 5a0cd5e8fb1a..e23fc264f49d 100644
--- a/keyboards/gboards/ergotaco/ergotaco.h
+++ b/keyboards/gboards/ergotaco/ergotaco.h
@@ -26,23 +26,3 @@ extern i2c_status_t mcp23018_status;
void init_ergodox(void);
uint8_t init_mcp23018(void);
-
-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
-#define LAYOUT( \
- L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05) \
- \
- /* matrix positions */ \
- { \
- {R00}, \
- {R01}, \
- {R02}, \
- {R03}, \
- {R04}, \
- {R05}, \
- {L05}, \
- {L04}, \
- {L03}, \
- {L02}, \
- {L01}, \
- {L00}, \
-}
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index 841498584196..1de1f3ab85d7 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -13,19 +13,19 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 1},
- {"x": 1, "y": 0.5},
- {"x": 2, "y": 0.25},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.75},
- {"x": 5, "y": 1.5},
+ {"matrix": [11, 0], "x": 0, "y": 1},
+ {"matrix": [10, 0], "x": 1, "y": 0.5},
+ {"matrix": [9, 0], "x": 2, "y": 0.25},
+ {"matrix": [8, 0], "x": 3, "y": 0},
+ {"matrix": [7, 0], "x": 4, "y": 0.75},
+ {"matrix": [6, 0], "x": 5, "y": 1.5},
- {"x": 7, "y": 1.5},
- {"x": 8, "y": 0.75},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.25},
- {"x": 11, "y": 0.5},
- {"x": 12, "y": 1}
+ {"matrix": [0, 0], "x": 7, "y": 1.5},
+ {"matrix": [1, 0], "x": 8, "y": 0.75},
+ {"matrix": [2, 0], "x": 9, "y": 0},
+ {"matrix": [3, 0], "x": 10, "y": 0.25},
+ {"matrix": [4, 0], "x": 11, "y": 0.5},
+ {"matrix": [5, 0], "x": 12, "y": 1}
]
}
}
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 97d2c078fe27..64a752d24fa2 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -19,15 +19,15 @@
"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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"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}
]
}
}
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index f2d2301ec935..05b220250fb0 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -1,4 +1,5 @@
-#include "tester.h"
+#include "quantum.h"
+
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
diff --git a/keyboards/geekboards/tester/tester.h b/keyboards/geekboards/tester/tester.h
deleted file mode 100644
index 28c555f0b608..000000000000
--- a/keyboards/geekboards/tester/tester.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
- k00, k01, k02, k03,\
- k10, k11, k12, k13\
-) \
-{ \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 } \
-}
diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json
index 0e0aaff476a7..3a247c0c81d8 100644
--- a/keyboards/grid600/press/info.json
+++ b/keyboards/grid600/press/info.json
@@ -17,7 +17,12 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
+ "layout": [
+ {"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}
+ ]
}
}
}
diff --git a/keyboards/grid600/press/press.h b/keyboards/grid600/press/press.h
deleted file mode 100644
index ca9eac9d1931..000000000000
--- a/keyboards/grid600/press/press.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 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 .
- */
-#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 } \
-}
diff --git a/keyboards/handwired/2x5keypad/2x5keypad.h b/keyboards/handwired/2x5keypad/2x5keypad.h
index 6284e83b72af..6fcdd2128c4a 100644
--- a/keyboards/handwired/2x5keypad/2x5keypad.h
+++ b/keyboards/handwired/2x5keypad/2x5keypad.h
@@ -6,16 +6,5 @@
#define BLUE_LED B5
#define GREEN_LED B6
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14 \
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 } \
-}
-
-
-
void turn_off_leds(void);
void turn_on_led(pin_t pin);
diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json
index 3679eca918bb..1df0ccbdee5c 100644
--- a/keyboards/handwired/2x5keypad/info.json
+++ b/keyboards/handwired/2x5keypad/info.json
@@ -18,17 +18,17 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"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}
]
}
}
diff --git a/keyboards/handwired/6key/6key.c b/keyboards/handwired/6key/6key.c
index 22c766a30f61..93b9477dce46 100644
--- a/keyboards/handwired/6key/6key.c
+++ b/keyboards/handwired/6key/6key.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "6key.h"
+#include "quantum.h"
bool dip_switch_update_kb(uint8_t index, bool active) {
if (!dip_switch_update_user(index, active)) { return false; }
diff --git a/keyboards/handwired/6key/6key.h b/keyboards/handwired/6key/6key.h
deleted file mode 100644
index f63abc35d2a7..000000000000
--- a/keyboards/handwired/6key/6key.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2020 Bratzworth
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, \
- k03, k04, k05 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k03, k04, k05 } \
-}
diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json
index fec35620a284..39c26006d6e5 100644
--- a/keyboards/handwired/6key/info.json
+++ b/keyboards/handwired/6key/info.json
@@ -18,8 +18,13 @@
"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}
+ {"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}
]
}
}
diff --git a/keyboards/handwired/6macro/6macro.h b/keyboards/handwired/6macro/6macro.h
deleted file mode 100644
index c1d500512832..000000000000
--- a/keyboards/handwired/6macro/6macro.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 joaofbmaia
- *
- * 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 .
- */
-#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 }, \
-}
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index d081a75d3e84..02111f4746cb 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -17,7 +17,15 @@
"bootloader": "atmel-dfu",
"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}]
+ "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": "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}
+ ]
}
}
}
diff --git a/keyboards/handwired/aplx2/aplx2.h b/keyboards/handwired/aplx2/aplx2.h
deleted file mode 100644
index a47b064b96ab..000000000000
--- a/keyboards/handwired/aplx2/aplx2.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2020 April 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 .
-*/
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01 \
-) { \
- { K00 , K01 } \
-}
diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/info.json
index 76aff146f2f4..d3f7962fe7cc 100644
--- a/keyboards/handwired/aplx2/info.json
+++ b/keyboards/handwired/aplx2/info.json
@@ -18,8 +18,8 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0}
]
}
}
diff --git a/keyboards/handwired/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h
deleted file mode 100644
index 489dae2a4e1a..000000000000
--- a/keyboards/handwired/arrow_pad/arrow_pad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This is the 21-key keypad to 4x6 element matrix mapping
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, \
- k40, k41, k42, k43, \
- k50, k51, k52, k53 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 }, \
- { k40, k41, k42, k43 }, \
- { k50, k51, k52, k53 } \
-}
-
-// This is the 21-key keypad to 2x11 element matrix mapping
-#define LAYOUT_pad21( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k04, k05, k06, \
- k14, k15, k16, k07, \
- k08, k09, k0A, \
- k19, k1A, k17 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \
-}
diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json
index 91690cf83e86..b9d705f3bf10 100644
--- a/keyboards/handwired/arrow_pad/info.json
+++ b/keyboards/handwired/arrow_pad/info.json
@@ -21,55 +21,35 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"KM_ESC", "x":0, "y":0},
- {"label":"KM_TAB", "x":1, "y":0},
- {"label":"KM_BSL", "x":2, "y":0},
- {"label":"KM_ARR", "x":3, "y":0},
- {"label":"KM_NUM", "x":0, "y":1},
- {"label":"KM_FSL", "x":1, "y":1},
- {"label":"KM_AST", "x":2, "y":1},
- {"label":"KM_MIN", "x":3, "y":1},
- {"label":"KM___7", "x":0, "y":2},
- {"label":"KM___8", "x":1, "y":2},
- {"label":"KM___9", "x":2, "y":2},
- {"label":"KM_EQU", "x":3, "y":2},
- {"label":"KM___4", "x":0, "y":3},
- {"label":"KM___5", "x":1, "y":3},
- {"label":"KM___6", "x":2, "y":3},
- {"label":"KM_PLS", "x":3, "y":3},
- {"label":"KM___1", "x":0, "y":4},
- {"label":"KM___2", "x":1, "y":4},
- {"label":"KM___3", "x":2, "y":4},
- {"label":"___ENT", "x":3, "y":4},
- {"label":"KM___0", "x":0, "y":5},
- {"label":"_____0", "x":1, "y":5},
- {"label":"KM_DOT", "x":2, "y":5},
- {"label":"KM_ENT", "x":3, "y":5}
- ]
- },
- "LAYOUT_pad21": {
- "layout": [
- {"label":"KM_ESC", "x":0, "y":0},
- {"label":"KM_TAB", "x":1, "y":0},
- {"label":"KM_BSL", "x":2, "y":0},
- {"label":"KM_ARR", "x":3, "y":0},
- {"label":"KM_NUM", "x":0, "y":1},
- {"label":"KM_FSL", "x":1, "y":1},
- {"label":"KM_AST", "x":2, "y":1},
- {"label":"KM_MIN", "x":3, "y":1},
- {"label":"KM___7", "x":0, "y":2},
- {"label":"KM___8", "x":1, "y":2},
- {"label":"KM___9", "x":2, "y":2},
- {"label":"KM___4", "x":0, "y":3},
- {"label":"KM___5", "x":1, "y":3},
- {"label":"KM___6", "x":2, "y":3},
- {"label":"KM_PLS", "x":3, "y":2, "h":2},
- {"label":"KM___1", "x":0, "y":4},
- {"label":"KM___2", "x":1, "y":4},
- {"label":"KM___3", "x":2, "y":4},
- {"label":"KM___0", "x":0, "y":5, "w":2},
- {"label":"KM_DOT", "x":2, "y":5},
- {"label":"KM_ENT", "x":3, "y":4, "h":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},
+
+ {"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": [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": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5}
]
}
}
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
index bc940420fe6b..cf291c00cf4d 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -2,6 +2,19 @@
#include QMK_KEYBOARD_H
#include "led.h"
+// This is the 21-key keypad to 2x11 element matrix mapping
+#define LAYOUT_pad21( \
+ k00, k01, k02, k03, \
+ k10, k11, k12, k13, \
+ k04, k05, k06, \
+ k14, k15, k16, k07, \
+ k08, k09, k0A, \
+ k19, k1A, k17 \
+) { \
+ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
+ { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \
+}
+
enum layers {
LAYER_BASE,
LAYER_EDIT,
diff --git a/keyboards/handwired/bstk100/bstk100.h b/keyboards/handwired/bstk100/bstk100.h
deleted file mode 100644
index 42a6da437fab..000000000000
--- a/keyboards/handwired/bstk100/bstk100.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 FREE WING,Y.Sakamoto
- * http://www.neko.ne.jp/~freewing/
- *
- * 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 .
- */
-
-#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, \
- k34, k03, k02, k13, \
- k10, k11, k12, k01, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, \
- k40, k41, k43 \
-) { \
- { k00, k01, k02, k03, KC_NO }, \
- { k10, k11, k12, k13, KC_NO }, \
- { k20, k21, k22, k23, KC_NO }, \
- { k30, k31, k32, k33, k34 }, \
- { k40, k41, KC_NO, k43, KC_NO } \
-}
diff --git a/keyboards/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json
index 4d316b4397ac..257203511aed 100644
--- a/keyboards/handwired/bstk100/info.json
+++ b/keyboards/handwired/bstk100/info.json
@@ -24,31 +24,31 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k00", "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"label": "k34", "x": 0, "y": 1},
- {"label": "k03", "x": 1, "y": 1},
- {"label": "k02", "x": 2, "y": 1},
- {"label": "k13", "x": 3, "y": 1},
+ {"matrix": [3, 4], "x": 0, "y": 1},
+ {"matrix": [0, 3], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
- {"label": "k10", "x": 0, "y": 2},
- {"label": "k11", "x": 1, "y": 2},
- {"label": "k12", "x": 2, "y": 2},
- {"label": "k01", "x": 3, "y": 2},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [0, 1], "x": 3, "y": 2},
- {"label": "k20", "x": 0, "y": 3},
- {"label": "k21", "x": 1, "y": 3},
- {"label": "k22", "x": 2, "y": 3},
- {"label": "k23", "x": 3, "y": 3},
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
- {"label": "k30", "x": 0, "y": 4},
- {"label": "k31", "x": 1, "y": 4},
- {"label": "k32", "x": 2, "y": 4},
- {"label": "k33", "x": 3, "y": 4, "h": 2},
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4, "h": 2},
- {"label": "k40", "x": 0, "y": 5},
- {"label": "k41", "x": 1, "y": 5},
- {"label": "k43", "x": 2, "y": 5}
+ {"matrix": [4, 0], "x": 0, "y": 5},
+ {"matrix": [4, 1], "x": 1, "y": 5},
+ {"matrix": [4, 3], "x": 2, "y": 5}
]
}
}
diff --git a/keyboards/handwired/ck4x4/ck4x4.h b/keyboards/handwired/ck4x4/ck4x4.h
deleted file mode 100644
index 33c1b8dd9940..000000000000
--- a/keyboards/handwired/ck4x4/ck4x4.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#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 }, \
-}
diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/info.json
index 661f4edb2a54..8caf00aefdb2 100644
--- a/keyboards/handwired/ck4x4/info.json
+++ b/keyboards/handwired/ck4x4/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},
+ {"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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"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},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"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},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"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}
]
}
}
diff --git a/keyboards/handwired/frankie_macropad/frankie_macropad.h b/keyboards/handwired/frankie_macropad/frankie_macropad.h
deleted file mode 100644
index cfd3124ba192..000000000000
--- a/keyboards/handwired/frankie_macropad/frankie_macropad.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Eric Wood
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* 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( \
- k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23 \
-) { \
- { ___, ___, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 } \
-}
diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json
index 3416222269c0..24da71eb8dd1 100644
--- a/keyboards/handwired/frankie_macropad/info.json
+++ b/keyboards/handwired/frankie_macropad/info.json
@@ -27,18 +27,18 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k02", "x": 2, "y": 0},
- {"label": "k03", "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "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},
+ {"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": "k20", "x": 0, "y": 2},
- {"label": "k21", "x": 1, "y": 2},
- {"label": "k22", "x": 2, "y": 2},
- {"label": "k23", "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}
]
}
}
diff --git a/keyboards/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c
index 8048194bbcd5..25493d94c35d 100644
--- a/keyboards/handwired/gamenum/gamenum.c
+++ b/keyboards/handwired/gamenum/gamenum.c
@@ -1,4 +1,4 @@
-#include "gamenum.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/handwired/gamenum/gamenum.h b/keyboards/handwired/gamenum/gamenum.h
deleted file mode 100644
index 48883b118521..000000000000
--- a/keyboards/handwired/gamenum/gamenum.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, \
- k30, k31, k32, \
- k41, k42, k43 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, XXX }, \
- { k30, k31, k32, XXX }, \
- { XXX, k41, k42, k43 } \
-}
diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json
index e35fb4a4e5a6..bb12b3b1f7bd 100644
--- a/keyboards/handwired/gamenum/info.json
+++ b/keyboards/handwired/gamenum/info.json
@@ -18,23 +18,27 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Fn", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"-", "x":3, "y":0},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"+", "x":3, "y":1, "h":2},
- {"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},
- {"label":"0", "x":0, "y":4, "w":2},
- {"label":".", "x":2, "y":4},
- {"label":"Ent", "x":3, "y":3, "h":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, "h": 2},
+
+ {"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},
+
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/info.json
index c265fe3cfea6..0a769a43f9d7 100644
--- a/keyboards/handwired/leftynumpad/info.json
+++ b/keyboards/handwired/leftynumpad/info.json
@@ -19,29 +19,33 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"1,0", "x":1, "y":0},
- {"label":"2,0", "x":2, "y":0},
- {"label":"3,0", "x":3, "y":0},
- {"label":"4,0", "x":4, "y":0},
- {"label":"0,1", "x":0, "y":1},
- {"label":"1,1", "x":1, "y":1},
- {"label":"2,1", "x":2, "y":1},
- {"label":"3,1", "x":3, "y":1},
- {"label":"0,2", "x":0, "y":2},
- {"label":"1,2", "x":1, "y":2},
- {"label":"2,2", "x":2, "y":2},
- {"label":"3,2", "x":3, "y":2},
- {"label":"5,1", "x":4, "y":1, "h":2},
- {"label":"0,3", "x":0, "y":3},
- {"label":"1,3", "x":1, "y":3},
- {"label":"2,3", "x":2, "y":3},
- {"label":"3,3", "x":3, "y":3},
- {"label":"0,4", "x":0, "y":4},
- {"label":"1,4", "x":1, "y":4},
- {"label":"2,4", "x":2, "y":4},
- {"label":"3,4", "x":3, "y":4},
- {"label":"4,3", "x":4, "y":3, "h":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": [0, 4], "x": 4, "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": [2, 4], "x": 4, "y": 1, "h": 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": [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}
]
}
}
diff --git a/keyboards/handwired/leftynumpad/leftynumpad.h b/keyboards/handwired/leftynumpad/leftynumpad.h
deleted file mode 100644
index 7f3ebb8441a4..000000000000
--- a/keyboards/handwired/leftynumpad/leftynumpad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 Tom Swartz
- *
- * 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 .
- */
-
-#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( \
- K05, K15, K25, K35, K45, \
- K04, K14, K24, K34, \
- K03, K13, K23, K33, K43, \
- K02, K12, K22, K32, \
- K01, K11, K21, K31, K41 \
-) \
-{ \
- { K05, K15, K25, K35, K45 }, \
- { K04, K14, K24, K34 }, \
- { K03, K13, K23, K33, K43 }, \
- { K02, K12, K22, K32 }, \
- { K01, K11, K21, K31, K41 } \
-}
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index f5cecc75e594..945b489751b9 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -21,15 +21,15 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 0.5, "y": 1.25},
- {"x": 1.5, "y": 2.5},
- {"x": 2.75, "y": 3.25},
- {"x": 4, "y": 3.5},
- {"x": 5.25, "y": 3.25},
- {"x": 6.5, "y": 2.5},
- {"x": 7.5, "y": 1.25},
- {"x": 8, "y": 0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 0.5, "y": 1.25},
+ {"matrix": [0, 2], "x": 1.5, "y": 2.5},
+ {"matrix": [0, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [0, 4], "x": 4, "y": 3.5},
+ {"matrix": [0, 5], "x": 5.25, "y": 3.25},
+ {"matrix": [0, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [0, 7], "x": 7.5, "y": 1.25},
+ {"matrix": [0, 8], "x": 8, "y": 0}
]
}
}
diff --git a/keyboards/handwired/lovelive9/lovelive9.h b/keyboards/handwired/lovelive9/lovelive9.h
deleted file mode 100644
index f6fb1f94cc09..000000000000
--- a/keyboards/handwired/lovelive9/lovelive9.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08 } \
-}
diff --git a/keyboards/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/info.json
index 6d751780f62e..7da646d1fedf 100644
--- a/keyboards/handwired/mechboards_micropad/info.json
+++ b/keyboards/handwired/mechboards_micropad/info.json
@@ -17,7 +17,12 @@
"bootloader": "caterina",
"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}]
+ "layout": [
+ {"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}
+ ]
}
}
}
diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h b/keyboards/handwired/mechboards_micropad/mechboards_micropad.h
deleted file mode 100644
index 983908486230..000000000000
--- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Yiancar
- *
- * 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 .
- */
-#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 } \
-}
diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json
index 94fb21302544..59062f16dc9f 100644
--- a/keyboards/handwired/misterdeck/info.json
+++ b/keyboards/handwired/misterdeck/info.json
@@ -18,20 +18,20 @@
"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},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"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},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"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}
]
}
}
diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h
deleted file mode 100644
index 324ccb755fc0..000000000000
--- a/keyboards/handwired/misterdeck/misterdeck.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2021 Chris Broekema (broekema@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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 } \
-}
diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json
index 15b8d4bc69af..b0bcfe4829de 100644
--- a/keyboards/handwired/mutepad/info.json
+++ b/keyboards/handwired/mutepad/info.json
@@ -23,10 +23,10 @@
"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}
+ {"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}
]
}
}
diff --git a/keyboards/handwired/mutepad/mutepad.h b/keyboards/handwired/mutepad/mutepad.h
deleted file mode 100644
index 57c317cb6010..000000000000
--- a/keyboards/handwired/mutepad/mutepad.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 JoshwJB (@JoshwJB)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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) \
- { \
- { K00, K01, K02, K03 } \
- }
diff --git a/keyboards/handwired/nicekey/info.json b/keyboards/handwired/nicekey/info.json
index 20a10a7e8399..066e5b852f9f 100644
--- a/keyboards/handwired/nicekey/info.json
+++ b/keyboards/handwired/nicekey/info.json
@@ -18,7 +18,7 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}
+ {"matrix": [0, 0], "x": 0, "y": 0}
]
}
}
diff --git a/keyboards/handwired/nicekey/nicekey.h b/keyboards/handwired/nicekey/nicekey.h
deleted file mode 100644
index f008be168e50..000000000000
--- a/keyboards/handwired/nicekey/nicekey.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00 \
-) { \
- { k00 } \
-}
diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/info.json
index be6e3a1764bd..bc70d64ed44d 100644
--- a/keyboards/handwired/novem/info.json
+++ b/keyboards/handwired/novem/info.json
@@ -18,15 +18,17 @@
"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},
- {"label":"k06", "x":0, "y":2},
- {"label":"k07", "x":1, "y":2},
- {"label":"k08", "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}
]
}
}
diff --git a/keyboards/handwired/novem/novem.h b/keyboards/handwired/novem/novem.h
deleted file mode 100644
index b1040094e0fb..000000000000
--- a/keyboards/handwired/novem/novem.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Jose I. Martinez
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
- k00, k01, k02, \
- k03, k04, k05, \
- k06, k07, k08 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k03, k04, k05 }, \
- { k06, k07, k08 }, \
-}
diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json
index 5d796312ccfd..a4b37eec4a87 100644
--- a/keyboards/handwired/nozbe_macro/info.json
+++ b/keyboards/handwired/nozbe_macro/info.json
@@ -21,10 +21,10 @@
"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}
+ {"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}
]
}
}
diff --git a/keyboards/handwired/nozbe_macro/nozbe_macro.h b/keyboards/handwired/nozbe_macro/nozbe_macro.h
deleted file mode 100644
index 2c2c95091bbc..000000000000
--- a/keyboards/handwired/nozbe_macro/nozbe_macro.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Marcin Leon Omelan (@rozPierog)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03 \
-) { \
- { k00, k01, k02, k03 } \
-}
diff --git a/keyboards/handwired/numpad20/info.json b/keyboards/handwired/numpad20/info.json
index fb3a11e40039..5c96b7e5dbb2 100644
--- a/keyboards/handwired/numpad20/info.json
+++ b/keyboards/handwired/numpad20/info.json
@@ -18,26 +18,30 @@
"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":"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},
- {"label":"K40", "x":0, "y":4},
- {"label":"K41", "x":1, "y":4},
- {"label":"K42", "x":2, "y":4},
- {"label":"K43", "x":3, "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": [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": [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}
]
}
}
diff --git a/keyboards/handwired/numpad20/numpad20.h b/keyboards/handwired/numpad20/numpad20.h
deleted file mode 100644
index 03fdd6d923ce..000000000000
--- a/keyboards/handwired/numpad20/numpad20.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, \
- k40, k41, k42, k43 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 }, \
- { k40, k41, k42, k43 } \
-}
diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/info.json
index 6bec9fa1630c..001705ee7292 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/info.json
+++ b/keyboards/handwired/obuwunkunubi/spaget/info.json
@@ -24,30 +24,36 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":3, "y":0},
- {"x":0, "y":1.5},
- {"x":1, "y":1.5},
- {"x":2, "y":1.5},
- {"x":3, "y":1.5},
- {"x":0, "y":2.5},
- {"x":1, "y":2.5},
- {"x":2, "y":2.5},
- {"x":3, "y":2.5},
- {"x":0, "y":3.5},
- {"x":1, "y":3.5},
- {"x":2, "y":3.5},
- {"x":0, "y":4.5},
- {"x":1, "y":4.5},
- {"x":2, "y":4.5},
- {"x":3, "y":3.5, "h":2},
- {"x":0, "y":5.5},
- {"x":1, "y":5.5},
- {"x":2, "y":5.5},
- {"x":0, "y":6.5, "w":2},
- {"x":2, "y":6.5},
- {"x":3, "y":5.5, "h":2}
- ]
+ {"matrix": [2, 3], "x": 0, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.5},
+ {"matrix": [0, 1], "x": 1, "y": 1.5},
+ {"matrix": [0, 2], "x": 2, "y": 1.5},
+ {"matrix": [0, 3], "x": 3, "y": 1.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},
+ {"matrix": [1, 3], "x": 3, "y": 2.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},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.5},
+ {"matrix": [3, 1], "x": 1, "y": 4.5},
+ {"matrix": [3, 2], "x": 2, "y": 4.5},
+ {"matrix": [3, 3], "x": 3, "y": 3.5, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.5},
+ {"matrix": [4, 1], "x": 1, "y": 5.5},
+ {"matrix": [4, 2], "x": 2, "y": 5.5},
+
+ {"matrix": [5, 1], "x": 0, "y": 6.5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 6.5},
+ {"matrix": [5, 3], "x": 3, "y": 5.5, "h": 2}
+ ]
}
}
}
diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.h b/keyboards/handwired/obuwunkunubi/spaget/spaget.h
deleted file mode 100644
index 7d4b9e9dff53..000000000000
--- a/keyboards/handwired/obuwunkunubi/spaget/spaget.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 obuwunkunubi
- *
- * 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 .
- */
-#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.
- */
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
- K23, K43, \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, \
- K30, K31, K32, K33, \
- K40, K41, K42, \
- K51, K52, K53 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { XXX, K51, K52, K53 } \
-}
diff --git a/keyboards/handwired/postageboard/info.json b/keyboards/handwired/postageboard/info.json
index d15d6ef750ad..2f4e674d591c 100644
--- a/keyboards/handwired/postageboard/info.json
+++ b/keyboards/handwired/postageboard/info.json
@@ -10,9 +10,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
]
}
}
diff --git a/keyboards/handwired/postageboard/postageboard.h b/keyboards/handwired/postageboard/postageboard.h
deleted file mode 100644
index 5bd9ceee5af9..000000000000
--- a/keyboards/handwired/postageboard/postageboard.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02 \
-) \
-{ \
- { k00, k01, k02 } \
-}
diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json
index 908a390c3394..162f5601b535 100644
--- a/keyboards/handwired/snatchpad/info.json
+++ b/keyboards/handwired/snatchpad/info.json
@@ -24,16 +24,16 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
- {"x": 0, "y": 2},
- {"x": 4, "y": 2}
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2}
]
}
}
diff --git a/keyboards/handwired/snatchpad/snatchpad.c b/keyboards/handwired/snatchpad/snatchpad.c
index 621ba1112363..89d32c036b59 100644
--- a/keyboards/handwired/snatchpad/snatchpad.c
+++ b/keyboards/handwired/snatchpad/snatchpad.c
@@ -1,7 +1,7 @@
// Copyright 2022 xia0 (@xia0)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "snatchpad.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/handwired/snatchpad/snatchpad.h b/keyboards/handwired/snatchpad/snatchpad.h
deleted file mode 100644
index 07d6bd2093a9..000000000000
--- a/keyboards/handwired/snatchpad/snatchpad.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 xia0 (@xia0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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, k22 \
-) { \
- { k00 , k01 , k02 }, \
- { k10 , k11 , k12 }, \
- { k20 , KC_NO , k22 } \
-}
diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json
index 973eebd1f93e..efd82d20c47e 100644
--- a/keyboards/handwired/splittest/info.json
+++ b/keyboards/handwired/splittest/info.json
@@ -11,8 +11,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0,"y": 0},
- {"x": 1,"y": 0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1, "y": 0}
]
}
}
diff --git a/keyboards/handwired/splittest/splittest.h b/keyboards/handwired/splittest/splittest.h
deleted file mode 100644
index 17b7081a0275..000000000000
--- a/keyboards/handwired/splittest/splittest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(L1, R1) {{L1}, {R1}}
diff --git a/keyboards/handwired/sticc14/info.json b/keyboards/handwired/sticc14/info.json
index 7733b642ec51..8659152f52b8 100644
--- a/keyboards/handwired/sticc14/info.json
+++ b/keyboards/handwired/sticc14/info.json
@@ -18,20 +18,24 @@
"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},
- {"label":"K30", "x":0, "y":3},
- {"label":"K31", "x":1, "y":3},
- {"label":"K32", "x":2, "y":3},
- {"label":"K40", "x":0, "y":4, "w":2},
- {"label":"K41", "x":2, "y":4}
+ {"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},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 1], "x": 2, "y": 4}
]
}
}
diff --git a/keyboards/handwired/sticc14/sticc14.h b/keyboards/handwired/sticc14/sticc14.h
deleted file mode 100644
index 1a5f51e41a90..000000000000
--- a/keyboards/handwired/sticc14/sticc14.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 ErkHal
- *
- * 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 .
- */
-#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, \
- K30, K31, K32, \
- K40, K41 \
-) { \
- { K00, K01, K02 }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 }, \
- { K30, K31, K32 }, \
- { K40, K41} \
-}
diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json
index a6e31cba07e4..0df5170ffff5 100644
--- a/keyboards/handwired/tennie/info.json
+++ b/keyboards/handwired/tennie/info.json
@@ -17,7 +17,20 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.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": [2, 0], "x": 0.5, "y": 2},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2}
+ ]
}
}
}
diff --git a/keyboards/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c
index 508430ba065d..0b257e0a0659 100644
--- a/keyboards/handwired/tennie/tennie.c
+++ b/keyboards/handwired/tennie/tennie.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "tennie.h"
+#include "quantum.h"
void matrix_post_init(void) {
rgblight_enable_noeeprom();
diff --git a/keyboards/handwired/tennie/tennie.h b/keyboards/handwired/tennie/tennie.h
deleted file mode 100644
index 8ab0d04c5287..000000000000
--- a/keyboards/handwired/tennie/tennie.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2018 Jack Hildebrandt
- *
- * 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 .
- */
-#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, K13, \
- K20, K21, K22 \
-) \
-{ \
- { K00, K01, K02, KC_NO }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, KC_NO }, \
-}
diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json
index a1778c222065..92098b09c64d 100644
--- a/keyboards/handwired/trackpoint/info.json
+++ b/keyboards/handwired/trackpoint/info.json
@@ -18,9 +18,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0,"y": 0},
- {"x": 1,"y": 0},
- {"x": 2,"y": 0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
]
}
}
diff --git a/keyboards/handwired/trackpoint/trackpoint.h b/keyboards/handwired/trackpoint/trackpoint.h
deleted file mode 100644
index a26000d521ad..000000000000
--- a/keyboards/handwired/trackpoint/trackpoint.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02 \
-) \
-{ \
- { k00, k01, k02} \
-}
diff --git a/keyboards/hfdkb/ac001/ac001.c b/keyboards/hfdkb/ac001/ac001.c
index a977f9c80da0..83dbdeb62842 100644
--- a/keyboards/hfdkb/ac001/ac001.c
+++ b/keyboards/hfdkb/ac001/ac001.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ac001.h"
+#include "quantum.h"
/*
3---------------2
| | |
diff --git a/keyboards/hfdkb/ac001/ac001.h b/keyboards/hfdkb/ac001/ac001.h
deleted file mode 100644
index 0758584ee8eb..000000000000
--- a/keyboards/hfdkb/ac001/ac001.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 2022 jonylee@hfd
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004 \
-) { \
- { K000, K001, K002, K003, K004 } \
-}
-// clang-format on
diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
index fb4974968be2..a6082feb38e2 100644
--- a/keyboards/hfdkb/ac001/info.json
+++ b/keyboards/hfdkb/ac001/info.json
@@ -18,11 +18,12 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"~", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"3", "x":2, "y":0},
- {"label":"4", "x":3, "y":0},
- {"label":"@", "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}
+ ]
}
}
}
diff --git a/keyboards/hifumi/hifumi.h b/keyboards/hifumi/hifumi.h
deleted file mode 100644
index 389ce206e0ad..000000000000
--- a/keyboards/hifumi/hifumi.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2019 zk-phi
- *
- * 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 .
- */
-#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, \
- k10, k11, k12 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 } \
-}
diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json
index 0bfb7cd27fb2..e7b0df2d4784 100644
--- a/keyboards/hifumi/info.json
+++ b/keyboards/hifumi/info.json
@@ -17,7 +17,15 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"F5", "x":0, "y":0}, {"label":"Up", "x":1, "y":0}, {"label":"PrSc", "x":2, "y":0}, {"label":"Left", "x":0, "y":1}, {"label":"Down", "x":1, "y":1}, {"label":"Right", "x":2, "y":1}]
+ "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}
+ ]
}
}
}
diff --git a/keyboards/hineybush/h08_ocelot/h08_ocelot.h b/keyboards/hineybush/h08_ocelot/h08_ocelot.h
deleted file mode 100644
index 92bded4558c8..000000000000
--- a/keyboards/hineybush/h08_ocelot/h08_ocelot.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * 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 .
- */
-
-#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 } \
-}
-
diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json
index 439b37e37985..3f3859aa844c 100644
--- a/keyboards/hineybush/h08_ocelot/info.json
+++ b/keyboards/hineybush/h08_ocelot/info.json
@@ -17,7 +17,17 @@
"bootloader": "atmel-dfu",
"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}]
+ "layout": [
+ {"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}
+ ]
}
}
}
diff --git a/keyboards/hub16/hub16.h b/keyboards/hub16/hub16.h
deleted file mode 100755
index 36830bf5c086..000000000000
--- a/keyboards/hub16/hub16.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Josh Johnson
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* 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( \
- k40, k41, \
- 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, }, \
- { k40, k41, ___, ___, } \
-}
-
diff --git a/keyboards/hub16/info.json b/keyboards/hub16/info.json
index 0da7c129eb6a..4003e6df5b35 100644
--- a/keyboards/hub16/info.json
+++ b/keyboards/hub16/info.json
@@ -20,24 +20,28 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Play / Pause", "x":2.5, "y":0},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"*", "x":3, "y":1},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"-", "x":3, "y":2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"+", "x":3, "y":3},
- {"label":"MO(1)", "x":0, "y":4},
- {"label":"0", "x":1, "y":4},
- {"label":".", "x":2, "y":4},
- {"label":"N.ENT", "x":3, "y":4}
+ {"matrix": [4, 0], "x": 0.5, "y": 0},
+ {"matrix": [4, 1], "x": 2.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4}
]
}
}
diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json
index c1816b5e2a27..061f2e1049e4 100644
--- a/keyboards/illuminati/is0/info.json
+++ b/keyboards/illuminati/is0/info.json
@@ -22,7 +22,9 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0.25, "y":0, "w":1.25, "h":2}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2}
+ ]
}
}
}
diff --git a/keyboards/illuminati/is0/is0.h b/keyboards/illuminati/is0/is0.h
deleted file mode 100644
index a9fae5b40eb8..000000000000
--- a/keyboards/illuminati/is0/is0.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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 .
- */
-#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( \
- K0 \
-) \
-{ \
- { K0 } \
-}
diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json
index b0b1c9792c5e..764efa8767c1 100644
--- a/keyboards/jadookb/jkb2/info.json
+++ b/keyboards/jadookb/jkb2/info.json
@@ -17,7 +17,10 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [ {"label":"z","x": 0, "y": 0 }, {"label":"x","x": 1, "y": 0 }]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0}
+ ]
}
}
}
diff --git a/keyboards/jadookb/jkb2/jkb2.h b/keyboards/jadookb/jkb2/jkb2.h
deleted file mode 100644
index 1bddef45de5b..000000000000
--- a/keyboards/jadookb/jkb2/jkb2.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2021 Wizard-GG
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K01, K02 \
-) \
-{ \
- { K01, K02 }, \
-}
diff --git a/keyboards/jkdlab/binary_monkey/binary_monkey.h b/keyboards/jkdlab/binary_monkey/binary_monkey.h
deleted file mode 100644
index 598886b781bc..000000000000
--- a/keyboards/jkdlab/binary_monkey/binary_monkey.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2021 JKDLAB.
- * Copyright 2021 Jaehee
- *
- * 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 https://www.gnu.org/licenses/.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, \
- K10 \
-) { \
- { K10, K00, K01 } \
-}
diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json
index b7fcc584f3bf..43ba14685415 100644
--- a/keyboards/jkdlab/binary_monkey/info.json
+++ b/keyboards/jkdlab/binary_monkey/info.json
@@ -21,9 +21,10 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "0", "x": 0, "y": 0},
- {"label": "1", "x": 1, "y": 0},
- {"label": "ENTER", "x": 0, "y": 1, "w" : 2}
+ {"matrix": [0, 1], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1, "w": 2}
]
}
}
diff --git a/keyboards/kakunpc/business_card/alpha/alpha.h b/keyboards/kakunpc/business_card/alpha/alpha.h
deleted file mode 100644
index 98075768998f..000000000000
--- a/keyboards/kakunpc/business_card/alpha/alpha.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 .
- */
-#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 }, \
-}
diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
index 5ec079fe7fe7..e2d26c506e8c 100644
--- a/keyboards/kakunpc/business_card/alpha/info.json
+++ b/keyboards/kakunpc/business_card/alpha/info.json
@@ -18,12 +18,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"1", "x":0, "y":0},
- {"label":"2", "x":1, "y":0},
- {"label":"3", "x":2, "y":0},
- {"label":"4", "x":0, "y":1},
- {"label":"5", "x":1, "y":1},
- {"label":"6", "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}
]
}
}
diff --git a/keyboards/kakunpc/business_card/beta/beta.h b/keyboards/kakunpc/business_card/beta/beta.h
deleted file mode 100644
index 21a334e8a9e5..000000000000
--- a/keyboards/kakunpc/business_card/beta/beta.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 .
- */
-#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, \
- k10, k11, \
- k20, k21 \
-) \
-{ \
- { k21, k20 }, \
- { k11, k10 }, \
- { k01, k00 }, \
-}
diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
index 67018ad14280..0854d327ac3f 100644
--- a/keyboards/kakunpc/business_card/beta/info.json
+++ b/keyboards/kakunpc/business_card/beta/info.json
@@ -18,12 +18,14 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"1", "x":0, "y":0},
- {"label":"2", "x":1, "y":0},
- {"label":"3", "x":0, "y":1},
- {"label":"4", "x":1, "y":1},
- {"label":"5", "x":0, "y":2},
- {"label":"6", "x":1, "y":2}
+ {"matrix": [2, 1], "x": 0, "y": 0},
+ {"matrix": [2, 0], "x": 1, "y": 0},
+
+ {"matrix": [1, 1], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+
+ {"matrix": [0, 1], "x": 0, "y": 2},
+ {"matrix": [0, 0], "x": 1, "y": 2}
]
}
}
diff --git a/keyboards/keebio/bamfk4/bamfk4.c b/keyboards/keebio/bamfk4/bamfk4.c
index 6a382bfaf63e..52fe61e39e99 100644
--- a/keyboards/keebio/bamfk4/bamfk4.c
+++ b/keyboards/keebio/bamfk4/bamfk4.c
@@ -1,7 +1,7 @@
// Copyright 2022 Danny Nguyen (@nooges)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "bamfk4.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/keebio/bamfk4/bamfk4.h b/keyboards/keebio/bamfk4/bamfk4.h
deleted file mode 100644
index 0bdc2f602f18..000000000000
--- a/keyboards/keebio/bamfk4/bamfk4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03 \
-) { \
- { k00, k01, k02, k03 }, \
-}
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index cb4728ae34db..97316b8ce547 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -18,10 +18,10 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "w": 2, "h": 2},
- {"x": 2, "y": 0, "w": 2, "h": 2},
- {"x": 4, "y": 0, "w": 2, "h": 2},
- {"x": 6, "y": 0, "w": 2, "h": 2}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 2, "h": 2},
+ {"matrix": [0, 1], "x": 2, "y": 0, "w": 2, "h": 2},
+ {"matrix": [0, 2], "x": 4, "y": 0, "w": 2, "h": 2},
+ {"matrix": [0, 3], "x": 6, "y": 0, "w": 2, "h": 2}
]
}
}
diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.h b/keyboards/keebio/bigswitchseat/bigswitchseat.h
deleted file mode 100644
index 3f66c6bc3b2f..000000000000
--- a/keyboards/keebio/bigswitchseat/bigswitchseat.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2021 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00 \
-) { \
- { k00 } \
-}
diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/info.json
index 03301a75f100..f2fe9771ed44 100644
--- a/keyboards/keebio/bigswitchseat/info.json
+++ b/keyboards/keebio/bigswitchseat/info.json
@@ -17,7 +17,9 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"x": 0, "y": 0, "w": 4, "h": 4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
+ ]
}
}
}
diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json
index 38e2902dae41..83347a74f472 100644
--- a/keyboards/keebwerk/nano_slider/info.json
+++ b/keyboards/keebwerk/nano_slider/info.json
@@ -22,14 +22,16 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
- {"x":3, "y":1.25, "h":2}
+ {"matrix": [1, 1], "x": 0, "y": 0},
+
+ {"matrix": [1, 2], "x": 0, "y": 1.25},
+ {"matrix": [1, 0], "x": 1, "y": 1.25},
+ {"matrix": [0, 0], "x": 2, "y": 1.25},
+
+ {"matrix": [0, 1], "x": 0, "y": 2.25},
+ {"matrix": [0, 2], "x": 1, "y": 2.25},
+ {"matrix": [0, 3], "x": 2, "y": 2.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25, "h": 2}
]
}
}
diff --git a/keyboards/keebwerk/nano_slider/nano_slider.h b/keyboards/keebwerk/nano_slider/nano_slider.h
deleted file mode 100644
index 31985130b031..000000000000
--- a/keyboards/keebwerk/nano_slider/nano_slider.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Duckle
- *
- * 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 .
- */
-
-#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( \
- K11, \
- K12, K10, K00, \
- K01, K02, K03, K13 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 } \
-}
diff --git a/keyboards/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/info.json
index f993b81f2f6e..c993b41ac97f 100644
--- a/keyboards/keebzdotnet/wazowski/info.json
+++ b/keyboards/keebzdotnet/wazowski/info.json
@@ -18,20 +18,26 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1, "y":0},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":7, "y":2},
- {"x":0, "y":2},
- {"x":2, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":1},
- {"x":1, "y":3},
- {"x":3, "y":3},
- {"x":7, "y":0},
- {"x":8, "y":1}
+ {"matrix": [0, 0], "x": 1, "y": 0},
+
+ {"matrix": [0, 1], "x": 3, "y": 1},
+ {"matrix": [0, 2], "x": 4, "y": 1},
+ {"matrix": [0, 3], "x": 5, "y": 1},
+
+ {"matrix": [0, 4], "x": 7, "y": 2},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 2, "y": 2},
+ {"matrix": [1, 2], "x": 4, "y": 2},
+ {"matrix": [1, 3], "x": 5, "y": 2},
+
+ {"matrix": [1, 4], "x": 6, "y": 1},
+
+ {"matrix": [2, 0], "x": 1, "y": 3},
+ {"matrix": [2, 1], "x": 3, "y": 3},
+
+ {"matrix": [2, 3], "x": 7, "y": 0},
+
+ {"matrix": [2, 4], "x": 8, "y": 1}
]
}
}
diff --git a/keyboards/keebzdotnet/wazowski/wazowski.h b/keyboards/keebzdotnet/wazowski/wazowski.h
deleted file mode 100644
index 98af75a0e8b7..000000000000
--- a/keyboards/keebzdotnet/wazowski/wazowski.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 keebzdotnet
- *
- * 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 .
- */
-
-#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, k08, k09, \
- k10, k11, k12, k13 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k05, k06, k07, k08, k09 }, \
- { k10, k11, KC_NO, k12, k13 } \
-}
diff --git a/keyboards/keyhive/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
index ec54b59f207c..0418dee767d0 100755
--- a/keyboards/keyhive/honeycomb/honeycomb.h
+++ b/keyboards/keyhive/honeycomb/honeycomb.h
@@ -17,16 +17,3 @@
#define SET_LED_MAGENTA (RED_LED_ON(); GRN_LED_OFF(); BLU_LED_ON(); )
#define SET_LED_CYAN (RED_LED_OFF(); GRN_LED_ON(); BLU_LED_ON(); )
#define SET_LED_WHITE (RED_LED_ON(); GRN_LED_ON(); BLU_LED_ON(); )
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k13, k14, k15, k16, \
- k09, k10, k11, k12, \
- k05, k06, k07, k08, \
- k01, k02, k03, k04 \
-) \
-{ \
- { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16 } \
-}
diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index 693b836ede2f..639edee28d53 100644
--- a/keyboards/keyhive/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
@@ -13,25 +13,25 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"matrix": [0, 12], "x": 0, "y": 0},
+ {"matrix": [0, 13], "x": 1, "y": 0},
+ {"matrix": [0, 14], "x": 2, "y": 0},
+ {"matrix": [0, 15], "x": 3, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
+ {"matrix": [0, 8], "x": 0, "y": 1},
+ {"matrix": [0, 9], "x": 1, "y": 1},
+ {"matrix": [0, 10], "x": 2, "y": 1},
+ {"matrix": [0, 11], "x": 3, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
+ {"matrix": [0, 4], "x": 0, "y": 2},
+ {"matrix": [0, 5], "x": 1, "y": 2},
+ {"matrix": [0, 6], "x": 2, "y": 2},
+ {"matrix": [0, 7], "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": 3},
+ {"matrix": [0, 1], "x": 1, "y": 3},
+ {"matrix": [0, 2], "x": 2, "y": 3},
+ {"matrix": [0, 3], "x": 3, "y": 3}
]
}
}
diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json
index ecafbeb0891f..d370601b62a4 100644
--- a/keyboards/keyhive/navi10/info.json
+++ b/keyboards/keyhive/navi10/info.json
@@ -6,10 +6,5 @@
"usb": {
"vid": "0xFEED",
"pid": "0x0000"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [{"label":"Fn", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Del", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"Up", "x":1, "y":3}, {"label":"Left", "x":0, "y":4}, {"label":"Down", "x":1, "y":4}, {"label":"Right", "x":2, "y":4}]
- }
}
}
diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json
index c721a3f39079..548d91766705 100644
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ b/keyboards/keyhive/navi10/rev0/info.json
@@ -8,5 +8,24 @@
},
"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},
+
+ {"matrix": [2, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/keyhive/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c
index f6c1f362ca4f..1eefa5cd9132 100644
--- a/keyboards/keyhive/navi10/rev0/rev0.c
+++ b/keyboards/keyhive/navi10/rev0/rev0.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "rev0.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev0/rev0.h b/keyboards/keyhive/navi10/rev0/rev0.h
deleted file mode 100644
index b162d144251f..000000000000
--- a/keyboards/keyhive/navi10/rev0/rev0.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k0, k1, k2, \
- k3, k4, k5, \
- \
- k6, \
- k7, k8, k9 \
-) \
-{ \
- {k0, k1, k2}, \
- {k3, k4, k5}, \
- {KC_NO, k6, KC_NO}, \
- {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json
index a0e51a3fb807..8db97e67b71b 100644
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ b/keyboards/keyhive/navi10/rev2/info.json
@@ -8,5 +8,24 @@
},
"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},
+
+ {"matrix": [2, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/keyhive/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c
index fed0e03897c2..1eefa5cd9132 100644
--- a/keyboards/keyhive/navi10/rev2/rev2.c
+++ b/keyboards/keyhive/navi10/rev2/rev2.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "rev2.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev2/rev2.h b/keyboards/keyhive/navi10/rev2/rev2.h
deleted file mode 100644
index b162d144251f..000000000000
--- a/keyboards/keyhive/navi10/rev2/rev2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k0, k1, k2, \
- k3, k4, k5, \
- \
- k6, \
- k7, k8, k9 \
-) \
-{ \
- {k0, k1, k2}, \
- {k3, k4, k5}, \
- {KC_NO, k6, KC_NO}, \
- {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json
index 704ca05e91e4..82df44e8667c 100644
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ b/keyboards/keyhive/navi10/rev3/info.json
@@ -8,5 +8,24 @@
},
"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},
+
+ {"matrix": [2, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/keyhive/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c
index 2b0355aa36e3..1eefa5cd9132 100644
--- a/keyboards/keyhive/navi10/rev3/rev3.c
+++ b/keyboards/keyhive/navi10/rev3/rev3.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "rev3.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h
deleted file mode 100644
index b162d144251f..000000000000
--- a/keyboards/keyhive/navi10/rev3/rev3.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k0, k1, k2, \
- k3, k4, k5, \
- \
- k6, \
- k7, k8, k9 \
-) \
-{ \
- {k0, k1, k2}, \
- {k3, k4, k5}, \
- {KC_NO, k6, KC_NO}, \
- {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json
index 2738a173f543..6e6d0a31a6cf 100644
--- a/keyboards/keysofkings/twokey/info.json
+++ b/keyboards/keysofkings/twokey/info.json
@@ -23,9 +23,10 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0.5, "y": 0},
- {"x": 0, "y": 1.5},
- {"x": 1, "y": 1.5}
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5}
]
}
}
diff --git a/keyboards/keysofkings/twokey/twokey.h b/keyboards/keysofkings/twokey/twokey.h
deleted file mode 100755
index 169bc9eb11ef..000000000000
--- a/keyboards/keysofkings/twokey/twokey.h
+++ /dev/null
@@ -1,28 +0,0 @@
- /* Copyright 2020 Keys of Kings
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, \
- K10, K11 \
-) { \
- { K00, KC_NO }, \
- { K10, K11 } \
-}
-
diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json
index 668b4d2f0b66..236cc335a202 100644
--- a/keyboards/kingly_keys/romac/info.json
+++ b/keyboards/kingly_keys/romac/info.json
@@ -17,7 +17,23 @@
"bootloader": "caterina",
"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}]
+ "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},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/kingly_keys/romac/romac.h b/keyboards/kingly_keys/romac/romac.h
deleted file mode 100644
index e6fb9694d2e8..000000000000
--- a/keyboards/kingly_keys/romac/romac.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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 } \
-}
diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json
index 5976a3ff861d..abaf8e99f461 100644
--- a/keyboards/kingly_keys/romac_plus/info.json
+++ b/keyboards/kingly_keys/romac_plus/info.json
@@ -22,7 +22,23 @@
"bootloader": "caterina",
"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}]
+ "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},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/kingly_keys/romac_plus/romac_plus.h b/keyboards/kingly_keys/romac_plus/romac_plus.h
deleted file mode 100644
index e6fb9694d2e8..000000000000
--- a/keyboards/kingly_keys/romac_plus/romac_plus.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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 } \
-}
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index 8aa1f12dbf1e..bf84afdccc1e 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -17,7 +17,10 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1}
+ ]
}
}
}
diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.h b/keyboards/kingly_keys/smd_milk/smd_milk.h
deleted file mode 100644
index 8f294817f912..000000000000
--- a/keyboards/kingly_keys/smd_milk/smd_milk.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Sebastian Williams
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, \
- K01 \
-) { \
- { K00 }, \
- { K01 } \
-}
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index 16f229f04384..61deb7d6e020 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -22,7 +22,17 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "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":4, "y":1}]
+ "layout": [
+ {"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": 4, "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}
+ ]
}
}
}
diff --git a/keyboards/kingly_keys/soap/soap.h b/keyboards/kingly_keys/soap/soap.h
deleted file mode 100644
index 8d5eba3ad25f..000000000000
--- a/keyboards/kingly_keys/soap/soap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
- *
- * 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 .
- *
- * Note: Matrix is a little wacky with the rotary encoder click mapping being
- * on the opposite side of the board. Remember to pay attention to
- * the 13th column where the lone key mapped for rotary encoder click (K132).
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 } \
-}
diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json
index b0fbe9f9ed04..1cbffbd568bc 100644
--- a/keyboards/kiwikeebs/macro/info.json
+++ b/keyboards/kiwikeebs/macro/info.json
@@ -23,14 +23,16 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0, "y": 0 },
- { "label": "k01", "x": 1, "y": 0 },
- { "label": "k02", "x": 2, "y": 0 },
+ {"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": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2}
- { "label": "k03", "x": 0, "y": 1 },
- { "label": "k04", "x": 1, "y": 1 },
- { "label": "k05", "x": 2, "y": 1 },
- { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 }
]
}
}
diff --git a/keyboards/kiwikeebs/macro/macro.c b/keyboards/kiwikeebs/macro/macro.c
deleted file mode 100644
index cc854cf139e3..000000000000
--- a/keyboards/kiwikeebs/macro/macro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 .
- */
-
-#include "macro.h"
diff --git a/keyboards/kiwikeebs/macro/macro.h b/keyboards/kiwikeebs/macro/macro.h
deleted file mode 100644
index ee7c6bd47d95..000000000000
--- a/keyboards/kiwikeebs/macro/macro.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 .
- */
-
-#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 \
-) { \
- { k00, k01, k02, KC_NO }, \
- { k03, k04, k05, k06 } \
-}
diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json
index 5af9357c954c..efdf6d860f98 100644
--- a/keyboards/kiwikeebs/macro_v2/info.json
+++ b/keyboards/kiwikeebs/macro_v2/info.json
@@ -23,14 +23,15 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0, "y": 0 },
- { "label": "k01", "x": 1, "y": 0 },
- { "label": "k02", "x": 2, "y": 0 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
- { "label": "k03", "x": 0, "y": 1 },
- { "label": "k04", "x": 1, "y": 1 },
- { "label": "k05", "x": 2, "y": 1 },
- { "label": "k06", "x": 3, "y": 0, "h":2, "w":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": 0, "w": 2, "h": 2}
]
}
}
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.c b/keyboards/kiwikeebs/macro_v2/macro_v2.c
deleted file mode 100644
index dd921f290feb..000000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 .
- */
-
-#include "macro_v2.h"
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.h b/keyboards/kiwikeebs/macro_v2/macro_v2.h
deleted file mode 100644
index ee7c6bd47d95..000000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 .
- */
-
-#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 \
-) { \
- { k00, k01, k02, KC_NO }, \
- { k03, k04, k05, k06 } \
-}
diff --git a/keyboards/kmac_pad/info.json b/keyboards/kmac_pad/info.json
index 9d07f3d45afe..f41da8a4526d 100644
--- a/keyboards/kmac_pad/info.json
+++ b/keyboards/kmac_pad/info.json
@@ -12,29 +12,29 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00", "x":3, "y":0},
+ {"matrix": [0, 0], "x": 3, "y": 0},
- {"label":"K10", "x":0, "y":1.25},
- {"label":"K11", "x":1, "y":1.25},
- {"label":"K12", "x":2, "y":1.25},
- {"label":"K13", "x":3, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"label":"K20", "x":0, "y":2.25},
- {"label":"K21", "x":1, "y":2.25},
- {"label":"K22", "x":2, "y":2.25},
- {"label":"K23", "x":3, "y":2.25, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 2.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, "h": 2},
- {"label":"K30", "x":0, "y":3.25},
- {"label":"K31", "x":1, "y":3.25},
- {"label":"K32", "x":2, "y":3.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},
- {"label":"K40", "x":0, "y":4.25},
- {"label":"K41", "x":1, "y":4.25},
- {"label":"K42", "x":2, "y":4.25},
- {"label":"K43", "x":3, "y":4.25, "h":2},
+ {"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, "h": 2},
- {"label":"K50", "x":0, "y":5.25, "w":2},
- {"label":"K52", "x":2, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5.25}
]
}
}
diff --git a/keyboards/kmac_pad/kmac_pad.c b/keyboards/kmac_pad/kmac_pad.c
index 87083668cc74..3de2cb711eb2 100644
--- a/keyboards/kmac_pad/kmac_pad.c
+++ b/keyboards/kmac_pad/kmac_pad.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "kmac_pad.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
diff --git a/keyboards/kmac_pad/kmac_pad.h b/keyboards/kmac_pad/kmac_pad.h
deleted file mode 100644
index 99796083390f..000000000000
--- a/keyboards/kmac_pad/kmac_pad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 talsu
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K41, K42, K43, \
- K50, K52 \
-) \
-{ \
- { K00, KC_NO, KC_NO, KC_NO }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, KC_NO }, \
- { K40, K41, K42, K43 }, \
- { K50, KC_NO, K52, KC_NO } \
-}
diff --git a/keyboards/knops/mini/info.json b/keyboards/knops/mini/info.json
index 68cf23a41a3f..ed33aa4c9ebd 100644
--- a/keyboards/knops/mini/info.json
+++ b/keyboards/knops/mini/info.json
@@ -17,7 +17,15 @@
"bootloader": "atmel-dfu",
"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}]
+ "layout": [
+ {"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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
+ ]
}
}
}
diff --git a/keyboards/knops/mini/mini.h b/keyboards/knops/mini/mini.h
deleted file mode 100644
index e028dea6d7ad..000000000000
--- a/keyboards/knops/mini/mini.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2017 Pawnerd
- *
- * 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 .
- */
-
-#include "quantum.h"
-
-#pragma once
-
-// 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, k04, k05 \
-) { \
- { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json
index 2558cb9faa93..7d3a710bc544 100644
--- a/keyboards/late9/rev1/info.json
+++ b/keyboards/late9/rev1/info.json
@@ -18,12 +18,29 @@
"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":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}
+ {"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},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5}
]
}
}
diff --git a/keyboards/late9/rev1/rev1.c b/keyboards/late9/rev1/rev1.c
index ffba137189f3..aa45141b068d 100644
--- a/keyboards/late9/rev1/rev1.c
+++ b/keyboards/late9/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 .
*/
-#include "rev1.h"
+#include "quantum.h"
// OLED logo
#ifdef OLED_ENABLE
diff --git a/keyboards/late9/rev1/rev1.h b/keyboards/late9/rev1/rev1.h
deleted file mode 100644
index 2e5bb5ec52c3..000000000000
--- a/keyboards/late9/rev1/rev1.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * 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 .
- */
-#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.
- */
-
-/* Matrix layout
- * ,--------------.
- * | 00 | 01 | 02 |
- * |----|----|----|
- * | 10 | 11 | 12 |
- * |----|----|----|
- * | 20 | 21 | 22 |
- * |----|----|----|
- * | 30 | 31 | 32 |
- * |----|----|----|
- * | 40 | 41 | 42 |
- * |----|----|----|
- * | 50 | 51 | 52 |
- * `--------------'
- */
-#define LAYOUT( \
- k00, k01, k02, \
- k10, k11, k12, \
- k20, k21, k22, \
- k30, k31, k32, \
- k40, k41, k42, \
- k50, k51, k52 \
-) \
-{ \
- {k00, k01, k02}, \
- {k10, k11, k12}, \
- {k20, k21, k22}, \
- {k30, k31, k32}, \
- {k40, k41, k42}, \
- {k50, k51, k52} \
-}
diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
index 7766de75ae1c..c5a844141b64 100644
--- a/keyboards/latincompass/latinpad/info.json
+++ b/keyboards/latincompass/latinpad/info.json
@@ -25,25 +25,28 @@
"LAYOUT": {
"layout": [
- {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
- {"label":"/", "x":0.8, "y":0, "w":0.8, "h":0.8},
+ {"matrix": [4, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+ {"matrix": [4, 1], "x": 0.8, "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":"+", "x":3, "y":1},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"+", "x":3, "y":2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"Enter", "x":3, "y":3},
- {"label":"0", "x":0, "y":4},
- {"label":"0", "x":1, "y":4},
- {"label":".", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4}
]
}
}
diff --git a/keyboards/latincompass/latinpad/latinpad.c b/keyboards/latincompass/latinpad/latinpad.c
index 51826bd6a0de..b476b4c238a3 100644
--- a/keyboards/latincompass/latinpad/latinpad.c
+++ b/keyboards/latincompass/latinpad/latinpad.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "latinpad.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/latincompass/latinpad/latinpad.h b/keyboards/latincompass/latinpad/latinpad.h
deleted file mode 100644
index a2c275aec385..000000000000
--- a/keyboards/latincompass/latinpad/latinpad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 latincompass
- *
- * 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 .
- */
-#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( \
- K40, K41, \
- 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 }, \
- { K40, K41, KC_NO, KC_NO } \
-}
diff --git a/keyboards/lazydesigners/cassette8/cassette8.h b/keyboards/lazydesigners/cassette8/cassette8.h
deleted file mode 100755
index 9b640638f6d2..000000000000
--- a/keyboards/lazydesigners/cassette8/cassette8.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 LAZYDESIGNERS
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13 \
-) { \
- { K00, K01, K02, K03, }, \
- { K10, K11, K12, K13 }, \
-}
diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json
index 8960356ea5e8..7adcc6286875 100755
--- a/keyboards/lazydesigners/cassette8/info.json
+++ b/keyboards/lazydesigners/cassette8/info.json
@@ -18,14 +18,15 @@
"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":0, "y":1},
- {"label":"6", "x":1, "y":1},
- {"label":"7", "x":2, "y":1},
- {"label":"8", "x":3, "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},
+
+ {"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}
]
}
}
diff --git a/keyboards/lefty/info.json b/keyboards/lefty/info.json
index ac48f157aa7d..b964980d7dac 100644
--- a/keyboards/lefty/info.json
+++ b/keyboards/lefty/info.json
@@ -13,38 +13,42 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"F1", "x":0.5, "y":0},
- {"label":"Escape", "x":2, "y":0},
- {"label":"1", "x":3, "y":0},
- {"label":"2", "x":4, "y":0},
- {"label":"3", "x":5, "y":0},
- {"label":"4", "x":6, "y":0},
- {"label":"5", "x":7, "y":0},
- {"label":"6", "x":8, "y":0},
- {"label":"F2", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
- {"label":"A", "x":3.25, "y":2},
- {"label":"S", "x":4.25, "y":2},
- {"label":"D", "x":5.25, "y":2},
- {"label":"F", "x":6.25, "y":2},
- {"label":"G", "x":7.25, "y":2},
- {"label":"Shift", "x":1.25, "y":3, "w":2.25},
- {"label":"Z", "x":3.5, "y":3},
- {"label":"X", "x":4.5, "y":3},
- {"label":"C", "x":5.5, "y":3},
- {"label":"V", "x":6.5, "y":3},
- {"label":"B", "x":7.5, "y":3},
- {"label":"Control", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"label":"Layer2", "x":5.75, "y":4, "w":2},
- {"label":"Layer3", "x":7.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.25, "y": 1},
+ {"matrix": [1, 3], "x": 4.25, "y": 1},
+ {"matrix": [1, 4], "x": 5.25, "y": 1},
+ {"matrix": [1, 5], "x": 6.25, "y": 1},
+ {"matrix": [1, 6], "x": 7.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/lefty/lefty.c b/keyboards/lefty/lefty.c
index a3e5301ea1fe..b1bea424b0f3 100644
--- a/keyboards/lefty/lefty.c
+++ b/keyboards/lefty/lefty.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "lefty.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
diff --git a/keyboards/lefty/lefty.h b/keyboards/lefty/lefty.h
deleted file mode 100644
index 2466552353fa..000000000000
--- a/keyboards/lefty/lefty.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// keymap
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, \
- K10, K11, K12, K13, K14, K15, K16, \
- K20, K21, K22, K23, K24, K25, K26, \
- K31, K32, K33, K34, K35, K36, \
- K41, K43, K44, K46 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
- { KC_NO, K31, K32, K33, K34, K35, K36, KC_NO }, \
- { KC_NO, K41, KC_NO, K43, K44, KC_NO, K46, KC_NO } \
-}
-
-#define LAYOUT LAYOUT
diff --git a/keyboards/lizard_trick/tenkey_plusplus/info.json b/keyboards/lizard_trick/tenkey_plusplus/info.json
index d2eb93b0fd2e..a14dcbdee7db 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/info.json
+++ b/keyboards/lizard_trick/tenkey_plusplus/info.json
@@ -25,31 +25,31 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "Mute", "x": 0, "y": 0, "w": 1.3},
- {"label": "MDPL", "x": 1.3, "y": 0, "w": 1.4},
- {"label": "MDNX", "x": 2.7, "y": 0, "w": 1.3},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.3},
+ {"matrix": [0, 1], "x": 1.3, "y": 0, "w": 1.4},
+ {"matrix": [0, 3], "x": 2.7, "y": 0, "w": 1.3},
- {"label": "Num Lock", "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": "7", "x": 0, "y": 2},
- {"label": "8", "x": 1, "y": 2},
- {"label": "9", "x": 2, "y": 2},
- {"label": "+", "x": 3, "y": 2, "h": 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, "h": 2},
- {"label": "4", "x": 0, "y": 3},
- {"label": "5", "x": 1, "y": 3},
- {"label": "6", "x": 2, "y": 3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
- {"label": "1", "x": 0, "y": 4},
- {"label": "2", "x": 1, "y": 4},
- {"label": "3", "x": 2, "y": 4},
- {"label": "Enter", "x": 3, "y": 4, "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, "h": 2},
- {"label": "0", "x": 0, "y": 5, "w": 2},
- {"label": ".", "x": 2, "y": 5}
+ {"matrix": [5, 1], "x": 0, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5}
]
}
}
diff --git a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h b/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h
deleted file mode 100644
index 72f388065268..000000000000
--- a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2020 Jonathon Carstens jonathon@lizardtrick.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 .
-*/
-
-#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, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K41, K42, K43, \
- K51, K52 \
-) { \
- { K00, K01, KC_NO, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, KC_NO }, \
- { K40, K41, K42, K43 }, \
- { KC_NO, K51, K52, KC_NO } \
-}
diff --git a/keyboards/m10a/info.json b/keyboards/m10a/info.json
index de50593b9d66..08da6e584a01 100644
--- a/keyboards/m10a/info.json
+++ b/keyboards/m10a/info.json
@@ -22,19 +22,19 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
- {"x":1, "y":3, "w":2}
+ {"matrix": [3, 2], "x": 1, "y": 3, "w": 2}
]
}
}
diff --git a/keyboards/m10a/m10a.h b/keyboards/m10a/m10a.h
deleted file mode 100644
index 2eb14b7a7f7d..000000000000
--- a/keyboards/m10a/m10a.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright
- * 2017 Josh Black (@consolenaut)
- * 2021 QMK
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, \
- k10, k11, k12, \
- k20, k21, k22, \
- k32 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
- { k20, k21, k22 }, \
- { ___, ___, k32 } \
-}
diff --git a/keyboards/machine_industries/m4_a/info.json b/keyboards/machine_industries/m4_a/info.json
index f6532a640981..7ab42a021305 100644
--- a/keyboards/machine_industries/m4_a/info.json
+++ b/keyboards/machine_industries/m4_a/info.json
@@ -18,10 +18,10 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0, "h":2},
- {"x":0, "y":1, "w":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0, "h": 2},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 2}
]
}
}
diff --git a/keyboards/machine_industries/m4_a/m4_a.h b/keyboards/machine_industries/m4_a/m4_a.h
deleted file mode 100644
index 13d30109910c..000000000000
--- a/keyboards/machine_industries/m4_a/m4_a.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 naut
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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, k11, \
- k10 \
-) { \
- { k00, k01 }, \
- { k10, k11 } \
-}
diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json
index 9abafac9462e..96eaf9fad620 100644
--- a/keyboards/makrosu/info.json
+++ b/keyboards/makrosu/info.json
@@ -26,14 +26,13 @@
"layouts": {
"LAYOUT": {
"layout": [
-
- {"label" : "Esc", "x":0, "y":0},
- {"label" : "F1", "x":1, "y":0},
- {"label" : "F2", "x":2, "y":0},
-
- {"label" : "Lower", "x":0, "y":1},
- {"label" : "Z", "x":1.5, "y":1},
- {"label" : "X", "x":2.5, "y":1}
+ {"matrix": [0, 2], "x": 0, "y": 0},
+ {"matrix": [0, 3], "x": 1, "y": 0},
+ {"matrix": [0, 4], "x": 2, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1.5, "y": 1},
+ {"matrix": [0, 5], "x": 2.5, "y": 1}
]
}
}
diff --git a/keyboards/makrosu/makrosu.h b/keyboards/makrosu/makrosu.h
deleted file mode 100644
index ee61ce118584..000000000000
--- a/keyboards/makrosu/makrosu.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#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( \
- K02, K03, K04, \
- K00, K01, K05 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05 }, \
-}
-
diff --git a/keyboards/maple_computing/6ball/6ball.h b/keyboards/maple_computing/6ball/6ball.h
deleted file mode 100644
index ef73a7205312..000000000000
--- a/keyboards/maple_computing/6ball/6ball.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k05, k00, k01, \
- k04, k03, k02 \
-) { \
- { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index 38f127cffc73..bed6b1fdda03 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -18,13 +18,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0},
- {"x":2, "y":0.5},
+ {"matrix": [0, 5], "x": 0, "y": 0.5},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0.5},
- {"x":0, "y":1.5},
- {"x":1, "y":2},
- {"x":2, "y":1.5}
+ {"matrix": [0, 4], "x": 0, "y": 1.5},
+ {"matrix": [0, 3], "x": 1, "y": 2},
+ {"matrix": [0, 2], "x": 2, "y": 1.5}
]
}
}
diff --git a/keyboards/maple_computing/christmas_tree/christmas_tree.h b/keyboards/maple_computing/christmas_tree/christmas_tree.h
deleted file mode 100644
index 68eefca6a865..000000000000
--- a/keyboards/maple_computing/christmas_tree/christmas_tree.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k10, k20, k30, k40, k50 \
-) { \
- { k00 }, \
- { k10 }, \
- { k20 }, \
- { k30 }, \
- { k40 }, \
- { k50 } \
-}
diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
index 3ef81f9fd332..0a19667957c7 100644
--- a/keyboards/maple_computing/christmas_tree/info.json
+++ b/keyboards/maple_computing/christmas_tree/info.json
@@ -19,7 +19,16 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1},
+ {"matrix": [2, 0], "x": 1.5, "y": 1},
+
+ {"matrix": [3, 0], "x": 0, "y": 2},
+ {"matrix": [4, 0], "x": 1, "y": 2},
+ {"matrix": [5, 0], "x": 2, "y": 2}
+ ]
}
}
}
diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json
index e9cf604e199e..3b971cb67360 100644
--- a/keyboards/maple_computing/ivy/rev1/info.json
+++ b/keyboards/maple_computing/ivy/rev1/info.json
@@ -21,9 +21,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 1], "x": 1, "y": 0},
+ {"matrix": [2, 2], "x": 2, "y": 0}
]
}
}
diff --git a/keyboards/maple_computing/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h
deleted file mode 100644
index 444224d2b69e..000000000000
--- a/keyboards/maple_computing/ivy/rev1/rev1.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, \
- K01, \
- K02 \
- ) \
- { \
- { K00, KC_NO, KC_NO }, \
- { KC_NO, K01, KC_NO }, \
- { KC_NO, KC_NO, K02 }, \
- }
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index 49f4c16bc9b8..fe882742c3f2 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
@@ -18,17 +18,17 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
- {"x":0, "y":3},
- {"x":1, "y":3}
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3}
]
}
}
diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h
deleted file mode 100644
index 54d72d5e54bd..000000000000
--- a/keyboards/maple_computing/launchpad/rev1/rev1.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, \
- k10, k11, \
- k20, k21, \
- k30, k31 \
-) { \
- { k00, k01 }, \
- { k10, k11 }, \
- { k20, k21 }, \
- { k30, k31 } \
-}
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index fd4de0bcbfb1..ef80f02bfac9 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -17,7 +17,14 @@
"bootloader": "atmel-dfu",
"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, "w":2}]
+ "layout": [
+ {"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, "w": 2}
+ ]
}
}
}
diff --git a/keyboards/maple_computing/the_ruler/the_ruler.h b/keyboards/maple_computing/the_ruler/the_ruler.h
deleted file mode 100644
index 171d21a072a6..000000000000
--- a/keyboards/maple_computing/the_ruler/the_ruler.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05 ) { \
- { K00, K01, K02, K03, K04, K05 } \
-}
diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json
index 71fac9f31bc6..5100c77dc2e1 100644
--- a/keyboards/massdrop/thekey/info.json
+++ b/keyboards/massdrop/thekey/info.json
@@ -21,9 +21,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00 (D4,D2)", "x": 0, "y": 0 },
- { "label": "K01 (D4,D1)", "x": 1, "y": 0 },
- { "label": "K02 (D4,D0)", "x": 2, "y": 0 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
]
}
}
diff --git a/keyboards/massdrop/thekey/thekey.h b/keyboards/massdrop/thekey/thekey.h
deleted file mode 100644
index f889c973c7f5..000000000000
--- a/keyboards/massdrop/thekey/thekey.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Joe Maples
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02 \
-) { \
- { K00, K01, K02 }, \
-}
diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json
index 01604e6f2e42..f1079147bc95 100644
--- a/keyboards/massdrop/thekey_v2/info.json
+++ b/keyboards/massdrop/thekey_v2/info.json
@@ -18,9 +18,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00 (D4,D2)", "x": 0, "y": 0 },
- { "label": "K01 (D4,D1)", "x": 1, "y": 0 },
- { "label": "K02 (D4,D0)", "x": 2, "y": 0 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
]
}
}
diff --git a/keyboards/massdrop/thekey_v2/thekey_v2.h b/keyboards/massdrop/thekey_v2/thekey_v2.h
deleted file mode 100644
index c3b8e1a8ead3..000000000000
--- a/keyboards/massdrop/thekey_v2/thekey_v2.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 Jason Wihardja
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02 \
-) { \
- { K00, K01, K02 }, \
-}
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index bfea52ad4d96..487314f5cc55 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -23,13 +23,15 @@
"bootloader": "atmel-dfu",
"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 } ]
+ "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}
+ ]
}
}
}
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.h b/keyboards/maxr1998/pulse4k/pulse4k.h
index cc0a373b66ad..ba4514d45166 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.h
+++ b/keyboards/maxr1998/pulse4k/pulse4k.h
@@ -19,15 +19,6 @@
#include "quantum.h"
-#define LAYOUT( \
- k00, k01, k02, \
- k10, k11, k12 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
-}
-
void encoder_one_update(bool clockwise);
void encoder_two_update(bool clockwise);
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index b396b4a6af9e..cc3adf9d0289 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -27,13 +27,42 @@
"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": "k10", "x": 1, "y": 1}, {"label": "k11", "x": 2, "y": 1}, {"label": "k12", "x": 3, "y": 1}, {"label": "k13", "x": 4, "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": "k30", "x": 0, "y": 3}, {"label": "k31", "x": 1, "y": 3}, {"label": "k32", "x": 2, "y": 3}, {"label": "k33", "x": 3, "y": 3}, {"label": "k34", "x": 4, "y": 3},
- {"label": "k40", "x": 0, "y": 4}, {"label": "k41", "x": 1, "y": 4}, {"label": "k42", "x": 2, "y": 4}, {"label": "k43", "x": 3, "y": 4}, {"label": "k44", "x": 4, "y": 4},
- {"label": "k50", "x": 0, "y": 5}, {"label": "k51", "x": 1, "y": 5}, {"label": "k52", "x": 2, "y": 5}, {"label": "k53", "x": 3, "y": 5}, {"label": "k54", "x": 4, "y": 5},
- {"label": "BACK00", "x": 1, "y": 6}, {"label": "BACK01", "x": 2, "y": 6}, {"label": "BACK02", "x": 3, "y": 6}
+ {"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},
+
+ {"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},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+ {"matrix": [5, 4], "x": 4, "y": 5},
+
+ {"matrix": [0, 0], "x": 1, "y": 6},
+ {"matrix": [1, 0], "x": 2, "y": 6},
+ {"matrix": [2, 0], "x": 3, "y": 6}
]
}
}
diff --git a/keyboards/mechwild/murphpad/murphpad.c b/keyboards/mechwild/murphpad/murphpad.c
index ba5183f2c301..3ad6409e9297 100644
--- a/keyboards/mechwild/murphpad/murphpad.c
+++ b/keyboards/mechwild/murphpad/murphpad.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "murphpad.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/mechwild/murphpad/murphpad.h b/keyboards/mechwild/murphpad/murphpad.h
deleted file mode 100644
index 2735e22057d3..000000000000
--- a/keyboards/mechwild/murphpad/murphpad.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* 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, k54, \
- \
- BACK00, BACK01, BACK02 \
-\
-) { \
- { BACK00, k00, k01, k02, k03 }, \
- { BACK01, k10, k11, k12, k13 }, \
- { BACK02, k20, k21, k22, k23 }, \
- { k30, k31, k32, k33, k34 }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 } \
-}
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index 0d45c97d50e8..a00223252285 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -29,21 +29,26 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k00", "x":0, "y":0},
- {"label":"k01", "x":1.5, "y":0},
- {"label":"k02", "x":2.5, "y":0},
- {"label":"k03", "x":3.5, "y":0},
- {"label":"k05", "x":5, "y":0},
- {"label":"k10", "x":0, "y":1.25},
- {"label":"k15", "x":5, "y":1.25},
- {"label":"k20", "x":0, "y":2.25},
- {"label":"k25", "x":5, "y":2.25},
- {"label":"k30", "x":0, "y":3.25},
- {"label":"k35", "x":5, "y":3.25},
- {"label":"k31", "x":1, "y":4.5},
- {"label":"k32", "x":2, "y":4.5},
- {"label":"k33", "x":3, "y":4.5},
- {"label":"k34", "x":4, "y":4.5}]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [1, 1], "x": 2.5, "y": 0},
+ {"matrix": [2, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 2], "x": 5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 2], "x": 5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 2], "x": 5, "y": 3.25},
+
+ {"matrix": [0, 3], "x": 1, "y": 4.5},
+ {"matrix": [1, 3], "x": 2, "y": 4.5},
+ {"matrix": [2, 3], "x": 3, "y": 4.5},
+ {"matrix": [3, 3], "x": 4, "y": 4.5}
+ ]
}
}
}
diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.h b/keyboards/mechwild/puckbuddy/puckbuddy.h
index 31bcad6917c6..294cdb1839c5 100644
--- a/keyboards/mechwild/puckbuddy/puckbuddy.h
+++ b/keyboards/mechwild/puckbuddy/puckbuddy.h
@@ -5,29 +5,6 @@
#include "quantum.h"
-#define ___ KC_NO
-
-/* 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, k05,\
- k10, k15,\
- k20, k25,\
- k30, k35,\
- k31, k32, k33, k34 \
-) { \
- { k00, k01, k05, k31 }, \
- { k10, k02, k15, k32 }, \
- { k20, k03, k25, k33 }, \
- { k30, ___, k35, k34 } \
-}
-
typedef union {
uint32_t raw;
struct {
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json
index a5db1935cb70..fe20e701ba4f 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/info.json
@@ -27,16 +27,18 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.5, "y":0, "w":1.25, "h":2},
+ {"matrix": [2, 1], "x": 0, "y": 0},
- {"x":0, "y":1},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1}
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [2, 0], "x": 4.5, "y": 0, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 2], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1},
+ {"matrix": [1, 1], "x": 2.5, "y": 1},
+ {"matrix": [1, 2], "x": 3.5, "y": 1}
]
}
}
diff --git a/keyboards/merge/iso_macro/iso_macro.h b/keyboards/merge/iso_macro/iso_macro.h
deleted file mode 100644
index dfa93864498b..000000000000
--- a/keyboards/merge/iso_macro/iso_macro.h
+++ /dev/null
@@ -1,29 +0,0 @@
- /* Copyright 2021 duoshock
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k21, k00, k01, k02, k20, \
- k22, k10, k11, k12 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
- { k20, k21, k22 } \
-}
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index 983d4e61fc11..807a8ed9801b 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -22,11 +22,12 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [
- {"label":"0", "x":0, "y":0},
- {"label":"1", "x":1.25, "y":0},
- {"label":"2", "x":2.25, "y":0},
- {"label":"3", "x":3.25, "y":0}
+ "layout": [
+ {"matrix": [1, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 0], "x": 3.25, "y": 0}
]
}
}
diff --git a/keyboards/merge/uc1/uc1.h b/keyboards/merge/uc1/uc1.h
deleted file mode 100644
index 84e655d1b9a2..000000000000
--- a/keyboards/merge/uc1/uc1.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 duoshock
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k11, k00, k01, k10 \
-) \
-{ \
- { k00, k01 }, \
- { k10, k11 } \
-}
diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json
index ea42f18d3097..ad7f5da8e862 100644
--- a/keyboards/mexsistor/ludmila/info.json
+++ b/keyboards/mexsistor/ludmila/info.json
@@ -18,12 +18,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "SW1", "x": 0, "y": 0},
- {"label": "SW3", "x": 1, "y": 0},
- {"label": "Encoder", "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
- {"label": "SW2", "x": 0, "y": 1},
- {"label": "SW4", "x": 1, "y": 1}
+ {"matrix": [2, 0], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1}
]
}
}
diff --git a/keyboards/mexsistor/ludmila/ludmila.h b/keyboards/mexsistor/ludmila/ludmila.h
deleted file mode 100644
index fc95a5492e69..000000000000
--- a/keyboards/mexsistor/ludmila/ludmila.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Kevin M.
- *
- * 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 .
- */
-
-#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, k20, \
- k10, k11 \
-) { \
- { k00, k01, }, \
- { k10, k11, }, \
- { k20 } \
- }
diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json
index 02f10ea9a2d0..975c41481b9d 100644
--- a/keyboards/millipad/info.json
+++ b/keyboards/millipad/info.json
@@ -23,19 +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": "k04", "x": 4, "y": 0},
- {"label": "k05", "x": 5, "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": "k15", "x": 5, "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},
+ {"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}
]
}
}
diff --git a/keyboards/millipad/millipad.h b/keyboards/millipad/millipad.h
deleted file mode 100644
index 35eb843d6fba..000000000000
--- a/keyboards/millipad/millipad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Jirou
- *
- * 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 .
- */
-
-#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, \
- k10, k11, k12, k13, k14, k15 \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 } \
-}
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json
index 6731a44fad1e..50708462c123 100644
--- a/keyboards/momokai/tap_duo/info.json
+++ b/keyboards/momokai/tap_duo/info.json
@@ -18,11 +18,12 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "x": 0, "y": 0 },
- { "x": 1, "y": 0 },
- { "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5 },
- { "x": 1, "y": 1.25, "w": 0.5, "h": 0.5 },
- { "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5},
+ {"matrix": [0, 3], "x": 1, "y": 1.25, "w": 0.5, "h": 0.5},
+ {"matrix": [0, 4], "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5}
]
}
}
diff --git a/keyboards/momokai/tap_duo/tap_duo.c b/keyboards/momokai/tap_duo/tap_duo.c
index bd5381083862..4e0bc9f42c66 100644
--- a/keyboards/momokai/tap_duo/tap_duo.c
+++ b/keyboards/momokai/tap_duo/tap_duo.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "tap_duo.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/momokai/tap_duo/tap_duo.h b/keyboards/momokai/tap_duo/tap_duo.h
deleted file mode 100644
index 74b87dab62b1..000000000000
--- a/keyboards/momokai/tap_duo/tap_duo.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Momokai
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, \
- K02, K03, K04 \
-) { \
- { K00, K01, K02, K03, K04} \
-}
-
diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json
index c0406d73ce3f..a45aa5c9e3ce 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -18,12 +18,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00 (E0,E6)", "x": 0, "y": 0, "w": 1.5, "h": 1.5 },
- { "label": "K01 (E0,B2)", "x": 2.25, "y": 0, "w": 1.5, "h": 1.5 },
- { "label": "K02 (E0,B7)", "x": 4.5, "y": 0, "w": 1.5, "h": 1.5 },
- { "label": "K03 (E0,D1)", "x": 2.25, "y": 2.5 },
- { "label": "K04 (E0,D2)", "x": 3.75, "y": 2.5 },
- { "label": "K05 (E0,D3)", "x": 5.25, "y": 2.5 }
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5, "h": 1.5},
+ {"matrix": [0, 1], "x": 2.25, "y": 0, "w": 1.5, "h": 1.5},
+ {"matrix": [0, 2], "x": 4.5, "y": 0, "w": 1.5, "h": 1.5},
+
+ {"matrix": [0, 3], "x": 2.25, "y": 2.5},
+ {"matrix": [0, 4], "x": 3.75, "y": 2.5},
+ {"matrix": [0, 5], "x": 5.25, "y": 2.5}
]
}
}
diff --git a/keyboards/momokai/tap_trio/tap_trio.c b/keyboards/momokai/tap_trio/tap_trio.c
index 69b850e04cc0..73957745a9e0 100644
--- a/keyboards/momokai/tap_trio/tap_trio.c
+++ b/keyboards/momokai/tap_trio/tap_trio.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "tap_trio.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/momokai/tap_trio/tap_trio.h b/keyboards/momokai/tap_trio/tap_trio.h
deleted file mode 100644
index b2b17b343603..000000000000
--- a/keyboards/momokai/tap_trio/tap_trio.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Momokai
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, \
- K03, K04, K05 \
-) { \
- { K00, K01, K02, K03, K04, K05 } \
-}
-
diff --git a/keyboards/ncc1701kb/info.json b/keyboards/ncc1701kb/info.json
index 61a4c20e8f41..246edae94754 100644
--- a/keyboards/ncc1701kb/info.json
+++ b/keyboards/ncc1701kb/info.json
@@ -27,15 +27,17 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"label":"Encoder", "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}
]
}
}
diff --git a/keyboards/ncc1701kb/ncc1701kb.h b/keyboards/ncc1701kb/ncc1701kb.h
deleted file mode 100644
index 639adc409d67..000000000000
--- a/keyboards/ncc1701kb/ncc1701kb.h
+++ /dev/null
@@ -1,14 +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 } \
-}
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
index 4cc1a3d9d5cf..8a8f357c96f4 100755
--- a/keyboards/neopad/rev1/info.json
+++ b/keyboards/neopad/rev1/info.json
@@ -24,8 +24,13 @@
"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}
+ {"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}
]
}
}
diff --git a/keyboards/neopad/rev1/rev1.c b/keyboards/neopad/rev1/rev1.c
index 665294451afe..86e47c893258 100755
--- a/keyboards/neopad/rev1/rev1.c
+++ b/keyboards/neopad/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 .
*/
-#include "rev1.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/neopad/rev1/rev1.h b/keyboards/neopad/rev1/rev1.h
deleted file mode 100755
index 87b9405bb160..000000000000
--- a/keyboards/neopad/rev1/rev1.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * 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 .
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, \
- k10, k11, k12 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 } \
-}
diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json
index 51c563e37b07..5b5b3abfac7f 100644
--- a/keyboards/nightly_boards/n2/info.json
+++ b/keyboards/nightly_boards/n2/info.json
@@ -17,7 +17,10 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":0, "y":1}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 1], "x": 0, "y": 1}
+ ]
}
}
}
diff --git a/keyboards/nightly_boards/n2/n2.h b/keyboards/nightly_boards/n2/n2.h
deleted file mode 100644
index 10242e41d7b3..000000000000
--- a/keyboards/nightly_boards/n2/n2.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, \
- K11 \
-) { \
- { K00, KC_NO }, \
- { KC_NO, K11 }, \
-}
diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json
index 37c1a7934907..8c83af04856b 100644
--- a/keyboards/nightly_boards/n9/info.json
+++ b/keyboards/nightly_boards/n9/info.json
@@ -18,17 +18,18 @@
"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}
+ ]
}
}
}
diff --git a/keyboards/nightly_boards/n9/n9.h b/keyboards/nightly_boards/n9/n9.h
deleted file mode 100644
index 6b0dbdc2e678..000000000000
--- a/keyboards/nightly_boards/n9/n9.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * 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 .
- */
-
-#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 }, \
-}
diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json
index 8aa4f080432e..d166f96e3533 100644
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -24,23 +24,24 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.5, "y":0},
-
- {"x":1.25, "y":1.25},
- {"x":2.25, "y":1.25},
- {"x":3.25, "y":1.25},
- {"x":4.25, "y":1.25},
-
- {"x":1.25, "y":2.25},
- {"x":2.25, "y":2.25},
- {"x":3.25, "y":2.25},
- {"x":4.25, "y":2.25}
- ]
+ {"matrix": [2, 0], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [2, 1], "x": 2, "y": 0},
+
+ {"matrix": [2, 2], "x": 3.5, "y": 0},
+ {"matrix": [1, 4], "x": 4.5, "y": 0},
+ {"matrix": [2, 3], "x": 5.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [0, 1], "x": 2.25, "y": 1.25},
+ {"matrix": [0, 2], "x": 3.25, "y": 1.25},
+ {"matrix": [0, 3], "x": 4.25, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 2.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 2.25},
+ {"matrix": [1, 2], "x": 3.25, "y": 2.25},
+ {"matrix": [1, 3], "x": 4.25, "y": 2.25}
+ ]
}
}
}
diff --git a/keyboards/nightly_boards/octopad/octopad.h b/keyboards/nightly_boards/octopad/octopad.h
index 941afd3f0776..33cf8e0b6893 100644
--- a/keyboards/nightly_boards/octopad/octopad.h
+++ b/keyboards/nightly_boards/octopad/octopad.h
@@ -18,22 +18,3 @@
#include "quantum.h"
#include "encoder_action.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( \
- E00A, K04, E00B, E01A, K14, E01B, \
- K00, K01, K02, K03, \
- K10, K11, K12, K13 \
-\
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { E00A, E00B, E01A, E01B, KC_NO } \
-}
diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json
index 2471032f349c..2cbf1c89f892 100644
--- a/keyboards/nightly_boards/octopadplus/info.json
+++ b/keyboards/nightly_boards/octopadplus/info.json
@@ -45,17 +45,19 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":3, "y":0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
-
- {"x":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
- {"x":3, "y":2.25}]
+ {"matrix": [0, 4], "x": 0, "y": 0},
+ {"matrix": [1, 5], "x": 3, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2, "y": 1.25},
+ {"matrix": [0, 3], "x": 3, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2, "y": 2.25},
+ {"matrix": [1, 3], "x": 3, "y": 2.25}
+ ]
}
}
}
diff --git a/keyboards/nightly_boards/octopadplus/octopadplus.h b/keyboards/nightly_boards/octopadplus/octopadplus.h
deleted file mode 100644
index b32e6d8f2f00..000000000000
--- a/keyboards/nightly_boards/octopadplus/octopadplus.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * 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 .
- */
-
-#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, K15, \
- K00, K01, K02, K03, \
- K10, K11, K12, K13 \
-\
-) { \
- { K00, K01, K02, K03, K04, KC_NO }, \
- { K10, K11, K12, K13, KC_NO, K15 }, \
-}
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index 2bd7d0915640..5de23f561858 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -23,7 +23,33 @@
},
"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":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":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, "h":2}, {"x":0, "y":5, "w":2}, {"x":2, "y":5}]
+ "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": [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, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"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, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5}
+ ]
}
}
}
diff --git a/keyboards/novelkeys/nk20/nk20.c b/keyboards/novelkeys/nk20/nk20.c
index 207e2277daeb..23350e103729 100644
--- a/keyboards/novelkeys/nk20/nk20.c
+++ b/keyboards/novelkeys/nk20/nk20.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "nk20.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
// clang-format off
diff --git a/keyboards/novelkeys/nk20/nk20.h b/keyboards/novelkeys/nk20/nk20.h
deleted file mode 100644
index a553a1af3eff..000000000000
--- a/keyboards/novelkeys/nk20/nk20.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Yiancar
- *
- * 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 .
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT( \
- K00, K01, K02, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K41, K42, K43, \
- K50, K52 \
-) { \
- { K00, K01, K02, XXX }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, XXX }, \
- { K40, K41, K42, K43 }, \
- { K50, XXX, K52, XXX }, \
-}
diff --git a/keyboards/np12/info.json b/keyboards/np12/info.json
index 002d3cc29bb4..834c51f57747 100644
--- a/keyboards/np12/info.json
+++ b/keyboards/np12/info.json
@@ -22,20 +22,23 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [
- { "label": "k34", "x": 3, "y": 0 },
- { "label": "k00", "x": 0, "y": 1 },
- { "label": "k01", "x": 1, "y": 1 },
- { "label": "k02", "x": 2, "y": 1 },
- { "label": "k03", "x": 3, "y": 1 },
- { "label": "k10", "x": 0, "y": 2 },
- { "label": "k11", "x": 1, "y": 2 },
- { "label": "k12", "x": 2, "y": 2 },
- { "label": "k13", "x": 3, "y": 2 },
- { "label": "k20", "x": 0, "y": 3 },
- { "label": "k21", "x": 1, "y": 3 },
- { "label": "k22", "x": 2, "y": 3 },
- { "label": "k23", "x": 3, "y": 3 }
+ "layout": [
+ {"matrix": [3, 4], "x": 3, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3}
]
}
}
diff --git a/keyboards/np12/np12.c b/keyboards/np12/np12.c
deleted file mode 100644
index 062bd9a83307..000000000000
--- a/keyboards/np12/np12.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 nut1414
- *
- * 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 .
- */
-
-#include "np12.h"
diff --git a/keyboards/np12/np12.h b/keyboards/np12/np12.h
deleted file mode 100644
index ee82786d832b..000000000000
--- a/keyboards/np12/np12.h
+++ /dev/null
@@ -1,31 +0,0 @@
- /* Copyright 2021 nut1414
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k34, \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23 \
-) { \
- { k00, k01, k02, k03, KC_NO}, \
- { k10, k11, k12, k13, KC_NO}, \
- { k20, k21, k22, k23, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, KC_NO, k34 } \
-}
diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json
index 7f0e25396d21..c6c7378eea4b 100644
--- a/keyboards/ocean/stealth/info.json
+++ b/keyboards/ocean/stealth/info.json
@@ -17,7 +17,11 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 2.25},
+ {"matrix": [0, 1], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [0, 2], "x": 1.25, "y": 1}
+ ]
}
}
}
diff --git a/keyboards/ocean/stealth/stealth.h b/keyboards/ocean/stealth/stealth.h
deleted file mode 100644
index b86cd2f05f73..000000000000
--- a/keyboards/ocean/stealth/stealth.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(\
- K00, K01, K02 \
-) \
-{ \
- { K00, K01, K02 }, \
-}
diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json
index 97cca23a2966..0a69a4a029a0 100644
--- a/keyboards/pabile/p18/info.json
+++ b/keyboards/pabile/p18/info.json
@@ -24,24 +24,27 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":0, "y":2},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2},
- {"x":0, "y":3},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3}
+ {"matrix": [0, 4], "x": 1.25, "y": 0},
+ {"matrix": [0, 3], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 1], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 4], "x": 1.25, "y": 1},
+ {"matrix": [1, 3], "x": 2.25, "y": 1},
+ {"matrix": [1, 2], "x": 3.25, "y": 1},
+ {"matrix": [1, 1], "x": 4.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1.25, "y": 2},
+ {"matrix": [2, 3], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 1], "x": 4.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1.25, "y": 3},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 1], "x": 4.25, "y": 3}
]
}
}
diff --git a/keyboards/pabile/p18/p18.h b/keyboards/pabile/p18/p18.h
deleted file mode 100644
index 3be26191cecc..000000000000
--- a/keyboards/pabile/p18/p18.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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 \
-) \
-{ \
- {KC_NO, k04, k03, k02, k01}, \
- {KC_NO, k14, k13, k12, k11}, \
- {k20, k24, k23, k22, k21}, \
- {k30, k34, k33, k32, k31} \
-}
diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json
index f8587610df47..99f43a73f2b9 100644
--- a/keyboards/palette1202/info.json
+++ b/keyboards/palette1202/info.json
@@ -24,22 +24,22 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label":"Tab", "x": 0, "y": 0.75 },
- { "label":"GUI + A", "x": 1, "y": 0.25 },
- { "label":"E", "x": 2, "y": 0 },
- { "label":"P", "x": 3, "y": 0.5 },
- { "label":"GUI + 0", "x": 4, "y": 0 },
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0},
- { "label":"Fn", "x": 0, "y": 1.75 },
- { "label":"M", "x": 1, "y": 1.25 },
- { "label":"BackSP", "x": 2, "y": 1 },
- { "label":"B", "x": 3, "y": 1.5 },
- { "label":"HYPR", "x": 4, "y": 1 },
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1},
- { "label":"Shift", "x": 1, "y": 2.5 },
- { "label":"LGUI", "x": 2, "y": 2.5 },
- { "label":"GUI + Z", "x": 3, "y": 2.5 },
- { "label":"Space", "x": 4, "y": 2.5, "r": 15 }
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
]
}
}
diff --git a/keyboards/palette1202/palette1202.c b/keyboards/palette1202/palette1202.c
index a193964e3e9c..b2712df90697 100644
--- a/keyboards/palette1202/palette1202.c
+++ b/keyboards/palette1202/palette1202.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "palette1202.h"
+#include "quantum.h"
// initialize OLED if OLED is enabled
#ifdef OLED_ENABLE
diff --git a/keyboards/palette1202/palette1202.h b/keyboards/palette1202/palette1202.h
deleted file mode 100644
index 737e381f73ee..000000000000
--- a/keyboards/palette1202/palette1202.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 niltea
- *
- * 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 .
- */
-#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, \
- k10, k11, k12, k13, k14, \
- k21, k22, k23, k24 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { KC_NO, k21, k22, k23, k24 }, \
-}
diff --git a/keyboards/paprikman/albacore/albacore.c b/keyboards/paprikman/albacore/albacore.c
index d90adce2bb93..b6cf742a1131 100644
--- a/keyboards/paprikman/albacore/albacore.c
+++ b/keyboards/paprikman/albacore/albacore.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "albacore.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/paprikman/albacore/albacore.h b/keyboards/paprikman/albacore/albacore.h
deleted file mode 100644
index b725eba8b8c0..000000000000
--- a/keyboards/paprikman/albacore/albacore.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 paprikman
- *
- * 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 .
- */
-
-#pragma once
-#define ___ KC_NO
-
-#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( \
- K01, K02, K03, \
- K10, K11, K12, K13 \
-) { \
- { ___, K01, K02, K03 }, \
- { K10, K11, K12, K13 } \
-}
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index e415a587ca3c..23a45a6c0bd7 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -21,14 +21,14 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0.75, "y": 0},
- {"x": 1.75, "y": 0},
- {"x": 2.75, "y": 0},
+ {"matrix": [0, 1], "x": 0.75, "y": 0},
+ {"matrix": [0, 2], "x": 1.75, "y": 0},
+ {"matrix": [0, 3], "x": 2.75, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"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}
]
}
}
diff --git a/keyboards/pdxkbc/info.json b/keyboards/pdxkbc/info.json
index 522d7959b05c..b6d93e7de1c9 100644
--- a/keyboards/pdxkbc/info.json
+++ b/keyboards/pdxkbc/info.json
@@ -17,7 +17,16 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"reddit", "x":0, "y":0}, {"label":"discord", "x":1, "y":0}, {"label":"badge", "x":0, "y":1}, {"label":"hack", "x":1, "y":1}, {"label":"volu", "x":0, "y":2}, {"label":"vold", "x":1, "y":2}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2}
+ ]
}
}
}
diff --git a/keyboards/pdxkbc/pdxkbc.h b/keyboards/pdxkbc/pdxkbc.h
deleted file mode 100644
index 4700252a66d6..000000000000
--- a/keyboards/pdxkbc/pdxkbc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 Franklin Harding
- *
- * 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 .
- */
-#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, \
- k10, k11, \
- k20, k21 \
-) \
-{ \
- { k00, k01 }, \
- { k10, k11 }, \
- { k20, k21 }, \
-}
diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json
index 67fb157d8e44..1ee1a11399fd 100644
--- a/keyboards/pimentoso/paddino02/rev1/info.json
+++ b/keyboards/pimentoso/paddino02/rev1/info.json
@@ -18,18 +18,18 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0.25},
- {"x":2, "y":0},
- {"x":3, "y":0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"x":0, "y":1.5},
- {"x":1, "y":1.25},
- {"x":2, "y":1},
- {"x":3, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"x":2, "y":2.75},
- {"x":3, "y":2.75}
+ {"matrix": [2, 2], "x": 2, "y": 2.75},
+ {"matrix": [2, 3], "x": 3, "y": 2.75}
]
}
}
diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.h b/keyboards/pimentoso/paddino02/rev1/rev1.h
deleted file mode 100755
index cca4a3c26312..000000000000
--- a/keyboards/pimentoso/paddino02/rev1/rev1.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K22, K23 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { KC_NO, KC_NO, K22, K23 } \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json
index 5d46fbbf23b9..f297903f6807 100644
--- a/keyboards/pimentoso/paddino02/rev2/left/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/left/info.json
@@ -18,18 +18,18 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0.25},
- {"x":2, "y":0},
- {"x":3, "y":0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"x":0, "y":1.5},
- {"x":1, "y":1.25},
- {"x":2, "y":1},
- {"x":3, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"x":2, "y":2.75},
- {"x":3, "y":2.75}
+ {"matrix": [2, 2], "x": 2, "y": 2.75},
+ {"matrix": [2, 3], "x": 3, "y": 2.75}
]
}
}
diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.h b/keyboards/pimentoso/paddino02/rev2/left/left.h
deleted file mode 100755
index cca4a3c26312..000000000000
--- a/keyboards/pimentoso/paddino02/rev2/left/left.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K22, K23 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { KC_NO, KC_NO, K22, K23 } \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json
index d7a29410b087..385ee96af913 100644
--- a/keyboards/pimentoso/paddino02/rev2/right/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/right/info.json
@@ -18,18 +18,18 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.25},
- {"x":1, "y":0},
- {"x":2, "y":0.25},
- {"x":3, "y":0.5},
+ {"matrix": [0, 3], "x": 0, "y": 0.25},
+ {"matrix": [0, 2], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0.25},
+ {"matrix": [0, 0], "x": 3, "y": 0.5},
- {"x":0, "y":1.25},
- {"x":1, "y":1},
- {"x":2, "y":1.25},
- {"x":3, "y":1.5},
+ {"matrix": [1, 3], "x": 0, "y": 1.25},
+ {"matrix": [1, 2], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1.25},
+ {"matrix": [1, 0], "x": 3, "y": 1.5},
- {"x":0, "y":2.75},
- {"x":1, "y":2.75}
+ {"matrix": [2, 1], "x": 0, "y": 2.75},
+ {"matrix": [2, 0], "x": 1, "y": 2.75}
]
}
}
diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.h b/keyboards/pimentoso/paddino02/rev2/right/right.h
deleted file mode 100755
index ac7ed847de2a..000000000000
--- a/keyboards/pimentoso/paddino02/rev2/right/right.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21 \
-) { \
- { K03, K02, K01, K00 }, \
- { K13, K12, K11, K10 }, \
- { K21, K20, KC_NO, KC_NO } \
-}
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index a4db1d10641a..a45bdb9b3d58 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -18,19 +18,19 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"esc", "x":5.25, "y":0},
- {"label":"enter", "x":6.25, "y":0},
+ {"matrix": [0, 9], "x": 5.25, "y": 0},
+ {"matrix": [0, 8], "x": 6.25, "y": 0},
- {"label":"slow", "x":0, "y":1},
- {"label":"fire", "x":1, "y":1},
- {"label":"rapid", "x":2, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
- {"label":"up", "x":6.25, "y":1.75},
- {"label":"left", "x":5.25, "y":2.75},
- {"label":"down", "x":6.25, "y":2.75},
- {"label":"right", "x":7.25, "y":2.75},
+ {"matrix": [0, 7], "x": 6.25, "y": 1.75},
+ {"matrix": [0, 4], "x": 5.25, "y": 2.75},
+ {"matrix": [0, 5], "x": 6.25, "y": 2.75},
+ {"matrix": [0, 6], "x": 7.25, "y": 2.75},
- {"label":"bomb", "x":3.25, "y":3}
+ {"matrix": [0, 3], "x": 3.25, "y": 3}
]
}
}
diff --git a/keyboards/pimentoso/touhoupad/touhoupad.h b/keyboards/pimentoso/touhoupad/touhoupad.h
deleted file mode 100644
index 8c7bfc36e131..000000000000
--- a/keyboards/pimentoso/touhoupad/touhoupad.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Michele Ferri
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k09, k08, \
- k00, k01, k02, \
- k07, \
- k04, k05, k06, \
- k03 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
-}
diff --git a/keyboards/psuieee/pluto12/info.json b/keyboards/psuieee/pluto12/info.json
index ef7af4d3a8cd..d997f60cfa3e 100644
--- a/keyboards/psuieee/pluto12/info.json
+++ b/keyboards/psuieee/pluto12/info.json
@@ -23,18 +23,20 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "M1", "x": 0, "y": 0 },
- { "label": "M2", "x": 1, "y": 0 },
- { "label": "M3", "x": 2, "y": 0 },
- { "label": "M4", "x": 3, "y": 0 },
- { "label": "M5", "x": 0, "y": 1 },
- { "label": "M6", "x": 1, "y": 1 },
- { "label": "M7", "x": 2, "y": 1 },
- { "label": "M8", "x": 3, "y": 1 },
- { "label": "M9", "x": 0, "y": 2 },
- { "label": "M10", "x": 1, "y": 2 },
- { "label": "M11", "x": 2, "y": 2 },
- { "label": "M12", "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}
]
}
}
diff --git a/keyboards/psuieee/pluto12/pluto12.h b/keyboards/psuieee/pluto12/pluto12.h
deleted file mode 100644
index fc3f3911563e..000000000000
--- a/keyboards/psuieee/pluto12/pluto12.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2021-22 Will McGloughlin (@wymcg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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 \
-) { \
- {K00, K01, K02, K03}, \
- {K10, K11, K12, K13}, \
- {K20, K21, K22, K23} \
-}
diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json
index d5bab56bf3fd..25abece1923b 100644
--- a/keyboards/puck/info.json
+++ b/keyboards/puck/info.json
@@ -18,18 +18,21 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"SW1", "x":0, "y":0},
- {"label":"SW2", "x":1, "y":0},
- {"label":"SW3", "x":2, "y":0},
- {"label":"SW4", "x":0, "y":1},
- {"label":"SW5", "x":1, "y":1},
- {"label":"SW6", "x":2, "y":1},
- {"label":"SW7", "x":0, "y":2},
- {"label":"SW8", "x":1, "y":2},
- {"label":"SW9", "x":2, "y":2},
- {"label":"SW10", "x":0, "y":3},
- {"label":"SW11", "x":1, "y":3},
- {"label":"SW12", "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}
]
}
}
diff --git a/keyboards/puck/puck.h b/keyboards/puck/puck.h
deleted file mode 100644
index 31fff7955529..000000000000
--- a/keyboards/puck/puck.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#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 } \
-}
diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json
index 93d2a04323bb..997158c29f13 100644
--- a/keyboards/qvex/lynepad/info.json
+++ b/keyboards/qvex/lynepad/info.json
@@ -23,7 +23,21 @@
"bootloader": "caterina",
"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}]
+ "layout": [
+ {"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}
+ ]
}
}
}
diff --git a/keyboards/qvex/lynepad/lynepad.c b/keyboards/qvex/lynepad/lynepad.c
index 33620d9da323..cc69e12240cc 100644
--- a/keyboards/qvex/lynepad/lynepad.c
+++ b/keyboards/qvex/lynepad/lynepad.c
@@ -11,7 +11,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 .
*/
-#include "lynepad.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Encoder pins
diff --git a/keyboards/qvex/lynepad/lynepad.h b/keyboards/qvex/lynepad/lynepad.h
deleted file mode 100644
index 2a3015ceea0d..000000000000
--- a/keyboards/qvex/lynepad/lynepad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 KemoNine
- *
- * 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 .
- */
-#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, \
- k10, k11, k12, k13, \
- k20, k21, k22 \
-) \
-{ \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, KC_NO } \
-}
diff --git a/keyboards/rad/info.json b/keyboards/rad/info.json
index 90528d1bd9cf..e134a31147f3 100644
--- a/keyboards/rad/info.json
+++ b/keyboards/rad/info.json
@@ -19,50 +19,20 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "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, 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}
]
}
}
diff --git a/keyboards/rad/rad.h b/keyboards/rad/rad.h
deleted file mode 100644
index a9d669c92924..000000000000
--- a/keyboards/rad/rad.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K01, K02, \
- K10, K11, K12, \
- K20, K21, K22, \
- K30, K31, K32 \
-) { \
- { KC_NO, K01, K02 }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 }, \
- { K30, K31, K32 } \
-}
diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json
index c52e03880ae4..f899e6b841ec 100644
--- a/keyboards/reviung/reviung5/info.json
+++ b/keyboards/reviung/reviung5/info.json
@@ -26,11 +26,11 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k00", "x": 0, "y": 0},
- {"label": "k01", "x": 1, "y": 0.25},
- {"label": "k02", "x": 2, "y": 0.25},
- {"label": "k03", "x": 3, "y": 0.25},
- {"label": "k04", "x": 4, "y": 0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0}
]
}
}
diff --git a/keyboards/reviung/reviung5/reviung5.h b/keyboards/reviung/reviung5/reviung5.h
deleted file mode 100644
index f58f755800dc..000000000000
--- a/keyboards/reviung/reviung5/reviung5.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 gtips
- *
- * 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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index f5dc1bea95ab..81af3361ad62 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -30,28 +30,28 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"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},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"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},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"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},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4}
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
]
}
}
diff --git a/keyboards/rocketboard_16/rocketboard_16.h b/keyboards/rocketboard_16/rocketboard_16.h
deleted file mode 100644
index 927e21f7e614..000000000000
--- a/keyboards/rocketboard_16/rocketboard_16.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-
-#define LAYOUT( \
- K00, K01, \
- K02, K03, K04, K05, \
- K06, K07, K08, K09, \
- K0A, K0B, K0C, K0D, \
- K0E, K0F, K10, K11 \
-) { \
- { K00, KC_NO, KC_NO, K01 }, \
- { K02, K03, K04, K05 }, \
- { K06, K07, K08, K09 }, \
- { K0A, K0B, K0C, K0D }, \
- { K0E, K0F, K10, K11 } \
-}
diff --git a/keyboards/rotr/info.json b/keyboards/rotr/info.json
index f68be3ceee75..ce744d32f160 100644
--- a/keyboards/rotr/info.json
+++ b/keyboards/rotr/info.json
@@ -22,7 +22,11 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
+ ]
}
}
}
diff --git a/keyboards/rotr/rotr.c b/keyboards/rotr/rotr.c
deleted file mode 100644
index 8df10909f6ba..000000000000
--- a/keyboards/rotr/rotr.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rotr.h"
diff --git a/keyboards/rotr/rotr.h b/keyboards/rotr/rotr.h
deleted file mode 100644
index bf2ff12929e1..000000000000
--- a/keyboards/rotr/rotr.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02 \
-) { \
- { K00, K01, K02 } \
-}
diff --git a/keyboards/rubi/info.json b/keyboards/rubi/info.json
index fec1b52ea373..d61ef3454818 100644
--- a/keyboards/rubi/info.json
+++ b/keyboards/rubi/info.json
@@ -23,24 +23,29 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":3, "y":0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
- {"x":3, "y":2.25, "h":2},
- {"x":0, "y":3.25},
- {"x":1, "y":3.25},
- {"x":2, "y":3.25},
- {"x":0, "y":4.25},
- {"x":1, "y":4.25},
- {"x":2, "y":4.25},
- {"x":3, "y":4.25, "h":2},
- {"x":0, "y":5.25, "w":2},
- {"x":2, "y":5.25}
+ {"matrix": [2, 3], "x": 3, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2, "y": 1.25},
+ {"matrix": [0, 3], "x": 3, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2, "y": 2.25},
+ {"matrix": [1, 3], "x": 3, "y": 2.25, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 3.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.25},
+ {"matrix": [3, 1], "x": 1, "y": 4.25},
+ {"matrix": [3, 2], "x": 2, "y": 4.25},
+ {"matrix": [3, 3], "x": 3, "y": 4.25, "h": 2},
+
+ {"matrix": [4, 1], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 5.25}
]
}
}
diff --git a/keyboards/rubi/rubi.h b/keyboards/rubi/rubi.h
index 17454c8c7983..e7c8ae137ad9 100644
--- a/keyboards/rubi/rubi.h
+++ b/keyboards/rubi/rubi.h
@@ -60,42 +60,3 @@ uint16_t handle_encoder_press(void);
void calcUpdate(void);
void calcInput(char input);
void calcOperands(void);
-
-/* 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.
- */
-
-/* Rubi matrix layout
- * ,---------------.
- * | 23|
- * |---------------|
- * | 00| 01| 02| 03|
- * |---------------|
- * | 10| 11| 12| |
- * |-----------| 13|
- * | 20| 21| 22| |
- * |---------------|
- * | 30| 31| 32| |
- * |-----------| 33|
- * | 41 | 42| |
- * `---------------'
- */
-#define LAYOUT( \
- k23, \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, \
- k30, k31, k32, k33, \
- k41, k42 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 }, \
- { KC_NO, k41, k42, KC_NO } \
-}
diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.h b/keyboards/s_ol/0xc_pad/0xc_pad.h
index 52c9c3adfda4..013f4c89dcb9 100644
--- a/keyboards/s_ol/0xc_pad/0xc_pad.h
+++ b/keyboards/s_ol/0xc_pad/0xc_pad.h
@@ -17,18 +17,6 @@
#include "quantum.h"
-#define LAYOUT( \
- k01, k05, \
- k02, k06, k10, \
- k03, k07, k11, k15, \
- k08, k12, k16 \
-) { \
- { k01, k05, KC_NO, KC_NO }, \
- { k02, k06, k10, KC_NO }, \
- { k03, k07, k11, k15 }, \
- { KC_NO, k08, k12, k16 } \
-}
-
#define LED_LAYOUT( \
\
k01, k05, k02, k06, k10, k03, k07, k11, k15, k08, k12, k16) \
diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json
index decf0ae1cb27..f1c47c4623b2 100644
--- a/keyboards/s_ol/0xc_pad/info.json
+++ b/keyboards/s_ol/0xc_pad/info.json
@@ -9,18 +9,21 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":0.5, "y":1},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":0.5, "y":3},
- {"x":1.5, "y":3},
- {"x":2.5, "y":3}
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.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": [3, 1], "x": 0.5, "y": 3},
+ {"matrix": [3, 2], "x": 1.5, "y": 3},
+ {"matrix": [3, 3], "x": 2.5, "y": 3}
]
}
},
diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
index 3cef936a33b2..3553928e8bd3 100644
--- a/keyboards/salicylic_acid3/nafuda/info.json
+++ b/keyboards/salicylic_acid3/nafuda/info.json
@@ -18,13 +18,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Mouse", "x":1, "y":0},
- {"label":"Backspace", "x":0, "y":0.5},
- {"label":"\u2191", "x":1, "y":1},
- {"label":"Browser", "x":2, "y":0.5},
- {"label":"\u2190", "x":0, "y":1.5},
- {"label":"\u2193", "x":1, "y":2},
- {"label":"\u2192", "x":2, "y":1.5}
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 0.5},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 0.5},
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 1.5}
]
}
}
diff --git a/keyboards/salicylic_acid3/nafuda/nafuda.h b/keyboards/salicylic_acid3/nafuda/nafuda.h
deleted file mode 100644
index 008a9c16f4bc..000000000000
--- a/keyboards/salicylic_acid3/nafuda/nafuda.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/*
- * ,-----------------.
- * | | L01 | |
- * |-----------------+
- * | L10 | L11 | L12 |
- * |-----------------+
- * | L20 | L21 | L22 |
- * |-----------------'
- */
-
-#define LAYOUT( \
- L01, \
- L10, L11, L12, \
- L20, L21, L22 \
- ) \
- { \
- {KC_NO, L01,KC_NO }, \
- { L10, L11, L12 }, \
- { L20, L21, L22 } \
- }
diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json
index 1ab426b2af97..3911634dc074 100644
--- a/keyboards/sawnsprojects/satxri6key/info.json
+++ b/keyboards/sawnsprojects/satxri6key/info.json
@@ -18,13 +18,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1}
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1}
]
}
}
diff --git a/keyboards/sawnsprojects/satxri6key/satxri6key.c b/keyboards/sawnsprojects/satxri6key/satxri6key.c
index a1b988de8d45..c335e0d3efd9 100644
--- a/keyboards/sawnsprojects/satxri6key/satxri6key.c
+++ b/keyboards/sawnsprojects/satxri6key/satxri6key.c
@@ -14,7 +14,8 @@
* along with this program. If not, see .
*/
-#include "satxri6key.h"
+#include "quantum.h"
+
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
//Key Matrix to LED Indexccxxz
diff --git a/keyboards/sawnsprojects/satxri6key/satxri6key.h b/keyboards/sawnsprojects/satxri6key/satxri6key.h
deleted file mode 100644
index 2f5dca0e3752..000000000000
--- a/keyboards/sawnsprojects/satxri6key/satxri6key.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(\
- K00, K01, K02,\
- K10, K11, K12\
- ) { \
- { K00, K01, K02 },\
- { K10, K11, K12 } \
-}
diff --git a/keyboards/sck/gtm/gtm.h b/keyboards/sck/gtm/gtm.h
deleted file mode 100644
index 47625f417f78..000000000000
--- a/keyboards/sck/gtm/gtm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, K25 \
-) { \
- { K00, K01, K02, K03, K04, KC_NO }, \
- { K10, K11, K12, K13, K14, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K25 }, \
-}
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index c3cc44cd64fe..c756b02c8733 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/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": [0, 4], "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": [2, 5], "x": 5.5, "y": 0.5}
]
}
}
diff --git a/keyboards/sck/neiso/info.json b/keyboards/sck/neiso/info.json
index 2f233b4066c3..c7b75dbbc313 100644
--- a/keyboards/sck/neiso/info.json
+++ b/keyboards/sck/neiso/info.json
@@ -17,7 +17,13 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}]
+ "layout": [
+ {"matrix": [0, 1], "x": 0.25, "y": 0, "w": 2, "h": 1.25},
+ {"matrix": [0, 2], "x": 2.75, "y": 0.25, "w": 1.25, "h": 2},
+ {"matrix": [0, 0], "x": 1.5, "y": 1.5},
+ {"matrix": [0, 3], "x": 0, "y": 1.75, "w": 1.25, "h": 2},
+ {"matrix": [0, 4], "x": 1.75, "y": 2.75, "w": 2, "h": 1.25}
+ ]
}
}
}
diff --git a/keyboards/sck/neiso/neiso.h b/keyboards/sck/neiso/neiso.h
deleted file mode 100644
index 7058fab5bf24..000000000000
--- a/keyboards/sck/neiso/neiso.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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 .
- */
-#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, k02, \
- k00, \
- k03, k04 \
-) \
- { {k00, k01, k02, k03, k04} }
diff --git a/keyboards/shiro/info.json b/keyboards/shiro/info.json
index 919cce0741a6..a67261dfd2ef 100644
--- a/keyboards/shiro/info.json
+++ b/keyboards/shiro/info.json
@@ -18,21 +18,25 @@
"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}
+ {"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},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4}
]
}
}
diff --git a/keyboards/shiro/shiro.h b/keyboards/shiro/shiro.h
deleted file mode 100644
index 9e088ba555f0..000000000000
--- a/keyboards/shiro/shiro.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 T.Shinohara
- *
- * 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 .
- */
-#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, \
- k30, k31, k32, \
- k40, k41, k42 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
- { k20, k21, k22 }, \
- { k30, k31, k32 }, \
- { k40, k41, k42 } \
-}
diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json
index e0110579f81e..9e6fb3964d0b 100644
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ b/keyboards/skippys_custom_pcs/roopad/info.json
@@ -17,7 +17,33 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Num Lock", "x":1.5, "y":0}, {"label":"/", "x":2.5, "y":0}, {"label":"*", "x":3.5, "y":0}, {"label":"-", "x":4.5, "y":0}, {"x":0, "y":1}, {"label":"7", "x":1.5, "y":1}, {"label":"8", "x":2.5, "y":1}, {"label":"9", "x":3.5, "y":1}, {"label":"+", "x":4.5, "y":1, "h":2}, {"x":0, "y":2}, {"label":"4", "x":1.5, "y":2}, {"label":"5", "x":2.5, "y":2}, {"label":"6", "x":3.5, "y":2}, {"x":0, "y":3}, {"label":"1", "x":1.5, "y":3}, {"label":"2", "x":2.5, "y":3}, {"label":"3", "x":3.5, "y":3}, {"label":"Enter", "x":4.5, "y":3, "h":2}, {"x":0, "y":4}, {"label":"0", "x":1.5, "y":4, "w":2}, {"label":".", "x":3.5, "y":4}]
+ "layout": [
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
+ {"matrix": [4, 3], "x": 3.5, "y": 4}
+ ]
}
}
}
\ No newline at end of file
diff --git a/keyboards/skippys_custom_pcs/roopad/roopad.h b/keyboards/skippys_custom_pcs/roopad/roopad.h
deleted file mode 100644
index f5203833396c..000000000000
--- a/keyboards/skippys_custom_pcs/roopad/roopad.h
+++ /dev/null
@@ -1,32 +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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* RooPad Keymap Definitions */
-#define LAYOUT( \
- K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, K34, \
- K40, K41, K43 \
-) { \
- { KC_NO, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { K20, K21, K22, K23, KC_NO }, \
- { K30, K31, K32, K33, K34 }, \
- { K40, K41, KC_NO, K43, KC_NO } \
-}
diff --git a/keyboards/soup10/info.json b/keyboards/soup10/info.json
index df601d401233..7c22c087daa7 100644
--- a/keyboards/soup10/info.json
+++ b/keyboards/soup10/info.json
@@ -21,16 +21,19 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K01 (D1,E6)", "x":1, "y":0},
- {"label":"K10 (D0,D7)", "x":0, "y":1},
- {"label":"K11 (D0,E6)", "x":1, "y":1},
- {"label":"K12 (D0,B4)", "x":2, "y":1},
- {"label":"K20 (D4,D7)", "x":0, "y":2},
- {"label":"K21 (D4,E6)", "x":1, "y":2},
- {"label":"K22 (D4,B4)", "x":2, "y":2},
- {"label":"K30 (C6,D7)", "x":0, "y":3},
- {"label":"K31 (C6,E6)", "x":1, "y":3},
- {"label":"K32 (C6,B4)", "x":2, "y":3}
+ {"matrix": [0, 1], "x": 1, "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}
]
}
}
diff --git a/keyboards/soup10/soup10.h b/keyboards/soup10/soup10.h
deleted file mode 100644
index b4a2c14568e9..000000000000
--- a/keyboards/soup10/soup10.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 icesoup
- *
- * 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 .
- */
-
-#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( \
- K01, \
- K10, K11, K12, \
- K20, K21, K22, \
- K30, K31, K32 \
-) { \
- { KC_NO, K01, KC_NO }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 }, \
- { K30, K31, K32 } \
-}
diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json
index 96f523fb4b84..23f3a372e56e 100644
--- a/keyboards/swiftrax/retropad/info.json
+++ b/keyboards/swiftrax/retropad/info.json
@@ -25,7 +25,15 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"0,1", "x":0.5, "y":0}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,1", "x":1, "y":1.5}, {"label":"2,0", "x":0, "y":2.5}, {"label":"2,1", "x":1, "y":2.5}]
+ "layout": [
+ {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5}
+ ]
}
}
}
diff --git a/keyboards/swiftrax/retropad/retropad.h b/keyboards/swiftrax/retropad/retropad.h
deleted file mode 100644
index e7527d5c004f..000000000000
--- a/keyboards/swiftrax/retropad/retropad.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
- K001, \
- K100, K101, \
- K200, K201 \
-) { \
- { XXX, K001, }, \
- { K100, K101, }, \
- { K200, K201, } \
-}
diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json
index d1aa7848fc17..f64d38527052 100644
--- a/keyboards/takashiski/namecard2x4/info.json
+++ b/keyboards/takashiski/namecard2x4/info.json
@@ -12,7 +12,17 @@
"bootloader": "caterina",
"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":0, "y":1}, {"label":"6", "x":1, "y":1}, {"label":"7", "x":2, "y":1}, {"label":"8", "x":3, "y":1}]
+ "layout": [
+ {"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}
+ ]
}
}
}
diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.h b/keyboards/takashiski/namecard2x4/namecard2x4.h
deleted file mode 100644
index f3f6992703aa..000000000000
--- a/keyboards/takashiski/namecard2x4/namecard2x4.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2018 takashiski
- *
- * 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 .
- */
-
-#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, \
- k10, k11, k12, k13 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 } \
-}
diff --git a/keyboards/tempo_turtle/bradpad/bradpad.h b/keyboards/tempo_turtle/bradpad/bradpad.h
deleted file mode 100644
index 69955a5da61d..000000000000
--- a/keyboards/tempo_turtle/bradpad/bradpad.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 v3ritas
-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 .
-*/
-
-#pragma once
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, \
- k41, k42\
-) { \
- { k00, k01, k02, k03, }, \
- { k10, k11, k12, k13, }, \
- { k20, k21, k22, k23, }, \
- { k30, k31, k32, k33, }, \
- { KC_NO, k41, k42, KC_NO } \
-}
-// clang-format on
diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json
index 834e0c46c4cd..4237f63ac98d 100644
--- a/keyboards/tempo_turtle/bradpad/info.json
+++ b/keyboards/tempo_turtle/bradpad/info.json
@@ -18,11 +18,28 @@
"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": 0, "y":4, "w":2},{"x": 2, "y":4,"w":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},
+
+ {"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": [4, 1], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4, "w": 2}
]
}
}
diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json
index e6677abc7b95..869d4f16a17d 100644
--- a/keyboards/tender/macrowo_pad/info.json
+++ b/keyboards/tender/macrowo_pad/info.json
@@ -17,7 +17,32 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 7.25, "y": 0},
+ {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 4], "x": 0, "y": 0.5},
+ {"matrix": [0, 5], "x": 2, "y": 0.5},
+ {"matrix": [0, 6], "x": 8.5, "y": 0.5},
+ {"matrix": [0, 7], "x": 10.5, "y": 0.5},
+
+ {"matrix": [0, 8], "x": 3.75, "y": 1},
+ {"matrix": [0, 9], "x": 6.75, "y": 1},
+
+ {"matrix": [1, 0], "x": 5.25, "y": 1.25},
+
+ {"matrix": [1, 1], "x": 0, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 10.5, "y": 1.5},
+
+ {"matrix": [1, 5], "x": 1, "y": 2},
+ {"matrix": [1, 7], "x": 4.25, "y": 2},
+ {"matrix": [1, 8], "x": 6.25, "y": 2},
+ {"matrix": [1, 9], "x": 9.5, "y": 2}
+ ]
}
}
}
diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.h b/keyboards/tender/macrowo_pad/macrowo_pad.h
deleted file mode 100644
index b095c037a77c..000000000000
--- a/keyboards/tender/macrowo_pad/macrowo_pad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 swiftrax
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K17, K18, K19 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, KC_NO, K17, K18, K19 } \
-}
diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json
index 95cb977fb068..cab118fc8ef6 100644
--- a/keyboards/treasure/type9/info.json
+++ b/keyboards/treasure/type9/info.json
@@ -21,7 +21,19 @@
"bootloader": "atmel-dfu",
"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}]
+ "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}
+ ]
}
}
}
diff --git a/keyboards/treasure/type9/type9.h b/keyboards/treasure/type9/type9.h
deleted file mode 100644
index 6034416f16ec..000000000000
--- a/keyboards/treasure/type9/type9.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2018 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 .
- */
-
-#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 } \
-}
diff --git a/keyboards/vagrant_10/info.json b/keyboards/vagrant_10/info.json
index 56797aac2268..cdf481550494 100644
--- a/keyboards/vagrant_10/info.json
+++ b/keyboards/vagrant_10/info.json
@@ -17,7 +17,21 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":1, "y":0, "w":2}, {"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}]
+ "layout": [
+ {"matrix": [0, 2], "x": 1, "y": 0, "w": 2},
+
+ {"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}
+ ]
}
}
}
diff --git a/keyboards/vagrant_10/vagrant_10.h b/keyboards/vagrant_10/vagrant_10.h
deleted file mode 100755
index 1cd4d1b77763..000000000000
--- a/keyboards/vagrant_10/vagrant_10.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-MIT License
-
-Copyright (c) 2020 Shanduur & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K002, \
- K100, K101, K102, \
- K200, K201, K202, \
- K300, K301, K302 \
-) { \
- { KC_NO, KC_NO, K002 }, \
- { K100, K101, K102 }, \
- { K200, K201, K202 }, \
- { K300, K301, K302 } \
-}
diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json
index 36ebf7158263..0d80bce8a862 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_b/info.json
@@ -21,16 +21,19 @@
"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": 1, "y": 3, "w": 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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1},
+
+ {"matrix": [0, 6], "x": 0, "y": 2},
+ {"matrix": [0, 7], "x": 1, "y": 2},
+ {"matrix": [0, 8], "x": 2, "y": 2},
+
+ {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
]
}
}
diff --git a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h b/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h
deleted file mode 100644
index c23a4d003cf6..000000000000
--- a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2018 Wilba
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-// 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, k05, \
- k06, k07, k08, \
- k09 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
-}
diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json
index 6b6bd3d61be5..64af4a5dcf16 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_c/info.json
@@ -17,7 +17,21 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":0, "y":1}, {"label":"0,4", "x":1, "y":1}, {"label":"0,5", "x":2, "y":1}, {"label":"0,6", "x":0, "y":2}, {"label":"0,7", "x":1, "y":2}, {"label":"0,8", "x":2, "y":2}, {"label":"0,9", "x":1, "y":3, "w":2}]
+ "layout": [
+ {"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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1},
+
+ {"matrix": [0, 6], "x": 0, "y": 2},
+ {"matrix": [0, 7], "x": 1, "y": 2},
+ {"matrix": [0, 8], "x": 2, "y": 2},
+
+ {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
+ ]
}
}
}
diff --git a/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h b/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h
index 382cef1a6dc6..24dae9d7d066 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h
@@ -18,18 +18,3 @@
#include "quantum.h"
#include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
#include "via.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, K08, K09 \
-) { \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09}, \
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json
index 5158e7e06fff..73091d303634 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_a/info.json
@@ -18,12 +18,13 @@
"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 }
+ {"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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
]
}
}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h b/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h
deleted file mode 100644
index 0a38581450c7..000000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2018 Wilba
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// 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, k05 \
-) { \
- { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json
index 3a3b32d1df1b..4356011aae10 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_b/info.json
@@ -18,12 +18,13 @@
"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 }
+ {"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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
]
}
}
diff --git a/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h b/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h
deleted file mode 100644
index bd4158bcb10c..000000000000
--- a/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-// 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, K05) \
- { \
- {K00, K01, K02, K03, K04, K05}, \
- }
-
diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json
index b462b05eeb3e..7de9331ffe5b 100644
--- a/keyboards/wilba_tech/wt8_a/info.json
+++ b/keyboards/wilba_tech/wt8_a/info.json
@@ -17,7 +17,17 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"x", "x":0, "y":0}, {"label":"x", "x":1, "y":0}, {"label":"x", "x":2, "y":0}, {"label":"x", "x":3, "y":0}, {"label":"x", "x":0, "y":1}, {"label":"x", "x":1, "y":1}, {"label":"x", "x":2, "y":1}, {"label":"x", "x":3, "y":1}]
+ "layout": [
+ {"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": 0, "y": 1},
+ {"matrix": [0, 5], "x": 1, "y": 1},
+ {"matrix": [0, 6], "x": 2, "y": 1},
+ {"matrix": [0, 7], "x": 3, "y": 1}
+ ]
}
}
}
diff --git a/keyboards/wilba_tech/wt8_a/wt8_a.h b/keyboards/wilba_tech/wt8_a/wt8_a.h
deleted file mode 100644
index 0fb754f0abfd..000000000000
--- a/keyboards/wilba_tech/wt8_a/wt8_a.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07 ) \
- { \
- {K00, K01, K02, K03, K04, K05, K06, K07 }, \
- }
diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 0391d278b9f5..afdc9f62e435 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -18,31 +18,35 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (E6,F5)", "x":0, "y":0},
- {"label":"K01 (E6,C7)", "x":1, "y":0},
- {"label":"K02 (E6,B7)", "x":2, "y":0},
- {"label":"K03 (E6,B2)", "x":3, "y":0},
- {"label":"K04 (E6,B4)", "x":4, "y":0},
- {"label":"K10 (F0,F5)", "x":0, "y":1},
- {"label":"K11 (F0,C7)", "x":1, "y":1},
- {"label":"K12 (F0,B7)", "x":2, "y":1},
- {"label":"K13 (F0,B2)", "x":3, "y":1},
- {"label":"K14 (F0,B4)", "x":4, "y":1},
- {"label":"K20 (D6,F5)", "x":0, "y":2},
- {"label":"K21 (D6,C7)", "x":1, "y":2},
- {"label":"K22 (D6,B7)", "x":2, "y":2},
- {"label":"K23 (D6,B2)", "x":3, "y":2},
- {"label":"K24 (D6,B4)", "x":4, "y":2},
- {"label":"K30 (D2,F5)", "x":0, "y":3},
- {"label":"K31 (D2,C7)", "x":1, "y":3},
- {"label":"K32 (D2,B7)", "x":2, "y":3},
- {"label":"K33 (D2,B2)", "x":3, "y":3},
- {"label":"K34 (D2,B4)", "x":4, "y":3},
- {"label":"K40 (B6,F5)", "x":0, "y":4},
- {"label":"K41 (B6,C7)", "x":1, "y":4},
- {"label":"K42 (B6,B7)", "x":2, "y":4},
- {"label":"K43 (B6,B2)", "x":3, "y":4},
- {"label":"K44 (B6,B4)", "x":4, "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": [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": [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},
+ {"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, 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}
]
}
}
diff --git a/keyboards/winry/winry25tc/winry25tc.h b/keyboards/winry/winry25tc/winry25tc.h
deleted file mode 100644
index 5498dd8d6bb2..000000000000
--- a/keyboards/winry/winry25tc/winry25tc.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Andrzej Ressel (andrzej.ressel@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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, \
- K20, K21, K22, K23, K24, \
- K30, K31, K32, K33, K34, \
- K40, K41, K42, K43, K44 \
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { K20, K21, K22, K23, K24 }, \
- { K30, K31, K32, K33, K34 }, \
- { K40, K41, K42, K43, K44 }, \
-}
diff --git a/keyboards/woodkeys/bigseries/1key/1key.c b/keyboards/woodkeys/bigseries/1key/1key.c
index 6036bd999168..a2ebca4fe05a 100755
--- a/keyboards/woodkeys/bigseries/1key/1key.c
+++ b/keyboards/woodkeys/bigseries/1key/1key.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 .
*/
-#include "1key.h"
+#include "quantum.h"
void matrix_scan_kb(void) {
// Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/1key/1key.h b/keyboards/woodkeys/bigseries/1key/1key.h
deleted file mode 100755
index 6e5ddcc7606e..000000000000
--- a/keyboards/woodkeys/bigseries/1key/1key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00 \
-) { \
- { k00 } \
-}
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index 1d0a787d9ac9..e6243a2844ad 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
@@ -19,7 +19,7 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "w": 4, "h": 4}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
]
}
}
diff --git a/keyboards/woodkeys/bigseries/2key/2key.c b/keyboards/woodkeys/bigseries/2key/2key.c
index cffb71907e4e..a2ebca4fe05a 100755
--- a/keyboards/woodkeys/bigseries/2key/2key.c
+++ b/keyboards/woodkeys/bigseries/2key/2key.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 .
*/
-#include "2key.h"
+#include "quantum.h"
void matrix_scan_kb(void) {
// Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/2key/2key.h b/keyboards/woodkeys/bigseries/2key/2key.h
deleted file mode 100755
index eff82fef9362..000000000000
--- a/keyboards/woodkeys/bigseries/2key/2key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01 \
-) { \
- { k00, k01 } \
-}
diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index c3a2b62eb81e..1a5d5bd34dd4 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
@@ -19,8 +19,8 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "w": 4, "h": 4},
- {"x": 4, "y": 0, "w": 4, "h": 4}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+ {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4}
]
}
}
diff --git a/keyboards/woodkeys/bigseries/3key/3key.c b/keyboards/woodkeys/bigseries/3key/3key.c
index 3735c105438c..a2ebca4fe05a 100755
--- a/keyboards/woodkeys/bigseries/3key/3key.c
+++ b/keyboards/woodkeys/bigseries/3key/3key.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 .
*/
-#include "3key.h"
+#include "quantum.h"
void matrix_scan_kb(void) {
// Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/3key/3key.h b/keyboards/woodkeys/bigseries/3key/3key.h
deleted file mode 100755
index caee1e455198..000000000000
--- a/keyboards/woodkeys/bigseries/3key/3key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02 \
-) { \
- { k00, k01, k02 } \
-}
diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index 43b99312db90..fd7172fbcb23 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
@@ -19,9 +19,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "w": 4, "h": 4},
- {"x": 4, "y": 0, "w": 4, "h": 4},
- {"x": 8, "y": 0, "w": 4, "h": 4}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+ {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4},
+ {"matrix": [0, 2], "x": 8, "y": 0, "w": 4, "h": 4}
]
}
}
diff --git a/keyboards/woodkeys/bigseries/4key/4key.h b/keyboards/woodkeys/bigseries/4key/4key.h
deleted file mode 100755
index 7e9ff7a7935a..000000000000
--- a/keyboards/woodkeys/bigseries/4key/4key.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, \
- k10, k11 \
-) { \
- { k00, k01 }, \
- { k10, k11 } \
-}
diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index 8fb9a9071ac6..d151eeea6b82 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
@@ -19,11 +19,11 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "w": 4, "h": 4},
- {"x": 4, "y": 0, "w": 4, "h": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+ {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4},
- {"x": 0, "y": 4, "w": 4, "h": 4},
- {"x": 4, "y": 4, "w": 4, "h": 4}
+ {"matrix": [1, 0], "x": 0, "y": 4, "w": 4, "h": 4},
+ {"matrix": [1, 1], "x": 4, "y": 4, "w": 4, "h": 4}
]
}
}
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 00e70ab0db6f..4c84fb000805 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -27,19 +27,18 @@
"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, "y": 0},
- {"label": "k05", "x": 5, "y": 0},
- {"label": "k06", "x": 6, "y": 0},
- {"label": "k07", "x": 7, "y": 0},
- {"label": "k08", "x": 8, "y": 0},
- {"label": "k09", "x": 9, "y": 0},
- {"label": "k0a", "x": 10, "y": 0},
- {"label": "k0b", "x": 11, "y": 0}
+ {"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}
]
}
}
diff --git a/keyboards/work_louder/loop/loop.h b/keyboards/work_louder/loop/loop.h
index a7376881b332..b2cb2410fc0b 100644
--- a/keyboards/work_louder/loop/loop.h
+++ b/keyboards/work_louder/loop/loop.h
@@ -18,17 +18,3 @@
#include "quantum.h"
#include "rgb_functions.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, k08, k09, k0a, k0b \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b } \
-}
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 798127b4c0f1..f24f612ca545 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -26,9 +26,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k00", "x": 0, "y": 0},
- {"label": "k01", "x": 1, "y": 0},
- {"label": "k02", "x": 2, "y": 0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
]
}
}
diff --git a/keyboards/work_louder/nano/nano.h b/keyboards/work_louder/nano/nano.h
index cc152b8ccce8..04de456eca03 100644
--- a/keyboards/work_louder/nano/nano.h
+++ b/keyboards/work_louder/nano/nano.h
@@ -18,17 +18,3 @@
#include "quantum.h"
#include "rgb_functions.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 \
-) { \
- { k00, k01, k02 } \
-}
diff --git a/keyboards/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json
index e348f8af5a71..3c0c0e29b8e5 100644
--- a/keyboards/wuque/mammoth20x/info.json
+++ b/keyboards/wuque/mammoth20x/info.json
@@ -26,34 +26,34 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Esc", "x": 0, "y": 0 },
- { "label": "Pause", "x": 1, "y": 0 },
- { "label": "Delete", "x": 2, "y": 0 },
- { "label": "LeftEncode", "x": 3, "y": 0, "w": 0.5 },
- { "label": "EncoderClick", "x": 3.5, "y": 0 },
- { "label": "RightEncode", "x": 4.5, "y": 0, "w" : 0.5 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [2, 3], "x": 3, "y": 0, "w": 0.5},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [4, 3], "x": 4.5, "y": 0, "w": 0.5},
- { "label": "Num", "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": "7", "x": 0, "y": 2 },
- { "label": "8", "x": 1, "y": 2 },
- { "label": "9", "x": 2, "y": 2 },
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
- { "label": "4", "x": 0, "y": 3 },
- { "label": "5", "x": 1, "y": 3 },
- { "label": "6", "x": 2, "y": 3 },
- { "label": "+", "x": 3, "y": 2, "h": 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": 2, "h": 2},
- { "label": "1", "x": 0, "y": 4 },
- { "label": "2", "x": 1, "y": 4 },
- { "label": "3", "x": 2, "y": 4 },
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
- { "label": "0", "x": 0, "y": 5, "w": 2 },
- { "label": ".", "x": 2, "y": 5 },
- { "label": "Enter", "x": 3, "y": 4,"h":2 }
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 4, "h": 2}
]
}
}
diff --git a/keyboards/wuque/mammoth20x/mammoth20x.c b/keyboards/wuque/mammoth20x/mammoth20x.c
index 4619ef5dde6d..eeaea79c710e 100644
--- a/keyboards/wuque/mammoth20x/mammoth20x.c
+++ b/keyboards/wuque/mammoth20x/mammoth20x.c
@@ -14,8 +14,7 @@
* along with this program. If not, see .
*/
-#include "mammoth20x.h"
-
+#include "quantum.h"
static uint8_t encoder_state[NUM_ENCODERS] = {0};
static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
diff --git a/keyboards/wuque/mammoth20x/mammoth20x.h b/keyboards/wuque/mammoth20x/mammoth20x.h
deleted file mode 100644
index 408788bf6051..000000000000
--- a/keyboards/wuque/mammoth20x/mammoth20x.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 wuquestudio
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K23, K03, K43, \
- K10, K11, K12, K13, \
- K20, K21, K22, \
- K30, K31, K32, K33, \
- K40, K41, K42, \
- K50, K52, K53 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { K50, KC_NO, K52, K53 }, \
-}
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index 6ec3f15d62ec..3c2e69eb838c 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -19,34 +19,33 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"Tab", "x":1, "y":0},
- {"label":"Backspace", "x":2, "y":0},
- {"label":"Fn", "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":"Num Lock", "x":0, "y":1.5},
- {"label":"/", "x":1, "y":1.5},
- {"label":"*", "x":2, "y":1.5},
- {"label":"=", "x":3, "y":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"label":"7", "x":0, "y":2.5},
- {"label":"8", "x":1, "y":2.5},
- {"label":"9", "x":2, "y":2.5},
- {"label":"-", "x":3, "y":2.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
- {"label":"4", "x":0, "y":3.5},
- {"label":"5", "x":1, "y":3.5},
- {"label":"6", "x":2, "y":3.5},
- {"label":"+", "x":3, "y":3.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 3], "x": 3, "y": 3.5},
- {"label":"1", "x":0, "y":4.5},
- {"label":"2", "x":1, "y":4.5},
- {"label":"3", "x":2, "y":4.5},
- {"label":"Enter", "x":3, "y":4.5, "h":2},
-
- {"label":"0", "x":0, "y":5.5, "w":2},
- {"label":".", "x":2, "y":5.5}
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2, "y": 4.5},
+ {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5.5}
]
}
}
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
index 4d6c25698150..da20172f3432 100644
--- a/keyboards/xbows/numpad/numpad.c
+++ b/keyboards/xbows/numpad/numpad.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
- #include "numpad.h"
+ #include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/xbows/numpad/numpad.h b/keyboards/xbows/numpad/numpad.h
deleted file mode 100644
index c160bff757db..000000000000
--- a/keyboards/xbows/numpad/numpad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Shulin Huang
- *
- * 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 .
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
- K000, K001, K002, K003, \
- K100, K101, K102, K103, \
- K200, K201, K202, K203, \
- K300, K301, K302, K303, \
- K400, K401, K402, K403, \
- K500, K502 \
-) \
- { \
- { K000, K001, K002, K003 }, \
- { K100, K101, K102, K103 }, \
- { K200, K201, K202, K203 }, \
- { K300, K301, K302, K303 }, \
- { K400, K401, K402, K403 }, \
- { K500, KC_NO,K502, KC_NO} \
-}
diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json
index d0e4b4232981..98afd2252bea 100644
--- a/keyboards/yampad/info.json
+++ b/keyboards/yampad/info.json
@@ -19,28 +19,28 @@
"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},
+ {"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":"k10", "x":0, "y":1},
- {"label":"k11", "x":1, "y":1},
- {"label":"k12", "x":2, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
- {"label":"k20", "x":0, "y":2},
- {"label":"k21", "x":1, "y":2},
- {"label":"k22", "x":2, "y":2},
- {"label":"k13", "x":3, "y":1, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
- {"label":"k30", "x":0, "y":3},
- {"label":"k31", "x":1, "y":3},
- {"label":"k32", "x":2, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
- {"label":"k40", "x":0, "y":4},
- {"label":"k41", "x":1, "y":4},
- {"label":"k42", "x":2, "y":4},
- {"label":"k43", "x":3, "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": 3, "h": 2}
]
}
}
diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c
index eab218d3b95d..45b0c42484c3 100644
--- a/keyboards/yampad/yampad.c
+++ b/keyboards/yampad/yampad.c
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "yampad.h"
+#include "quantum.h"
#if defined(OLED_ENABLE)
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/yampad/yampad.h b/keyboards/yampad/yampad.h
deleted file mode 100644
index 68ec98ffddd8..000000000000
--- a/keyboards/yampad/yampad.h
+++ /dev/null
@@ -1,57 +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 .
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* 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.
- */
-
-/* COSPAD numpad matrix layout
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | |
- * |----|----|----| 13 |
- * | 20 | 21 | 22 | |
- * |----|----|----|----|
- * | 30 | 31 | 32 | |
- * |----|----|----| 43 |
- * | 40 | 41 | 42 | |
- * `-------------------'
- */
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, \
- k20, k21, k22, k13, \
- k30, k31, k32, \
- k40, k41, k42, k43 \
-) \
-{ \
- {k00, k01, k02, k03}, \
- {k10, k11, k12, k13}, \
- {k20, k21, k22, ___}, \
- {k30, k31, k32, ___}, \
- {k40, k41, k42, k43} \
-}
diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json
index ef1402a41e24..0da556eb1f93 100644
--- a/keyboards/yoichiro/lunakey_macro/info.json
+++ b/keyboards/yoichiro/lunakey_macro/info.json
@@ -18,19 +18,19 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"0,0", "x":0.5, "y":0.5},
- {"label":"0,1", "x":1.5, "y":0.175},
- {"label":"0,2", "x":2.5, "y":0},
- {"label":"0,3", "x":3.5, "y":0.5},
+ {"matrix": [0, 0], "x": 0.5, "y": 0.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0.175},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0.5},
- {"label":"1,0", "x":0.5, "y":1.5},
- {"label":"1,1", "x":1.5, "y":1.175},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1.5},
+ {"matrix": [1, 0], "x": 0.5, "y": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.175},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
- {"label":"2,0", "x":0, "y":3},
- {"label":"2,1", "x":1, "y":2.75},
- {"label":"2,2", "x":2, "y":3}
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 3}
]
}
}
diff --git a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h b/keyboards/yoichiro/lunakey_macro/lunakey_macro.h
deleted file mode 100644
index 487b7fe20866..000000000000
--- a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 Yoichiro Tanaka
- *
- * 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 .
- */
-
-#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 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, KC_NO } \
-}
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
index e5eb64db8463..0a6c30f9eab9 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/info.json
@@ -23,9 +23,26 @@
"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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}
+ {"matrix": [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}
]
}
}
diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c
index ed9fe9709790..d6fe84199bdb 100644
--- a/keyboards/yushakobo/quick17/quick17.c
+++ b/keyboards/yushakobo/quick17/quick17.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "quick17.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {
diff --git a/keyboards/yushakobo/quick17/quick17.h b/keyboards/yushakobo/quick17/quick17.h
deleted file mode 100644
index 566df71069f1..000000000000
--- a/keyboards/yushakobo/quick17/quick17.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 .
- */
-
-#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, \
- k10, k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 } \
-}
diff --git a/keyboards/yynmt/dozen0/dozen0.h b/keyboards/yynmt/dozen0/dozen0.h
deleted file mode 100644
index e2ab35bcef88..000000000000
--- a/keyboards/yynmt/dozen0/dozen0.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 yynmt
- *
- * 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 .
- */
-#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, K07, K08, K09, K10, K11 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11 }, \
-}
diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json
index 0c73591326ed..d787dd53c68c 100644
--- a/keyboards/yynmt/dozen0/info.json
+++ b/keyboards/yynmt/dozen0/info.json
@@ -18,8 +18,19 @@
"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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 0, "y": 1},
+ {"matrix": [0, 7], "x": 1, "y": 1},
+ {"matrix": [0, 8], "x": 2, "y": 1},
+ {"matrix": [0, 9], "x": 3, "y": 1},
+ {"matrix": [0, 10], "x": 4, "y": 1},
+ {"matrix": [0, 11], "x": 5, "y": 1}
]
}
}
diff --git a/keyboards/zfrontier/big_switch/big_switch.h b/keyboards/zfrontier/big_switch/big_switch.h
deleted file mode 100644
index d12184932d60..000000000000
--- a/keyboards/zfrontier/big_switch/big_switch.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 zFrontier
- *
- * 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 .
- */
-
-#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 \
-) \
-{ \
- { K00 } \
-}
diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json
index 0e52f3a29d06..72cf7de0c200 100644
--- a/keyboards/zfrontier/big_switch/info.json
+++ b/keyboards/zfrontier/big_switch/info.json
@@ -18,7 +18,7 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "w": 4, "h": 4}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
]
}
}