diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json
index b49357c6867..cf90324c142 100644
--- a/keyboards/alt34/rev1/info.json
+++ b/keyboards/alt34/rev1/info.json
@@ -19,47 +19,47 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- {"x": 0, "y": 0.93},
- {"x": 1, "y": 0.31},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.28},
- {"x": 4, "y": 0.42},
+ {"matrix": [0, 0], "x": 0, "y": 0.93},
+ {"matrix": [0, 1], "x": 1, "y": 0.31},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.28},
+ {"matrix": [0, 4], "x": 4, "y": 0.42},
- {"x": 7, "y": 0.42},
- {"x": 8, "y": 0.28},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.31},
- {"x": 11, "y": 0.93},
+ {"matrix": [4, 4], "x": 7, "y": 0.42},
+ {"matrix": [4, 3], "x": 8, "y": 0.28},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0.31},
+ {"matrix": [4, 0], "x": 11, "y": 0.93},
- {"x": 0, "y": 1.93},
- {"x": 1, "y": 1.31},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.28},
- {"x": 4, "y": 1.42},
+ {"matrix": [1, 0], "x": 0, "y": 1.93},
+ {"matrix": [1, 1], "x": 1, "y": 1.31},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.28},
+ {"matrix": [1, 4], "x": 4, "y": 1.42},
- {"x": 7, "y": 1.42},
- {"x": 8, "y": 1.28},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1.31},
- {"x": 11, "y": 1.93},
+ {"matrix": [5, 4], "x": 7, "y": 1.42},
+ {"matrix": [5, 3], "x": 8, "y": 1.28},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1.31},
+ {"matrix": [5, 0], "x": 11, "y": 1.93},
- {"x": 0, "y": 2.93},
- {"x": 1, "y": 2.31},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.28},
- {"x": 4, "y": 2.42},
+ {"matrix": [2, 0], "x": 0, "y": 2.93},
+ {"matrix": [2, 1], "x": 1, "y": 2.31},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.28},
+ {"matrix": [2, 4], "x": 4, "y": 2.42},
- {"x": 7, "y": 2.42},
- {"x": 8, "y": 2.28},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2.31},
- {"x": 11, "y": 2.93},
+ {"matrix": [6, 4], "x": 7, "y": 2.42},
+ {"matrix": [6, 3], "x": 8, "y": 2.28},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2.31},
+ {"matrix": [6, 0], "x": 11, "y": 2.93},
- {"x": 3.5, "y": 3.45},
- {"x": 4.5, "y": 3.7},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.45},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.7},
- {"x": 6.5, "y": 3.7},
- {"x": 7.5, "y": 3.45}
+ {"matrix": [7, 4], "x": 6.5, "y": 3.7},
+ {"matrix": [7, 3], "x": 7.5, "y": 3.45}
]
}
}
diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h
deleted file mode 100644
index 115415bb5fe..00000000000
--- a/keyboards/alt34/rev1/rev1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-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
-
-/* left hand right hand */
-#define LAYOUT_split_3x5_2(\
- K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\
- K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\
- K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\
- K3_2, K3_3, K3_4, K3_5 )\
-/* matrix positions */\
-{\
- {K0_0, K0_1, K0_2, K0_3, K0_4},\
- {K1_0, K1_1, K1_2, K1_3, K1_4},\
- {K2_0, K2_1, K2_2, K2_3, K2_4},\
- {____, ____, ____, K3_2, K3_3},\
- \
- {K0_9, K0_8, K0_7, K0_6, K0_5},\
- {K1_9, K1_8, K1_7, K1_6, K1_5},\
- {K2_9, K2_8, K2_7, K2_6, K2_5},\
- {____, ____, ____, K3_5, K3_4} \
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
deleted file mode 100644
index 7deb32d9173..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2022 Charly Delay (@0xcharly)
- *
- * 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
-
-// clang-format off
-#define LAYOUT_split_3x5_2( \
- k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
- k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
- k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
- k30, k32, k72, k70 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { k20, k21, k22, k23, k24 }, \
- { k30, KC_NO, k32, KC_NO, KC_NO }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 }, \
- { k60, k61, k62, k63, k64 }, \
- { k70, KC_NO, k72, KC_NO, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index a758541149e..bfd12e81d07 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -7,40 +7,47 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "L30", "x": 4, "y": 3 },
- { "label": "L32", "x": 5, "y": 3 },
- { "label": "R32", "x": 10, "y": 3 },
- { "label": "R30", "x": 11, "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": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 1], "x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 15, "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": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 1], "x": 14, "y": 1},
+ {"matrix": [5, 0], "x": 15, "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": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 1], "x": 14, "y": 2},
+ {"matrix": [6, 0], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 0], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index 0b6c657fdae..b9787f473ee 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-#include "3x5_3.h"
+#include "quantum.h"
/**
* LEDs index.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
deleted file mode 100644
index 566d5b81d23..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2022 Charly Delay (@0xcharly)
- *
- * 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 "dilemma.h"
-
-// clang-format off
-#define LAYOUT_split_3x5_3( \
- k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
- k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
- k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
- k32, k30, k31, k71, k70, k72 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { k20, k21, k22, k23, k24 }, \
- { k30, k31, k32, KC_NO, KC_NO }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 }, \
- { k60, k61, k62, k63, k64 }, \
- { k70, k71, k72, KC_NO, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 3944f33a658..d9f0f15f2cd 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -21,42 +21,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "L32", "x": 4, "y": 3 },
- { "label": "L33", "x": 5, "y": 3 },
- { "label": "L34", "x": 6, "y": 3 },
- { "label": "R32", "x": 11, "y": 3 },
- { "label": "R33", "x": 10, "y": 3 },
- { "label": "R34", "x": 9, "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": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 1], "x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 15, "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": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 1], "x": 14, "y": 1},
+ {"matrix": [5, 0], "x": 15, "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": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 1], "x": 14, "y": 2},
+ {"matrix": [6, 0], "x": 15, "y": 2},
+
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 10, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3}
]
}
}
diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h
index f2c0784533a..eefdd5babfa 100644
--- a/keyboards/bastardkb/dilemma/dilemma.h
+++ b/keyboards/bastardkb/dilemma/dilemma.h
@@ -17,16 +17,6 @@
#pragma once
-// clang-format off
-#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled)
-# include "3x5_2.h"
-#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3)
-# include "3x5_3.h"
-#else
-# error "Unsuported format"
-#endif
-// clang-format on
-
#include "quantum.h"
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index d8120f50706..682b2dc6dbd 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -6,64 +6,75 @@
"layouts": {
"LAYOUT_split_4x6_5": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "L05", "x": 5, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "R05", "x": 16, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "L15", "x": 5, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "R15", "x": 16, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "L25", "x": 5, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "R25", "x": 16, "y": 2 },
- { "label": "L30", "x": 0, "y": 3 },
- { "label": "L31", "x": 1, "y": 3 },
- { "label": "L32", "x": 2, "y": 3 },
- { "label": "L33", "x": 3, "y": 3 },
- { "label": "L34", "x": 4, "y": 3 },
- { "label": "L35", "x": 5, "y": 3 },
- { "label": "R30", "x": 11, "y": 3 },
- { "label": "R31", "x": 12, "y": 3 },
- { "label": "R32", "x": 13, "y": 3 },
- { "label": "R33", "x": 14, "y": 3 },
- { "label": "R34", "x": 15, "y": 3 },
- { "label": "R35", "x": 16, "y": 3 },
- { "label": "L43", "x": 5, "y": 4 },
- { "label": "L44", "x": 6, "y": 4 },
- { "label": "L45", "x": 7, "y": 4 },
- { "label": "R40", "x": 9, "y": 4 },
- { "label": "R41", "x": 10, "y": 4 },
- { "label": "R40", "x": 11, "y": 4 },
- { "label": "L52", "x": 6, "y": 5 },
- { "label": "L53", "x": 7, "y": 5 },
- { "label": "R52", "x": 9, "y": 5 },
- { "label": "R53", "x": 10, "y": 5 }
+ {"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": [5, 5], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0},
+ {"matrix": [5, 1], "x": 15, "y": 0},
+ {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1},
+ {"matrix": [6, 1], "x": 15, "y": 1},
+ {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2},
+ {"matrix": [7, 1], "x": 15, "y": 2},
+ {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 3], "x": 5, "y": 4},
+ {"matrix": [4, 4], "x": 6, "y": 4},
+ {"matrix": [4, 1], "x": 7, "y": 4},
+
+ {"matrix": [9, 1], "x": 9, "y": 4},
+ {"matrix": [9, 4], "x": 10, "y": 4},
+ {"matrix": [9, 3], "x": 11, "y": 4},
+
+ {"matrix": [4, 5], "x": 6, "y": 5},
+ {"matrix": [4, 2], "x": 7, "y": 5},
+
+ {"matrix": [9, 2], "x": 9, "y": 5},
+ {"matrix": [9, 5], "x": 10, "y": 5}
]
}
}
diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c
index 504cb0a2190..7aaa0fc1ce1 100644
--- a/keyboards/bastardkb/scylla/scylla.c
+++ b/keyboards/bastardkb/scylla/scylla.c
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-#include "scylla.h"
+#include "quantum.h"
// clang-format off
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/scylla/scylla.h b/keyboards/bastardkb/scylla/scylla.h
deleted file mode 100644
index 4039ad3a94d..00000000000
--- a/keyboards/bastardkb/scylla/scylla.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD
- * Copyright 2022 Charly Delay (@0xcharly)
- *
- * 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_split_4x6_5( \
- k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
- k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
- k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
- k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
- k43, k44, k41, k91, k94, k93, \
- k45, k42, k92, k95 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { KC_NO, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { k70, k71, k72, k73, k74, k75 }, \
- { k80, k81, k82, k83, k84, k85 }, \
- { KC_NO, k91, k92, k93, k94, k95 }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 90568ef1fdd..b325ca71968 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -7,42 +7,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "L33", "x": 4, "y": 3 },
- { "label": "L34", "x": 5, "y": 3 },
- { "label": "L31", "x": 6, "y": 3 },
- { "label": "R33", "x": 9, "y": 3 },
- { "label": "R34", "x": 10, "y": 3 },
- { "label": "R31", "x": 11, "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": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 1], "x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 15, "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": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 1], "x": 14, "y": 1},
+ {"matrix": [5, 0], "x": 15, "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": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 1], "x": 14, "y": 2},
+ {"matrix": [6, 0], "x": 15, "y": 2},
+
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 0], "x": 6, "y": 3},
+
+ {"matrix": [7, 0], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 2], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.c b/keyboards/bastardkb/skeletyl/skeletyl.c
index b72becbb253..6c65c3fa879 100644
--- a/keyboards/bastardkb/skeletyl/skeletyl.c
+++ b/keyboards/bastardkb/skeletyl/skeletyl.c
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-#include "skeletyl.h"
+#include "quantum.h"
/**
* LEDs index.
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.h b/keyboards/bastardkb/skeletyl/skeletyl.h
deleted file mode 100644
index 6d8073153fc..00000000000
--- a/keyboards/bastardkb/skeletyl/skeletyl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD
- * Copyright 2022 Charly DELAY
- *
- * 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_split_3x5_3( \
- k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
- k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
- k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
- k32, k33, k30, k70, k73, k72 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { k20, k21, k22, k23, k24 }, \
- { k30, KC_NO, k32, k33, KC_NO }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 }, \
- { k60, k61, k62, k63, k64 }, \
- { k70, KC_NO, k72, k73, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index 247e86160f5..43254b28041 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -18,64 +18,64 @@
"layouts": {
"LAYOUT_split_4x6_5": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "L05", "x": 5, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "R05", "x": 16, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "L15", "x": 5, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "R15", "x": 16, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "L25", "x": 5, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "R25", "x": 16, "y": 2 },
- { "label": "L30", "x": 0, "y": 3 },
- { "label": "L31", "x": 1, "y": 3 },
- { "label": "L32", "x": 2, "y": 3 },
- { "label": "L33", "x": 3, "y": 3 },
- { "label": "L34", "x": 4, "y": 3 },
- { "label": "L35", "x": 5, "y": 3 },
- { "label": "R30", "x": 11, "y": 3 },
- { "label": "R31", "x": 12, "y": 3 },
- { "label": "R32", "x": 13, "y": 3 },
- { "label": "R33", "x": 14, "y": 3 },
- { "label": "R34", "x": 15, "y": 3 },
- { "label": "R35", "x": 16, "y": 3 },
- { "label": "L43", "x": 5, "y": 4 },
- { "label": "L44", "x": 6, "y": 4 },
- { "label": "L45", "x": 7, "y": 4 },
- { "label": "R40", "x": 9, "y": 4 },
- { "label": "R41", "x": 10, "y": 4 },
- { "label": "R40", "x": 11, "y": 4 },
- { "label": "L52", "x": 6, "y": 5 },
- { "label": "L53", "x": 7, "y": 5 },
- { "label": "R52", "x": 9, "y": 5 },
- { "label": "R53", "x": 10, "y": 5 }
+ {"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": [5, 5], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0},
+ {"matrix": [5, 1], "x": 15, "y": 0},
+ {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1},
+ {"matrix": [6, 1], "x": 15, "y": 1},
+ {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2},
+ {"matrix": [7, 1], "x": 15, "y": 2},
+ {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+ {"matrix": [4, 3], "x": 5, "y": 4},
+ {"matrix": [4, 4], "x": 6, "y": 4},
+ {"matrix": [4, 1], "x": 7, "y": 4},
+ {"matrix": [9, 1], "x": 9, "y": 4},
+ {"matrix": [9, 4], "x": 10, "y": 4},
+ {"matrix": [9, 3], "x": 11, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 5},
+ {"matrix": [4, 2], "x": 7, "y": 5},
+ {"matrix": [9, 2], "x": 9, "y": 5},
+ {"matrix": [9, 5], "x": 10, "y": 5}
]
}
}
diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h
deleted file mode 100644
index 59580978804..00000000000
--- a/keyboards/bastardkb/tbk/tbk.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD
- *
- * 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_split_4x6_5( \
- k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
- k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
- k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
- k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
- k43, k44, k41, k91, k94, k93, \
- k45, k42, k92, k95 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { KC_NO, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { k70, k71, k72, k73, k74, k75 }, \
- { k80, k81, k82, k83, k84, k85 }, \
- { KC_NO, k91, k92, k93, k94, k95 }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 2056aeeb5dc..94c357cd3b5 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -7,48 +7,55 @@
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "L05", "x": 5, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "R05", "x": 16, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "L15", "x": 5, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "R15", "x": 16, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "L25", "x": 5, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "R25", "x": 16, "y": 2 },
- { "label": "L33", "x": 5, "y": 3 },
- { "label": "L34", "x": 6, "y": 3 },
- { "label": "L31", "x": 7, "y": 3 },
- { "label": "R33", "x": 9, "y": 3 },
- { "label": "R34", "x": 10, "y": 3 },
- { "label": "R31", "x": 11, "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": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 5], "x": 11, "y": 0},
+ {"matrix": [4, 4], "x": 12, "y": 0},
+ {"matrix": [4, 3], "x": 13, "y": 0},
+ {"matrix": [4, 2], "x": 14, "y": 0},
+ {"matrix": [4, 1], "x": 15, "y": 0},
+ {"matrix": [4, 0], "x": 16, "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": [5, 5], "x": 11, "y": 1},
+ {"matrix": [5, 4], "x": 12, "y": 1},
+ {"matrix": [5, 3], "x": 13, "y": 1},
+ {"matrix": [5, 2], "x": 14, "y": 1},
+ {"matrix": [5, 1], "x": 15, "y": 1},
+ {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 2},
+ {"matrix": [6, 4], "x": 12, "y": 2},
+ {"matrix": [6, 3], "x": 13, "y": 2},
+ {"matrix": [6, 2], "x": 14, "y": 2},
+ {"matrix": [6, 1], "x": 15, "y": 2},
+ {"matrix": [6, 0], "x": 16, "y": 2},
+
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 1], "x": 7, "y": 3},
+
+ {"matrix": [7, 1], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 3], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c
index 34b42951a0b..51baefb7372 100644
--- a/keyboards/bastardkb/tbkmini/tbkmini.c
+++ b/keyboards/bastardkb/tbkmini/tbkmini.c
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-#include "tbkmini.h"
+#include "quantum.h"
// clang-format off
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.h b/keyboards/bastardkb/tbkmini/tbkmini.h
deleted file mode 100644
index f031c9fed27..00000000000
--- a/keyboards/bastardkb/tbkmini/tbkmini.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD
- * Copyright 2022 Charly DELAY
- *
- * 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_split_3x6_3( \
- k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
- k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \
- k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \
- k33, k34, k31, k71, k74, k73 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { KC_NO, k31, KC_NO, k33, k34, KC_NO }, \
- { k40, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { KC_NO, k71, KC_NO, k73, k74, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
index 7a0adea3133..223aa9b9bc4 100644
--- a/keyboards/bluebell/swoop/info.json
+++ b/keyboards/bluebell/swoop/info.json
@@ -34,42 +34,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"label":"SW1", "x":0, "y":0.375},
- {"label":"SW2", "x":1, "y":0.125},
- {"label":"SW3", "x":2, "y":0},
- {"label":"SW4", "x":3, "y":0.125},
- {"label":"SW5", "x":4, "y":0.25},
- {"label":"SW19", "x":8, "y":0.25},
- {"label":"SW20", "x":9, "y":0.125},
- {"label":"SW21", "x":10, "y":0},
- {"label":"SW22", "x":11, "y":0.125},
- {"label":"SW23", "x":12, "y":0.375},
- {"label":"SW6", "x":0, "y":1.375},
- {"label":"SW7", "x":1, "y":1.125},
- {"label":"SW8", "x":2, "y":1},
- {"label":"SW9", "x":3, "y":1.125},
- {"label":"SW10", "x":4, "y":1.25},
- {"label":"SW24", "x":8, "y":1.25},
- {"label":"SW25", "x":9, "y":1.125},
- {"label":"SW26", "x":10, "y":1},
- {"label":"SW27", "x":11, "y":1.125},
- {"label":"SW28", "x":12, "y":1.375},
- {"label":"SW11", "x":0, "y":2.375},
- {"label":"SW12", "x":1, "y":2.125},
- {"label":"SW13", "x":2, "y":2},
- {"label":"SW14", "x":3, "y":2.125},
- {"label":"SW15", "x":4, "y":2.25},
- {"label":"SW29", "x":8, "y":2.25},
- {"label":"SW30", "x":9, "y":2.125},
- {"label":"SW31", "x":10, "y":2},
- {"label":"SW32", "x":11, "y":2.125},
- {"label":"SW33", "x":12, "y":2.375},
- {"label":"SW16", "x":2.875, "y":3.25},
- {"label":"SW17", "x":4, "y":3.375},
- {"label":"SW28", "x":5.125, "y":3.625},
- {"label":"SW34", "x":6.875, "y":3.625},
- {"label":"SW35", "x":8, "y":3.375},
- {"label":"SW36", "x":9.125, "y":3.25}
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+ {"matrix": [4, 4], "x": 8, "y": 0.25},
+ {"matrix": [4, 3], "x": 9, "y": 0.125},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0.125},
+ {"matrix": [4, 0], "x": 12, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [5, 4], "x": 8, "y": 1.25},
+ {"matrix": [5, 3], "x": 9, "y": 1.125},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1.125},
+ {"matrix": [5, 0], "x": 12, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [6, 4], "x": 8, "y": 2.25},
+ {"matrix": [6, 3], "x": 9, "y": 2.125},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2.125},
+ {"matrix": [6, 0], "x": 12, "y": 2.375},
+
+ {"matrix": [3, 2], "x": 2.875, "y": 3.25},
+ {"matrix": [3, 3], "x": 4, "y": 3.375},
+ {"matrix": [3, 4], "x": 5.125, "y": 3.625},
+
+ {"matrix": [7, 4], "x": 6.875, "y": 3.625},
+ {"matrix": [7, 3], "x": 8, "y": 3.375},
+ {"matrix": [7, 2], "x": 9.125, "y": 3.25}
]
}
}
diff --git a/keyboards/bluebell/swoop/swoop.h b/keyboards/bluebell/swoop/swoop.h
deleted file mode 100644
index 4160f3af8aa..00000000000
--- a/keyboards/bluebell/swoop/swoop.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 James White
- *
- * 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_split_3x5_3( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { ___, ___, L30, L31, L32 }, \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { ___, ___, R32, R31, R30 } \
- }
diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h
index bf13aa7b00d..078cdca07f1 100644
--- a/keyboards/centromere/centromere.h
+++ b/keyboards/centromere/centromere.h
@@ -27,39 +27,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
-
-// For readability
-#define ___ 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_split_3x6_3( \
- k0a, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0b, \
- k1a, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b,\
- k2a, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2b,\
- k32, k33, k34, k35, k36, k37 \
-) \
- { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
- { ___, ___, k2a, k1a, k0a, k0b, k1b, k2b, ___, ___ } \
- }
-
-#define LAYOUT_split_3x5_3( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\
- k32, k33, k34, k35, k36, k37 \
-) \
- { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
- }
-
-#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
index cd1c07c67c4..5f9b57d97a1 100644
--- a/keyboards/centromere/info.json
+++ b/keyboards/centromere/info.json
@@ -11,91 +11,108 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["split_3x5_3" "split_3x6_3"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x6_3"
+ },
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
- {"label":"Tab", "x":0, "y":0.25},
- {"label":"Q", "x":1, "y":0.25},
- {"label":"W", "x":2, "y":0.125},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0.125},
- {"label":"T", "x":5, "y":0.25},
- {"label":"Y", "x":8, "y":0.25},
- {"label":"U", "x":9, "y":0.125},
- {"label":"I", "x":10, "y":0},
- {"label":"O", "x":11, "y":0.125},
- {"label":"P", "x":12, "y":0.25},
- {"label":"Backspace", "x":13, "y":0.25},
- {"label":"LCtrl", "x":0, "y":1.25},
- {"label":"A", "x":1, "y":1.25},
- {"label":"S", "x":2, "y":1.125},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1.125},
- {"label":"G", "x":5, "y":1.25},
- {"label":"H", "x":8, "y":1.25},
- {"label":"J", "x":9, "y":1.125},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1.125},
- {"label":";", "x":12, "y":1.25},
- {"label":"'", "x":13, "y":1.25},
- {"label":"Shift", "x":0, "y":2.25},
- {"label":"Z", "x":1, "y":2.25},
- {"label":"X", "x":2, "y":2.125},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2.125},
- {"label":"B", "x":5, "y":2.25},
- {"label":"N", "x":8, "y":2.25},
- {"label":"M", "x":9, "y":2.125},
- {"label":",", "x":10, "y":2},
- {"label":".", "x":11, "y":2.125},
- {"label":"/", "x":12, "y":2.25},
- {"label":"Enter", "x":13, "y":2.25},
- {"label":"LGUI", "x":3.5, "y":3.125},
- {"label":"MO(_FN)", "x":4.5, "y":3.25},
- {"label":"Space", "x":5.5, "y":3.375},
- {"label":"Space", "x":7.5, "y":3.375},
- {"label":"MO(_NUM)", "x":8.5, "y":3.25},
- {"label":"RAlt", "x":9.5, "y":3.125}
+ {"matrix": [4, 4], "x": 0, "y": 0.25},
+ {"matrix": [0, 0], "x": 1, "y": 0.25},
+ {"matrix": [0, 1], "x": 2, "y": 0.125},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0.125},
+ {"matrix": [0, 4], "x": 5, "y": 0.25},
+
+ {"matrix": [0, 5], "x": 8, "y": 0.25},
+ {"matrix": [0, 6], "x": 9, "y": 0.125},
+ {"matrix": [0, 7], "x": 10, "y": 0},
+ {"matrix": [0, 8], "x": 11, "y": 0.125},
+ {"matrix": [0, 9], "x": 12, "y": 0.25},
+ {"matrix": [4, 5], "x": 13, "y": 0.25},
+
+ {"matrix": [4, 3], "x": 0, "y": 1.25},
+ {"matrix": [1, 0], "x": 1, "y": 1.25},
+ {"matrix": [1, 1], "x": 2, "y": 1.125},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1.125},
+ {"matrix": [1, 4], "x": 5, "y": 1.25},
+
+ {"matrix": [1, 5], "x": 8, "y": 1.25},
+ {"matrix": [1, 6], "x": 9, "y": 1.125},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1.125},
+ {"matrix": [1, 9], "x": 12, "y": 1.25},
+ {"matrix": [4, 6], "x": 13, "y": 1.25},
+
+ {"matrix": [4, 2], "x": 0, "y": 2.25},
+ {"matrix": [2, 0], "x": 1, "y": 2.25},
+ {"matrix": [2, 1], "x": 2, "y": 2.125},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2.125},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+
+ {"matrix": [2, 5], "x": 8, "y": 2.25},
+ {"matrix": [2, 6], "x": 9, "y": 2.125},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2.125},
+ {"matrix": [2, 9], "x": 12, "y": 2.25},
+ {"matrix": [4, 7], "x": 13, "y": 2.25},
+
+ {"matrix": [3, 2], "x": 3.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+ {"matrix": [3, 4], "x": 5.5, "y": 3.375},
+
+ {"matrix": [3, 5], "x": 7.5, "y": 3.375},
+ {"matrix": [3, 6], "x": 8.5, "y": 3.25},
+ {"matrix": [3, 7], "x": 9.5, "y": 3.125}
]
},
"LAYOUT_split_3x5_3": {
"layout": [
- {"label":"Q", "x":0, "y":0.25},
- {"label":"W", "x":1, "y":0.125},
- {"label":"E", "x":2, "y":0},
- {"label":"R", "x":3, "y":0.125},
- {"label":"T", "x":4, "y":0.25},
- {"label":"Y", "x":7, "y":0.25},
- {"label":"U", "x":8, "y":0.125},
- {"label":"I", "x":9, "y":0},
- {"label":"O", "x":10, "y":0.125},
- {"label":"P", "x":11, "y":0.25},
- {"label":"A", "x":0, "y":1.25},
- {"label":"S", "x":1, "y":1.125},
- {"label":"D", "x":2, "y":1},
- {"label":"F", "x":3, "y":1.125},
- {"label":"G", "x":4, "y":1.25},
- {"label":"H", "x":7, "y":1.25},
- {"label":"J", "x":8, "y":1.125},
- {"label":"K", "x":9, "y":1},
- {"label":"L", "x":10, "y":1.125},
- {"label":";", "x":11, "y":1.25},
- {"label":"Z", "x":0, "y":2.25},
- {"label":"X", "x":1, "y":2.125},
- {"label":"C", "x":2, "y":2},
- {"label":"V", "x":3, "y":2.125},
- {"label":"B", "x":4, "y":2.25},
- {"label":"N", "x":7, "y":2.25},
- {"label":"M", "x":8, "y":2.125},
- {"label":",", "x":9, "y":2},
- {"label":".", "x":10, "y":2.125},
- {"label":"/", "x":11, "y":2.25},
- {"label":"LGUI", "x":2.5, "y":3.125},
- {"label":"MO(_FN)", "x":3.5, "y":3.25},
- {"label":"Space", "x":4.5, "y":3.375},
- {"label":"Space", "x":6.5, "y":3.375},
- {"label":"MO(_NUM)", "x":7.5, "y":3.25},
- {"label":"RAlt", "x":8.5, "y":3.125}
+ {"matrix": [0, 0], "x": 0, "y": 0.25},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+ {"matrix": [0, 5], "x": 7, "y": 0.25},
+ {"matrix": [0, 6], "x": 8, "y": 0.125},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0.125},
+ {"matrix": [0, 9], "x": 11, "y": 0.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [1, 5], "x": 7, "y": 1.25},
+ {"matrix": [1, 6], "x": 8, "y": 1.125},
+ {"matrix": [1, 7], "x": 9, "y": 1},
+ {"matrix": [1, 8], "x": 10, "y": 1.125},
+ {"matrix": [1, 9], "x": 11, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [2, 5], "x": 7, "y": 2.25},
+ {"matrix": [2, 6], "x": 8, "y": 2.125},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [2, 8], "x": 10, "y": 2.125},
+ {"matrix": [2, 9], "x": 11, "y": 2.25},
+
+ {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.375},
+
+ {"matrix": [3, 5], "x": 6.5, "y": 3.375},
+ {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+ {"matrix": [3, 7], "x": 8.5, "y": 3.125}
]
}
}
diff --git a/keyboards/chocv/chocv.h b/keyboards/chocv/chocv.h
deleted file mode 100644
index 2691dfcb837..00000000000
--- a/keyboards/chocv/chocv.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 BrickBots Labs
- *
- * 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_split_3x5_3( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\
- k30, k31, k32, k33, k34, k35 \
- ) \
- { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \
- { KC_NO, KC_NO, k30, k31, k32, k33, k34, k35, KC_NO, KC_NO} \
- }
-
diff --git a/keyboards/chocv/info.json b/keyboards/chocv/info.json
index 16ba0fe4d2c..e5361b1399d 100644
--- a/keyboards/chocv/info.json
+++ b/keyboards/chocv/info.json
@@ -19,49 +19,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"label":"Q", "x":0, "y":0.3},
- {"label":"W", "x":1, "y":0.1},
- {"label":"E", "x":2, "y":0},
- {"label":"R", "x":3, "y":0.1},
- {"label":"T", "x":4, "y":0.2},
+ {"matrix": [0, 0], "x": 0, "y": 0.3},
+ {"matrix": [0, 1], "x": 1, "y": 0.1},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.1},
+ {"matrix": [0, 4], "x": 4, "y": 0.2},
- {"label":"Y", "x":8, "y":0.2},
- {"label":"U", "x":9, "y":0.1},
- {"label":"I", "x":10, "y":0},
- {"label":"O", "x":11, "y":0.1},
- {"label":"P", "x":12, "y":0.3},
+ {"matrix": [0, 5], "x": 8, "y": 0.2},
+ {"matrix": [0, 6], "x": 9, "y": 0.1},
+ {"matrix": [0, 7], "x": 10, "y": 0},
+ {"matrix": [0, 8], "x": 11, "y": 0.1},
+ {"matrix": [0, 9], "x": 12, "y": 0.3},
- {"label":"A", "x":0, "y":1.3},
- {"label":"S", "x":1, "y":1.1},
- {"label":"D", "x":2, "y":1},
- {"label":"F", "x":3, "y":1.1},
- {"label":"G", "x":4, "y":1.2},
+ {"matrix": [1, 0], "x": 0, "y": 1.3},
+ {"matrix": [1, 1], "x": 1, "y": 1.1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.1},
+ {"matrix": [1, 4], "x": 4, "y": 1.2},
- {"label":"H", "x":8, "y":1.2},
- {"label":"J", "x":9, "y":1.1},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1.1},
- {"label":";", "x":12, "y":1.3},
+ {"matrix": [1, 5], "x": 8, "y": 1.2},
+ {"matrix": [1, 6], "x": 9, "y": 1.1},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1.1},
+ {"matrix": [1, 9], "x": 12, "y": 1.3},
- {"label":"Z", "x":0, "y":2.3},
- {"label":"X", "x":1, "y":2.1},
- {"label":"C", "x":2, "y":2},
- {"label":"V", "x":3, "y":2.1},
- {"label":"B", "x":4, "y":2.2},
+ {"matrix": [2, 0], "x": 0, "y": 2.3},
+ {"matrix": [2, 1], "x": 1, "y": 2.1},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.1},
+ {"matrix": [2, 4], "x": 4, "y": 2.2},
- {"label":"N", "x":8, "y":2.2},
- {"label":"M", "x":9, "y":2.1},
- {"label":",", "x":10, "y":2},
- {"label":".", "x":11, "y":2.1},
- {"label":"/", "x":12, "y":2.3},
+ {"matrix": [2, 5], "x": 8, "y": 2.2},
+ {"matrix": [2, 6], "x": 9, "y": 2.1},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2.1},
+ {"matrix": [2, 9], "x": 12, "y": 2.3},
- {"label":"KC_LSFT", "x":3, "y":3.7},
- {"label":"LC_LALT", "x":4, "y":3.7},
- {"label":"KC_ENT", "x":5, "y":3.2, "h":1.5},
+ {"matrix": [3, 2], "x": 3, "y": 3.7},
+ {"matrix": [3, 3], "x": 4, "y": 3.7},
+ {"matrix": [3, 4], "x": 5, "y": 3.2, "h": 1.5},
- {"label":"KC_SPC", "x":7, "y":3.2, "h":1.5},
- {"label":"KC_DEL", "x":8, "y":3.7},
- {"label":"KC_RCTL", "x":9, "y":3.7}
+ {"matrix": [3, 5], "x": 7, "y": 3.2, "h": 1.5},
+ {"matrix": [3, 6], "x": 8, "y": 3.7},
+ {"matrix": [3, 7], "x": 9, "y": 3.7}
]
}
}
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index 9f1b12ca25b..0f254d380f8 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -14,107 +14,5 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "community_layouts": ["split_3x5_3", "split_3x6_3"],
- "layouts": {
- "LAYOUT_split_3x6_3": {
- "layout": [
- {"label":"Esc", "x":0, "y":0.3},
- {"label":"Q", "x":1, "y":0.3},
- {"label":"W", "x":2, "y":0.1},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0.1},
- {"label":"T", "x":5, "y":0.2},
-
- {"label":"Y", "x":9, "y":0.2},
- {"label":"U", "x":10, "y":0.1},
- {"label":"I", "x":11, "y":0},
- {"label":"O", "x":12, "y":0.1},
- {"label":"P", "x":13, "y":0.3},
- {"label":"Back Space", "x":14, "y":0.3},
-
- {"label":"Ctrl / Tab", "x":0, "y":1.3},
- {"label":"A", "x":1, "y":1.3},
- {"label":"S", "x":2, "y":1.1},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1.1},
- {"label":"G", "x":5, "y":1.2},
-
- {"label":"H", "x":9, "y":1.2},
- {"label":"J", "x":10, "y":1.1},
- {"label":"K", "x":11, "y":1},
- {"label":"L", "x":12, "y":1.1},
- {"label":";", "x":13, "y":1.3},
- {"label":"'", "x":14, "y":1.3},
-
- {"label":"Shift", "x":0, "y":2.3},
- {"label":"Z", "x":1, "y":2.3},
- {"label":"X", "x":2, "y":2.1},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2.1},
- {"label":"B", "x":5, "y":2.2},
-
- {"label":"N", "x":9, "y":2.2},
- {"label":"M", "x":10, "y":2.1},
- {"label":",", "x":11, "y":2},
- {"label":".", "x":12, "y":2.1},
- {"label":"/", "x":13, "y":2.3},
- {"label":"Shift", "x":14, "y":2.3},
-
- {"label":"GUI", "x":4, "y":3.7},
- {"label":"Lower", "x":5, "y":3.7},
- {"label":"Space", "x":6, "y":3.2, "h":1.5},
-
- {"label":"Enter", "x":8, "y":3.2, "h":1.5},
- {"label":"Raise", "x":9, "y":3.7},
- {"label":"Alt", "x":10, "y":3.7}
- ]
- },
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"label":"Q", "x":0, "y":0.3},
- {"label":"W", "x":1, "y":0.1},
- {"label":"E", "x":2, "y":0},
- {"label":"R", "x":3, "y":0.1},
- {"label":"T", "x":4, "y":0.2},
-
- {"label":"Y", "x":8, "y":0.2},
- {"label":"U", "x":9, "y":0.1},
- {"label":"I", "x":10, "y":0},
- {"label":"O", "x":11, "y":0.1},
- {"label":"P", "x":12, "y":0.3},
-
- {"label":"A", "x":0, "y":1.3},
- {"label":"S", "x":1, "y":1.1},
- {"label":"D", "x":2, "y":1},
- {"label":"F", "x":3, "y":1.1},
- {"label":"G", "x":4, "y":1.2},
-
- {"label":"H", "x":8, "y":1.2},
- {"label":"J", "x":9, "y":1.1},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1.1},
- {"label":";", "x":12, "y":1.3},
-
- {"label":"Z", "x":0, "y":2.3},
- {"label":"X", "x":1, "y":2.1},
- {"label":"C", "x":2, "y":2},
- {"label":"V", "x":3, "y":2.1},
- {"label":"B", "x":4, "y":2.2},
-
- {"label":"N", "x":8, "y":2.2},
- {"label":"M", "x":9, "y":2.1},
- {"label":",", "x":10, "y":2},
- {"label":".", "x":11, "y":2.1},
- {"label":"/", "x":12, "y":2.3},
-
- {"label":"GUI", "x":3, "y":3.7},
- {"label":"Lower", "x":4, "y":3.7},
- {"label":"Space", "x":5, "y":3.2, "h":1.5},
-
- {"label":"Enter", "x":7, "y":3.2, "h":1.5},
- {"label":"Raise", "x":8, "y":3.7},
- {"label":"Alt", "x":9, "y":3.7}
- ]
- }
- }
+ "community_layouts": ["split_3x5_3", "split_3x6_3"]
}
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json
index 8c878dfcc87..c74336c5cd5 100644
--- a/keyboards/crkbd/r2g/info.json
+++ b/keyboards/crkbd/r2g/info.json
@@ -2,5 +2,110 @@
"split": {
"soft_serial_pin": "D2"
},
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x6_3"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0.3},
+ {"matrix": [0, 2], "x": 1, "y": 0.1},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0.1},
+ {"matrix": [0, 5], "x": 4, "y": 0.2},
+
+ {"matrix": [4, 5], "x": 8, "y": 0.2},
+ {"matrix": [4, 4], "x": 9, "y": 0.1},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0.1},
+ {"matrix": [4, 1], "x": 12, "y": 0.3},
+
+ {"matrix": [1, 1], "x": 0, "y": 1.3},
+ {"matrix": [1, 2], "x": 1, "y": 1.1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1.1},
+ {"matrix": [1, 5], "x": 4, "y": 1.2},
+
+ {"matrix": [5, 5], "x": 8, "y": 1.2},
+ {"matrix": [5, 4], "x": 9, "y": 1.1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1.1},
+ {"matrix": [5, 1], "x": 12, "y": 1.3},
+
+ {"matrix": [2, 1], "x": 0, "y": 2.3},
+ {"matrix": [2, 2], "x": 1, "y": 2.1},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2.1},
+ {"matrix": [2, 5], "x": 4, "y": 2.2},
+
+ {"matrix": [6, 5], "x": 8, "y": 2.2},
+ {"matrix": [6, 4], "x": 9, "y": 2.1},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2.1},
+ {"matrix": [6, 1], "x": 12, "y": 2.3},
+
+ {"matrix": [3, 3], "x": 3, "y": 3.7},
+ {"matrix": [3, 4], "x": 4, "y": 3.7},
+ {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
+
+ {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+ {"matrix": [7, 4], "x": 8, "y": 3.7},
+ {"matrix": [7, 3], "x": 9, "y": 3.7}
+ ]
+ },
+ "LAYOUT_split_3x6_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.3},
+ {"matrix": [0, 1], "x": 1, "y": 0.3},
+ {"matrix": [0, 2], "x": 2, "y": 0.1},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.1},
+ {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+ {"matrix": [4, 5], "x": 9, "y": 0.2},
+ {"matrix": [4, 4], "x": 10, "y": 0.1},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0.1},
+ {"matrix": [4, 1], "x": 13, "y": 0.3},
+ {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.3},
+ {"matrix": [1, 1], "x": 1, "y": 1.3},
+ {"matrix": [1, 2], "x": 2, "y": 1.1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.1},
+ {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+ {"matrix": [5, 5], "x": 9, "y": 1.2},
+ {"matrix": [5, 4], "x": 10, "y": 1.1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1.1},
+ {"matrix": [5, 1], "x": 13, "y": 1.3},
+ {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.3},
+ {"matrix": [2, 1], "x": 1, "y": 2.3},
+ {"matrix": [2, 2], "x": 2, "y": 2.1},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.1},
+ {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+ {"matrix": [6, 5], "x": 9, "y": 2.2},
+ {"matrix": [6, 4], "x": 10, "y": 2.1},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2.1},
+ {"matrix": [6, 1], "x": 13, "y": 2.3},
+ {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+ {"matrix": [3, 3], "x": 4, "y": 3.7},
+ {"matrix": [3, 4], "x": 5, "y": 3.7},
+ {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+ {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+ {"matrix": [7, 4], "x": 9, "y": 3.7},
+ {"matrix": [7, 3], "x": 10, "y": 3.7}
+ ]
+ }
+ }
}
diff --git a/keyboards/crkbd/r2g/r2g.c b/keyboards/crkbd/r2g/r2g.c
index 7fb95c043cd..a4d138b98af 100644
--- a/keyboards/crkbd/r2g/r2g.c
+++ b/keyboards/crkbd/r2g/r2g.c
@@ -16,7 +16,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 "r2g.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/crkbd/r2g/r2g.h b/keyboards/crkbd/r2g/r2g.h
deleted file mode 100644
index fd3cf557a73..00000000000
--- a/keyboards/crkbd/r2g/r2g.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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_split_3x6_3( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
- }
-
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- { KC_NO, L00, L01, L02, L03, L04 }, \
- { KC_NO, L10, L11, L12, L13, L14 }, \
- { KC_NO, L20, L21, L22, L23, L24 }, \
- { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
- { KC_NO, R04, R03, R02, R01, R00 }, \
- { KC_NO, R14, R13, R12, R11, R10 }, \
- { KC_NO, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
- }
-
-
-#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json
index 931c20aa4d4..1226b3f69fc 100644
--- a/keyboards/crkbd/rev1/info.json
+++ b/keyboards/crkbd/rev1/info.json
@@ -2,5 +2,110 @@
"split": {
"soft_serial_pin": "D2"
},
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x6_3"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0.3},
+ {"matrix": [0, 2], "x": 1, "y": 0.1},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0.1},
+ {"matrix": [0, 5], "x": 4, "y": 0.2},
+
+ {"matrix": [4, 5], "x": 8, "y": 0.2},
+ {"matrix": [4, 4], "x": 9, "y": 0.1},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0.1},
+ {"matrix": [4, 1], "x": 12, "y": 0.3},
+
+ {"matrix": [1, 1], "x": 0, "y": 1.3},
+ {"matrix": [1, 2], "x": 1, "y": 1.1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1.1},
+ {"matrix": [1, 5], "x": 4, "y": 1.2},
+
+ {"matrix": [5, 5], "x": 8, "y": 1.2},
+ {"matrix": [5, 4], "x": 9, "y": 1.1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1.1},
+ {"matrix": [5, 1], "x": 12, "y": 1.3},
+
+ {"matrix": [2, 1], "x": 0, "y": 2.3},
+ {"matrix": [2, 2], "x": 1, "y": 2.1},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2.1},
+ {"matrix": [2, 5], "x": 4, "y": 2.2},
+
+ {"matrix": [6, 5], "x": 8, "y": 2.2},
+ {"matrix": [6, 4], "x": 9, "y": 2.1},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2.1},
+ {"matrix": [6, 1], "x": 12, "y": 2.3},
+
+ {"matrix": [3, 3], "x": 3, "y": 3.7},
+ {"matrix": [3, 4], "x": 4, "y": 3.7},
+ {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
+
+ {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+ {"matrix": [7, 4], "x": 8, "y": 3.7},
+ {"matrix": [7, 3], "x": 9, "y": 3.7}
+ ]
+ },
+ "LAYOUT_split_3x6_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.3},
+ {"matrix": [0, 1], "x": 1, "y": 0.3},
+ {"matrix": [0, 2], "x": 2, "y": 0.1},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.1},
+ {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+ {"matrix": [4, 5], "x": 9, "y": 0.2},
+ {"matrix": [4, 4], "x": 10, "y": 0.1},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0.1},
+ {"matrix": [4, 1], "x": 13, "y": 0.3},
+ {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.3},
+ {"matrix": [1, 1], "x": 1, "y": 1.3},
+ {"matrix": [1, 2], "x": 2, "y": 1.1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.1},
+ {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+ {"matrix": [5, 5], "x": 9, "y": 1.2},
+ {"matrix": [5, 4], "x": 10, "y": 1.1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1.1},
+ {"matrix": [5, 1], "x": 13, "y": 1.3},
+ {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.3},
+ {"matrix": [2, 1], "x": 1, "y": 2.3},
+ {"matrix": [2, 2], "x": 2, "y": 2.1},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.1},
+ {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+ {"matrix": [6, 5], "x": 9, "y": 2.2},
+ {"matrix": [6, 4], "x": 10, "y": 2.1},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2.1},
+ {"matrix": [6, 1], "x": 13, "y": 2.3},
+ {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+ {"matrix": [3, 3], "x": 4, "y": 3.7},
+ {"matrix": [3, 4], "x": 5, "y": 3.7},
+ {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+ {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+ {"matrix": [7, 4], "x": 9, "y": 3.7},
+ {"matrix": [7, 3], "x": 10, "y": 3.7}
+ ]
+ }
+ }
}
diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c
index 63e4bed5222..cb337d15bc9 100644
--- a/keyboards/crkbd/rev1/rev1.c
+++ b/keyboards/crkbd/rev1/rev1.c
@@ -15,7 +15,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 "rev1.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h
deleted file mode 100644
index fd3cf557a73..00000000000
--- a/keyboards/crkbd/rev1/rev1.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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_split_3x6_3( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
- }
-
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- { KC_NO, L00, L01, L02, L03, L04 }, \
- { KC_NO, L10, L11, L12, L13, L14 }, \
- { KC_NO, L20, L21, L22, L23, L24 }, \
- { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
- { KC_NO, R04, R03, R02, R01, R00 }, \
- { KC_NO, R14, R13, R12, R11, R10 }, \
- { KC_NO, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
- }
-
-
-#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json
index 04bb07c0bc3..657c8a9e512 100644
--- a/keyboards/dailycraft/wings42/rev1/info.json
+++ b/keyboards/dailycraft/wings42/rev1/info.json
@@ -24,51 +24,55 @@
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
- {"label":"L00", "x":0, "y":0.875},
- {"label":"L01", "x":1, "y":0.625},
- {"label":"L02", "x":2, "y":0.375},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0.125},
- {"label":"R00", "x":9, "y":0.125},
- {"label":"R01", "x":10, "y":0},
- {"label":"R02", "x":11, "y":0},
- {"label":"R03", "x":12, "y":0.375},
- {"label":"R04", "x":13, "y":0.625},
- {"label":"R05", "x":14, "y":0.875},
+ {"matrix": [0, 0], "x": 0, "y": 0.875},
+ {"matrix": [0, 1], "x": 1, "y": 0.625},
+ {"matrix": [0, 2], "x": 2, "y": 0.375},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.125},
- {"label":"L10", "x":0, "y":1.875},
- {"label":"L11", "x":1, "y":1.625},
- {"label":"L12", "x":2, "y":1.375},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1.125},
- {"label":"R10", "x":9, "y":1.125},
- {"label":"R11", "x":10, "y":1},
- {"label":"R12", "x":11, "y":1},
- {"label":"R13", "x":12, "y":1.375},
- {"label":"R14", "x":13, "y":1.625},
- {"label":"R15", "x":14, "y":1.875},
+ {"matrix": [4, 5], "x": 9, "y": 0.125},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0.375},
+ {"matrix": [4, 1], "x": 13, "y": 0.625},
+ {"matrix": [4, 0], "x": 14, "y": 0.875},
- {"label":"L20", "x":0, "y":2.875},
- {"label":"L21", "x":1, "y":2.625},
- {"label":"L22", "x":2, "y":2.375},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2.125},
- {"label":"R20", "x":9, "y":2.125},
- {"label":"R21", "x":10, "y":2},
- {"label":"R22", "x":11, "y":2},
- {"label":"R23", "x":12, "y":2.375},
- {"label":"R24", "x":13, "y":2.625},
- {"label":"R25", "x":14, "y":2.875},
+ {"matrix": [1, 0], "x": 0, "y": 1.875},
+ {"matrix": [1, 1], "x": 1, "y": 1.625},
+ {"matrix": [1, 2], "x": 2, "y": 1.375},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.125},
- {"label":"L30", "x":4, "y":3},
- {"label":"L31", "x":5, "y":3.125},
- {"label":"L32", "x":6, "y":3.375},
- {"label":"R30", "x":8, "y":3.375},
- {"label":"R31", "x":9, "y":3.125},
- {"label":"R32", "x":10, "y":3}
+ {"matrix": [5, 5], "x": 9, "y": 1.125},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1.375},
+ {"matrix": [5, 1], "x": 13, "y": 1.625},
+ {"matrix": [5, 0], "x": 14, "y": 1.875},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.875},
+ {"matrix": [2, 1], "x": 1, "y": 2.625},
+ {"matrix": [2, 2], "x": 2, "y": 2.375},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.125},
+
+ {"matrix": [6, 5], "x": 9, "y": 2.125},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2.375},
+ {"matrix": [6, 1], "x": 13, "y": 2.625},
+ {"matrix": [6, 0], "x": 14, "y": 2.875},
+
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3.125},
+ {"matrix": [3, 5], "x": 6, "y": 3.375},
+
+ {"matrix": [7, 5], "x": 8, "y": 3.375},
+ {"matrix": [7, 4], "x": 9, "y": 3.125},
+ {"matrix": [7, 3], "x": 10, "y": 3}
]
}
}
diff --git a/keyboards/dailycraft/wings42/rev1/rev1.h b/keyboards/dailycraft/wings42/rev1/rev1.h
deleted file mode 100644
index cd6e35a711d..00000000000
--- a/keyboards/dailycraft/wings42/rev1/rev1.h
+++ /dev/null
@@ -1,44 +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_split_3x6_3( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
- }
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
index f80dcd0dfed..09cf423e931 100644
--- a/keyboards/dailycraft/wings42/rev2/info.json
+++ b/keyboards/dailycraft/wings42/rev2/info.json
@@ -21,55 +21,59 @@
"layouts": {
"LAYOUT_split_3x6_3_2": {
"layout": [
- {"label":"L00", "x":0, "y":0.875},
- {"label":"L01", "x":1, "y":0.625},
- {"label":"L02", "x":2, "y":0.375},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0.125},
- {"label":"R00", "x":9, "y":0.125},
- {"label":"R01", "x":10, "y":0},
- {"label":"R02", "x":11, "y":0},
- {"label":"R03", "x":12, "y":0.375},
- {"label":"R04", "x":13, "y":0.625},
- {"label":"R05", "x":14, "y":0.875},
+ {"matrix": [0, 0], "x": 0, "y": 0.875},
+ {"matrix": [0, 1], "x": 1, "y": 0.625},
+ {"matrix": [0, 2], "x": 2, "y": 0.375},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.125},
- {"label":"L10", "x":0, "y":1.875},
- {"label":"L11", "x":1, "y":1.625},
- {"label":"L12", "x":2, "y":1.375},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1.125},
- {"label":"L31", "x":6, "y":1.625},
- {"label":"R33", "x":8, "y":1.625},
- {"label":"R10", "x":9, "y":1.125},
- {"label":"R11", "x":10, "y":1},
- {"label":"R12", "x":11, "y":1},
- {"label":"R13", "x":12, "y":1.375},
- {"label":"R14", "x":13, "y":1.625},
- {"label":"R15", "x":14, "y":1.875},
+ {"matrix": [5, 5], "x": 9, "y": 0.125},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0.375},
+ {"matrix": [5, 1], "x": 13, "y": 0.625},
+ {"matrix": [5, 0], "x": 14, "y": 0.875},
- {"label":"L20", "x":0, "y":2.875},
- {"label":"L21", "x":1, "y":2.625},
- {"label":"L22", "x":2, "y":2.375},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2.125},
- {"label":"L32", "x":6, "y":2.625},
- {"label":"R34", "x":8, "y":2.625},
- {"label":"R20", "x":9, "y":2.125},
- {"label":"R21", "x":10, "y":2},
- {"label":"R22", "x":11, "y":2},
- {"label":"R23", "x":12, "y":2.375},
- {"label":"R24", "x":13, "y":2.625},
- {"label":"R25", "x":14, "y":2.875},
+ {"matrix": [1, 0], "x": 0, "y": 1.875},
+ {"matrix": [1, 1], "x": 1, "y": 1.625},
+ {"matrix": [1, 2], "x": 2, "y": 1.375},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.125},
+ {"matrix": [3, 1], "x": 6, "y": 1.625},
- {"label":"L33", "x":4, "y":3},
- {"label":"L34", "x":5, "y":3.125},
- {"label":"L35", "x":6, "y":3.375},
- {"label":"R30", "x":8, "y":3.375},
- {"label":"R31", "x":9, "y":3.125},
- {"label":"R32", "x":10, "y":3}
+ {"matrix": [8, 2], "x": 8, "y": 1.625},
+ {"matrix": [6, 5], "x": 9, "y": 1.125},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1.375},
+ {"matrix": [6, 1], "x": 13, "y": 1.625},
+ {"matrix": [6, 0], "x": 14, "y": 1.875},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.875},
+ {"matrix": [2, 1], "x": 1, "y": 2.625},
+ {"matrix": [2, 2], "x": 2, "y": 2.375},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.125},
+ {"matrix": [3, 2], "x": 6, "y": 2.625},
+
+ {"matrix": [8, 1], "x": 8, "y": 2.625},
+ {"matrix": [7, 5], "x": 9, "y": 2.125},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2.375},
+ {"matrix": [7, 1], "x": 13, "y": 2.625},
+ {"matrix": [7, 0], "x": 14, "y": 2.875},
+
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3.125},
+ {"matrix": [3, 5], "x": 6, "y": 3.375},
+
+ {"matrix": [8, 5], "x": 8, "y": 3.375},
+ {"matrix": [8, 4], "x": 9, "y": 3.125},
+ {"matrix": [8, 3], "x": 10, "y": 3}
]
}
}
diff --git a/keyboards/dailycraft/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h
deleted file mode 100644
index 4720592264c..00000000000
--- a/keyboards/dailycraft/wings42/rev2/rev2.h
+++ /dev/null
@@ -1,46 +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_split_3x6_3_2( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \
- L33, L34, L35, R30, R31, R32 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, L31, L32, L33, L34, L35 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, R34, R33, R32, R31, R30 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
diff --git a/keyboards/dumbo/dumbo.h b/keyboards/dumbo/dumbo.h
deleted file mode 100644
index bd1d02f8ecc..00000000000
--- a/keyboards/dumbo/dumbo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Adam Naldal
- *
- * 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_split_3x6_4( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, R30, R31, R32, R33 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, L30, L31, L32, L33 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, R33, R32, R31, R30 } \
- }
diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json
index 5b4a7bb23a7..faf59b7ecc9 100644
--- a/keyboards/dumbo/info.json
+++ b/keyboards/dumbo/info.json
@@ -35,57 +35,57 @@
"layouts": {
"LAYOUT_split_3x6_4": {
"layout": [
- {"x":0, "y":1.25},
- {"x":1, "y":1},
- {"x":2, "y":0.25},
- {"x":3, "y":0},
- {"x":4, "y":0.5},
- {"x":5, "y":0.75},
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.75},
- {"x":9.5, "y":0.75},
- {"x":10.5, "y":0.5},
- {"x":11.5, "y":0},
- {"x":12.5, "y":0.25},
- {"x":13.5, "y":1},
- {"x":14.5, "y":1.25},
+ {"matrix": [4, 5], "x": 9.5, "y": 0.75},
+ {"matrix": [4, 4], "x": 10.5, "y": 0.5},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0.25},
+ {"matrix": [4, 1], "x": 13.5, "y": 1},
+ {"matrix": [4, 0], "x": 14.5, "y": 1.25},
- {"x":0, "y":2.25},
- {"x":1, "y":2},
- {"x":2, "y":1.25},
- {"x":3, "y":1},
- {"x":4, "y":1.5},
- {"x":5, "y":1.75},
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.75},
- {"x":9.5, "y":1.75},
- {"x":10.5, "y":1.5},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1.25},
- {"x":13.5, "y":2},
- {"x":14.5, "y":2.25},
+ {"matrix": [5, 5], "x": 9.5, "y": 1.75},
+ {"matrix": [5, 4], "x": 10.5, "y": 1.5},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1.25},
+ {"matrix": [5, 1], "x": 13.5, "y": 2},
+ {"matrix": [5, 0], "x": 14.5, "y": 2.25},
- {"x":0, "y":3.25},
- {"x":1, "y":3},
- {"x":2, "y":2.25},
- {"x":3, "y":2},
- {"x":4, "y":2.5},
- {"x":5, "y":2.75},
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [2, 5], "x": 5, "y": 2.75},
- {"x":9.5, "y":2.75},
- {"x":10.5, "y":2.5},
- {"x":11.5, "y":2},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3.25},
+ {"matrix": [6, 5], "x": 9.5, "y": 2.75},
+ {"matrix": [6, 4], "x": 10.5, "y": 2.5},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2.25},
+ {"matrix": [6, 1], "x": 13.5, "y": 3},
+ {"matrix": [6, 0], "x": 14.5, "y": 3.25},
- {"x":3.25, "y":3.75},
- {"x":4.25, "y":3.75, "h":1.5},
- {"x":5.25, "y":3.75, "h":1.5},
- {"x":6.25, "y":4.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.75},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":3.75, "h":1.5},
- {"x":10.25, "y":3.75, "h":1.5},
- {"x":11.25, "y":3.75}
+ {"matrix": [7, 5], "x": 8.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5},
+ {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5},
+ {"matrix": [7, 2], "x": 11.25, "y": 3.75}
]
}
}
diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/info.json
new file mode 100644
index 00000000000..3091643e4f6
--- /dev/null
+++ b/keyboards/eek/silk_down/info.json
@@ -0,0 +1,51 @@
+{
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.88},
+ {"matrix": [0, 1], "x": 1, "y": 0.38},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.38},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [0, 5], "x": 6, "y": 0.5},
+ {"matrix": [0, 6], "x": 7, "y": 0.38},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0.38},
+ {"matrix": [0, 9], "x": 10, "y": 0.88},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.88},
+ {"matrix": [1, 1], "x": 1, "y": 1.38},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.38},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [1, 5], "x": 6, "y": 1.5},
+ {"matrix": [1, 6], "x": 7, "y": 1.38},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1.38},
+ {"matrix": [1, 9], "x": 10, "y": 1.88},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.88},
+ {"matrix": [2, 1], "x": 1, "y": 2.38},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.38},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [2, 5], "x": 6, "y": 2.5},
+ {"matrix": [2, 6], "x": 7, "y": 2.38},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2.38},
+ {"matrix": [2, 9], "x": 10, "y": 2.88},
+
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.38},
+ {"matrix": [3, 4], "x": 4, "y": 3.5},
+
+ {"matrix": [3, 5], "x": 6, "y": 3.5},
+ {"matrix": [3, 6], "x": 7, "y": 3.38},
+ {"matrix": [3, 7], "x": 8, "y": 3.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h
deleted file mode 100644
index 23ff61e58fa..00000000000
--- a/keyboards/eek/silk_down/silk_down.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * 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_split_3x5_3( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K32, K33, K34, K35, K36, K37 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}
diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/info.json
new file mode 100644
index 00000000000..a810549d55d
--- /dev/null
+++ b/keyboards/eek/silk_up/info.json
@@ -0,0 +1,51 @@
+{
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 9], "x": 0, "y": 0.88},
+ {"matrix": [0, 8], "x": 1, "y": 0.38},
+ {"matrix": [0, 7], "x": 2, "y": 0},
+ {"matrix": [0, 6], "x": 3, "y": 0.38},
+ {"matrix": [0, 5], "x": 4, "y": 0.5},
+
+ {"matrix": [0, 4], "x": 6, "y": 0.5},
+ {"matrix": [0, 3], "x": 7, "y": 0.38},
+ {"matrix": [0, 2], "x": 8, "y": 0},
+ {"matrix": [0, 1], "x": 9, "y": 0.38},
+ {"matrix": [0, 0], "x": 10, "y": 0.88},
+
+ {"matrix": [1, 9], "x": 0, "y": 1.88},
+ {"matrix": [1, 8], "x": 1, "y": 1.38},
+ {"matrix": [1, 7], "x": 2, "y": 1},
+ {"matrix": [1, 6], "x": 3, "y": 1.38},
+ {"matrix": [1, 5], "x": 4, "y": 1.5},
+
+ {"matrix": [1, 4], "x": 6, "y": 1.5},
+ {"matrix": [1, 3], "x": 7, "y": 1.38},
+ {"matrix": [1, 2], "x": 8, "y": 1},
+ {"matrix": [1, 1], "x": 9, "y": 1.38},
+ {"matrix": [1, 0], "x": 10, "y": 1.88},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.88},
+ {"matrix": [2, 8], "x": 1, "y": 2.38},
+ {"matrix": [2, 7], "x": 2, "y": 2},
+ {"matrix": [2, 6], "x": 3, "y": 2.38},
+ {"matrix": [2, 5], "x": 4, "y": 2.5},
+
+ {"matrix": [2, 4], "x": 6, "y": 2.5},
+ {"matrix": [2, 3], "x": 7, "y": 2.38},
+ {"matrix": [2, 2], "x": 8, "y": 2},
+ {"matrix": [2, 1], "x": 9, "y": 2.38},
+ {"matrix": [2, 0], "x": 10, "y": 2.88},
+
+ {"matrix": [3, 7], "x": 2, "y": 3.25},
+ {"matrix": [3, 6], "x": 3, "y": 3.38},
+ {"matrix": [3, 5], "x": 4, "y": 3.5},
+
+ {"matrix": [3, 4], "x": 6, "y": 3.5},
+ {"matrix": [3, 3], "x": 7, "y": 3.38},
+ {"matrix": [3, 2], "x": 8, "y": 3.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h
deleted file mode 100644
index eebcc8fd2ee..00000000000
--- a/keyboards/eek/silk_up/silk_up.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * 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_split_3x5_3( \
- K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, \
- K19, K18, K17, K16, K15, K14, K13, K12, K11, K10, \
- K29, K28, K27, K26, K25, K24, K23, K22, K21, K20, \
- K37, K36, K35, K34, K33, K32 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}
diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h
deleted file mode 100644
index 2f58831df78..00000000000
--- a/keyboards/ferris/0_1/0_1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier
-
-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
-
-/* left hand right hand */
-#define LAYOUT_split_3x5_2(\
- K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\
- K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\
- K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\
- K3_3, K3_4, K3_5, K3_6)\
-/* matrix positions */\
-{\
- {K0_0, K0_1, K0_2, K0_3, K0_4},\
- {K1_0, K1_1, K1_2, K1_3, K1_4},\
- {K2_0, K2_1, K2_2, K2_3, K2_4},\
- {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\
- \
- {K0_5, K0_6, K0_7, K0_8, K0_9},\
- {K1_5, K1_6, K1_7, K1_8, K1_9},\
- {K2_5, K2_6, K2_7, K2_8, K2_9},\
- {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\
-}
-
-// clang-format on
-#define LAYOUT LAYOUT_split_3x5_2
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
index 0738a0491f0..5a65369f61c 100644
--- a/keyboards/ferris/0_1/info.json
+++ b/keyboards/ferris/0_1/info.json
@@ -9,50 +9,53 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["split_3x5_2"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_2"
+ },
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- {"x": 0, "y": 0.93},
- {"x": 1, "y": 0.31},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.28},
- {"x": 4, "y": 0.42},
+ {"matrix": [0, 0], "x": 0, "y": 0.93},
+ {"matrix": [0, 1], "x": 1, "y": 0.31},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.28},
+ {"matrix": [0, 4], "x": 4, "y": 0.42},
- {"x": 7, "y": 0.42},
- {"x": 8, "y": 0.28},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.31},
- {"x": 11, "y": 0.93},
+ {"matrix": [4, 0], "x": 7, "y": 0.42},
+ {"matrix": [4, 1], "x": 8, "y": 0.28},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0.31},
+ {"matrix": [4, 4], "x": 11, "y": 0.93},
- {"x": 0, "y": 1.93},
- {"x": 1, "y": 1.31},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.28},
- {"x": 4, "y": 1.42},
+ {"matrix": [1, 0], "x": 0, "y": 1.93},
+ {"matrix": [1, 1], "x": 1, "y": 1.31},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.28},
+ {"matrix": [1, 4], "x": 4, "y": 1.42},
- {"x": 7, "y": 1.42},
- {"x": 8, "y": 1.28},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1.31},
- {"x": 11, "y": 1.93},
+ {"matrix": [5, 0], "x": 7, "y": 1.42},
+ {"matrix": [5, 1], "x": 8, "y": 1.28},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1.31},
+ {"matrix": [5, 4], "x": 11, "y": 1.93},
- {"x": 0, "y": 2.93},
- {"x": 1, "y": 2.31},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.28},
- {"x": 4, "y": 2.42},
+ {"matrix": [2, 0], "x": 0, "y": 2.93},
+ {"matrix": [2, 1], "x": 1, "y": 2.31},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.28},
+ {"matrix": [2, 4], "x": 4, "y": 2.42},
- {"x": 7, "y": 2.42},
- {"x": 8, "y": 2.28},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2.31},
- {"x": 11, "y": 2.93},
+ {"matrix": [6, 0], "x": 7, "y": 2.42},
+ {"matrix": [6, 1], "x": 8, "y": 2.28},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2.31},
+ {"matrix": [6, 4], "x": 11, "y": 2.93},
- {"x": 3.5, "y": 3.75},
- {"x": 4.5, "y": 4},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+ {"matrix": [3, 4], "x": 4.5, "y": 4},
- {"x": 6.5, "y": 4},
- {"x": 7.5, "y": 3.75}
+ {"matrix": [7, 0], "x": 6.5, "y": 4},
+ {"matrix": [7, 1], "x": 7.5, "y": 3.75}
]
}
}
diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h
deleted file mode 100644
index 2f58831df78..00000000000
--- a/keyboards/ferris/0_2/0_2.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier
-
-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
-
-/* left hand right hand */
-#define LAYOUT_split_3x5_2(\
- K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\
- K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\
- K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\
- K3_3, K3_4, K3_5, K3_6)\
-/* matrix positions */\
-{\
- {K0_0, K0_1, K0_2, K0_3, K0_4},\
- {K1_0, K1_1, K1_2, K1_3, K1_4},\
- {K2_0, K2_1, K2_2, K2_3, K2_4},\
- {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\
- \
- {K0_5, K0_6, K0_7, K0_8, K0_9},\
- {K1_5, K1_6, K1_7, K1_8, K1_9},\
- {K2_5, K2_6, K2_7, K2_8, K2_9},\
- {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\
-}
-
-// clang-format on
-#define LAYOUT LAYOUT_split_3x5_2
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json
index f2b6b4b07bd..c6584ecf01a 100644
--- a/keyboards/ferris/0_2/info.json
+++ b/keyboards/ferris/0_2/info.json
@@ -7,50 +7,53 @@
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"community_layouts": ["split_3x5_2"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_2"
+ },
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- {"x": 0, "y": 0.93},
- {"x": 1, "y": 0.31},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.28},
- {"x": 4, "y": 0.42},
+ {"matrix": [0, 0], "x": 0, "y": 0.93},
+ {"matrix": [0, 1], "x": 1, "y": 0.31},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.28},
+ {"matrix": [0, 4], "x": 4, "y": 0.42},
- {"x": 7, "y": 0.42},
- {"x": 8, "y": 0.28},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.31},
- {"x": 11, "y": 0.93},
+ {"matrix": [4, 0], "x": 7, "y": 0.42},
+ {"matrix": [4, 1], "x": 8, "y": 0.28},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0.31},
+ {"matrix": [4, 4], "x": 11, "y": 0.93},
- {"x": 0, "y": 1.93},
- {"x": 1, "y": 1.31},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.28},
- {"x": 4, "y": 1.42},
+ {"matrix": [1, 0], "x": 0, "y": 1.93},
+ {"matrix": [1, 1], "x": 1, "y": 1.31},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.28},
+ {"matrix": [1, 4], "x": 4, "y": 1.42},
- {"x": 7, "y": 1.42},
- {"x": 8, "y": 1.28},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1.31},
- {"x": 11, "y": 1.93},
+ {"matrix": [5, 0], "x": 7, "y": 1.42},
+ {"matrix": [5, 1], "x": 8, "y": 1.28},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1.31},
+ {"matrix": [5, 4], "x": 11, "y": 1.93},
- {"x": 0, "y": 2.93},
- {"x": 1, "y": 2.31},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.28},
- {"x": 4, "y": 2.42},
+ {"matrix": [2, 0], "x": 0, "y": 2.93},
+ {"matrix": [2, 1], "x": 1, "y": 2.31},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.28},
+ {"matrix": [2, 4], "x": 4, "y": 2.42},
- {"x": 7, "y": 2.42},
- {"x": 8, "y": 2.28},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2.31},
- {"x": 11, "y": 2.93},
+ {"matrix": [6, 0], "x": 7, "y": 2.42},
+ {"matrix": [6, 1], "x": 8, "y": 2.28},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2.31},
+ {"matrix": [6, 4], "x": 11, "y": 2.93},
- {"x": 3.5, "y": 3.75},
- {"x": 4.5, "y": 4},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+ {"matrix": [3, 4], "x": 4.5, "y": 4},
- {"x": 6.5, "y": 4},
- {"x": 7.5, "y": 3.75}
+ {"matrix": [7, 0], "x": 6.5, "y": 4},
+ {"matrix": [7, 1], "x": 7.5, "y": 3.75}
]
}
}
diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h
index eda21d2a94f..549228104a0 100644
--- a/keyboards/gboards/gergoplex/gergoplex.h
+++ b/keyboards/gboards/gergoplex/gergoplex.h
@@ -35,21 +35,3 @@ extern i2c_status_t mcp23018_status;
#define OLATA 0x14 // output latch register
uint8_t init_mcp23018(void);
-
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L30, L31, L32, R30, R31, R32 \
-) { \
- { L04, L14, L24, XXX }, \
- { L03, L13, L23, L32 }, \
- { L02, L12, L22, L31 }, \
- { L01, L11, L21, L30 }, \
- { L00, L10, L20, XXX }, \
- { R00, R10, R20, XXX }, \
- { R01, R11, R21, R30 }, \
- { R02, R12, R22, R31 }, \
- { R03, R13, R23, R32 }, \
- { R04, R14, R24, XXX } \
-}
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
index 914832aacfb..061f8ff8695 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/info.json
@@ -14,45 +14,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"label":"L00", "x":0, "y":0.25},
- {"label":"L01", "x":1, "y":0.125},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0.125},
- {"label":"L04", "x":4, "y":0.375},
- {"label":"R00", "x":8, "y":0.375},
- {"label":"R01", "x":9, "y":0.125},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0.125},
- {"label":"R04", "x":12, "y":0.25},
+ {"matrix": [4, 0], "x": 0, "y": 0.25},
+ {"matrix": [3, 0], "x": 1, "y": 0.125},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [1, 0], "x": 3, "y": 0.125},
+ {"matrix": [0, 0], "x": 4, "y": 0.375},
- {"label":"L10", "x":0, "y":1.25},
- {"label":"L11", "x":1, "y":1.125},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1.125},
- {"label":"L14", "x":4, "y":1.375},
- {"label":"R10", "x":8, "y":1.375},
- {"label":"R11", "x":9, "y":1.125},
- {"label":"R12", "x":10, "y":1},
- {"label":"R13", "x":11, "y":1.125},
- {"label":"R14", "x":12, "y":1.25},
+ {"matrix": [5, 0], "x": 8, "y": 0.375},
+ {"matrix": [6, 0], "x": 9, "y": 0.125},
+ {"matrix": [7, 0], "x": 10, "y": 0},
+ {"matrix": [8, 0], "x": 11, "y": 0.125},
+ {"matrix": [9, 0], "x": 12, "y": 0.25},
- {"label":"L20", "x":0, "y":2.25},
- {"label":"L21", "x":1, "y":2.125},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2.125},
- {"label":"L24", "x":4, "y":2.375},
- {"label":"R20", "x":8, "y":2.375},
- {"label":"R21", "x":9, "y":2.125},
- {"label":"R22", "x":10, "y":2},
- {"label":"R23", "x":11, "y":2.125},
- {"label":"R24", "x":12, "y":2.25},
+ {"matrix": [4, 1], "x": 0, "y": 1.25},
+ {"matrix": [3, 1], "x": 1, "y": 1.125},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [1, 1], "x": 3, "y": 1.125},
+ {"matrix": [0, 1], "x": 4, "y": 1.375},
- {"label":"L30", "x":2, "y":3.5},
- {"label":"L31", "x":3.25, "y":3.625, "w":1.5},
- {"label":"L32", "x":5, "y":3.125, "h":2},
- {"label":"R30", "x":7, "y":3.125, "h":2},
- {"label":"R31", "x":8.25, "y":3.625, "w":1.5},
- {"label":"R32", "x":10, "y":3.5}
+ {"matrix": [5, 1], "x": 8, "y": 1.375},
+ {"matrix": [6, 1], "x": 9, "y": 1.125},
+ {"matrix": [7, 1], "x": 10, "y": 1},
+ {"matrix": [8, 1], "x": 11, "y": 1.125},
+ {"matrix": [9, 1], "x": 12, "y": 1.25},
+
+ {"matrix": [4, 2], "x": 0, "y": 2.25},
+ {"matrix": [3, 2], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 2], "x": 3, "y": 2.125},
+ {"matrix": [0, 2], "x": 4, "y": 2.375},
+
+ {"matrix": [5, 2], "x": 8, "y": 2.375},
+ {"matrix": [6, 2], "x": 9, "y": 2.125},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [8, 2], "x": 11, "y": 2.125},
+ {"matrix": [9, 2], "x": 12, "y": 2.25},
+
+ {"matrix": [3, 3], "x": 2, "y": 3.5},
+ {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
+ {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
+
+ {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
+ {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
+ {"matrix": [8, 3], "x": 10, "y": 3.5}
]
}
}
diff --git a/keyboards/gummykey/gummykey.h b/keyboards/gummykey/gummykey.h
deleted file mode 100644
index 79d36dc8a55..00000000000
--- a/keyboards/gummykey/gummykey.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 Gummor (@gumorr)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_split_4x6_5( \
- L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \
- L40, L41, L42, L44, L45, R45, R44, R42, R41, R40 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, ___, L44, L45 }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, ___, R44, R45 } \
-}
diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json
index 4f2136f358c..6f3758c31a1 100644
--- a/keyboards/gummykey/info.json
+++ b/keyboards/gummykey/info.json
@@ -13,77 +13,75 @@
"diode_direction": "ROW2COL",
"layouts": {
"LAYOUT_split_4x6_5": {
- "layout":
- [
- {"x":0.25, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0.125},
- {"x":5.25, "y":0.25},
-
- {"x":0.25, "y":1},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1.125},
- {"x":5.25, "y":1.25},
-
- {"x":0, "y":2, "w":1.25},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2.125},
- {"x":5.25, "y":2.25},
-
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3.125},
- {"x":5.25, "y":3.25},
-
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4},
- {"x":2.25, "y":4},
- {"x":3.5, "y":4.25, "w":2.25},
- {"x":6.75, "y":4.25},
-
+ "layout": [
+ {"matrix": [0, 0], "x": 0.25, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.125},
+ {"matrix": [0, 5], "x": 5.25, "y": 0.25},
- {"x":13.25, "y":0},
- {"x":12.25, "y":0},
- {"x":11.25, "y":0},
- {"x":10.25, "y":0},
- {"x":9.25, "y":0.125},
- {"x":8.25, "y":0.25},
+ {"matrix": [5, 5], "x": 0.25, "y": 1},
+ {"matrix": [5, 4], "x": 1.25, "y": 1},
+ {"matrix": [5, 3], "x": 2.25, "y": 1},
+ {"matrix": [5, 2], "x": 3.25, "y": 1},
+ {"matrix": [5, 1], "x": 4.25, "y": 1.125},
+ {"matrix": [5, 0], "x": 5.25, "y": 1.25},
- {"x":13.25, "y":1},
- {"x":12.25, "y":1},
- {"x":11.25, "y":1},
- {"x":10.25, "y":1},
- {"x":9.25, "y":1.125},
- {"x":8.25, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2},
+ {"matrix": [1, 2], "x": 2.25, "y": 2},
+ {"matrix": [1, 3], "x": 3.25, "y": 2},
+ {"matrix": [1, 4], "x": 4.25, "y": 2.125},
+ {"matrix": [1, 5], "x": 5.25, "y": 2.25},
- {"x":13.25, "y":2, "w":1.25},
- {"x":12.25, "y":2},
- {"x":11.25, "y":2},
- {"x":10.25, "y":2},
- {"x":9.25, "y":2.125},
- {"x":8.25, "y":2.25},
+ {"matrix": [6, 5], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [6, 4], "x": 1.25, "y": 3},
+ {"matrix": [6, 3], "x": 2.25, "y": 3},
+ {"matrix": [6, 2], "x": 3.25, "y": 3},
+ {"matrix": [6, 1], "x": 4.25, "y": 3.125},
+ {"matrix": [6, 0], "x": 5.25, "y": 3.25},
- {"x":13.25, "y":3, "w":1.25},
- {"x":12.25, "y":3},
- {"x":11.25, "y":3},
- {"x":10.25, "y":3},
- {"x":9.25, "y":3.125},
- {"x":8.25, "y":3.25},
+ {"matrix": [2, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 4},
+ {"matrix": [2, 2], "x": 2.25, "y": 4},
+ {"matrix": [2, 3], "x": 3.5, "y": 4.25, "w": 2.25},
+ {"matrix": [2, 4], "x": 6.75, "y": 4.25},
+ {"matrix": [2, 5], "x": 13.25, "y": 0},
- {"x":13.25, "y":4, "w":1.25},
- {"x":12.25, "y":4},
- {"x":11.25, "y":4},
- {"x":8, "y":4.25, "w":2.25},
- {"x":7, "y":4.25}
- ]
+ {"matrix": [7, 5], "x": 12.25, "y": 0},
+ {"matrix": [7, 4], "x": 11.25, "y": 0},
+ {"matrix": [7, 3], "x": 10.25, "y": 0},
+ {"matrix": [7, 2], "x": 9.25, "y": 0.125},
+ {"matrix": [7, 1], "x": 8.25, "y": 0.25},
+ {"matrix": [7, 0], "x": 13.25, "y": 1},
+
+ {"matrix": [3, 0], "x": 12.25, "y": 1},
+ {"matrix": [3, 1], "x": 11.25, "y": 1},
+ {"matrix": [3, 2], "x": 10.25, "y": 1},
+ {"matrix": [3, 3], "x": 9.25, "y": 1.125},
+ {"matrix": [3, 4], "x": 8.25, "y": 1.25},
+ {"matrix": [3, 5], "x": 13.25, "y": 2, "w": 1.25},
+
+ {"matrix": [8, 5], "x": 12.25, "y": 2},
+ {"matrix": [8, 4], "x": 11.25, "y": 2},
+ {"matrix": [8, 3], "x": 10.25, "y": 2},
+ {"matrix": [8, 2], "x": 9.25, "y": 2.125},
+ {"matrix": [8, 1], "x": 8.25, "y": 2.25},
+ {"matrix": [8, 0], "x": 13.25, "y": 3, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 12.25, "y": 3},
+ {"matrix": [4, 1], "x": 11.25, "y": 3},
+ {"matrix": [4, 2], "x": 10.25, "y": 3},
+ {"matrix": [4, 4], "x": 9.25, "y": 3.125},
+ {"matrix": [4, 5], "x": 8.25, "y": 3.25},
+
+ {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.25, "y": 4},
+ {"matrix": [9, 2], "x": 11.25, "y": 4},
+ {"matrix": [9, 1], "x": 8, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 7, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
index 2bd1aefadb5..5afb908d020 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.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 "3x5_3.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
deleted file mode 100644
index 0a03dd9b1f8..00000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 @dlford
-
-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_split_3x5_3( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L32, L33, L34, R30, R31, R32 \
-) { \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { XXX, XXX, L32, L33, L34 }, \
- { R00, R01, R02, R03, R04 }, \
- { R10, R11, R12, R13, R14 }, \
- { R20, R21, R22, R23, R24 }, \
- { R30, R31, R32, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
index f99eba6502f..f6309cba46e 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -22,49 +22,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"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": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 3], "x": 13, "y": 0},
+ {"matrix": [4, 4], "x": 14, "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},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
+ {"matrix": [5, 0], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 3], "x": 13, "y": 1},
+ {"matrix": [5, 4], "x": 14, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
+ {"matrix": [6, 0], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 3], "x": 13, "y": 2},
+ {"matrix": [6, 4], "x": 14, "y": 2},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
- {"x": 10, "y": 3},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3}
+ {"matrix": [7, 0], "x": 10, "y": 3},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 2], "x": 12, "y": 3}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
deleted file mode 100644
index 1392cb0b18f..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2022 fgoodwin
-
-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
-
-#define XXX KC_NO
-
-#define LAYOUT_split_5x6_6( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L42, L43, L44, L45, R40, R41, R42, R43, \
- L54, L55, R50, R51, \
- L64, L65, R60, R61 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { XXX, XXX, L42, L43, L44, L45 }, \
- { XXX, XXX, XXX, XXX, L54, L55 }, \
- { XXX, XXX, XXX, XXX, L64, L65 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, XXX, XXX }, \
- { R50, R51, XXX, XXX, XXX, XXX }, \
- { R60, R61, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
index 9635c471233..a00a3bda18d 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
@@ -21,83 +21,83 @@
"layouts": {
"LAYOUT_split_5x6_6": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
+ {"matrix": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [7, 2], "x": 13, "y": 0},
+ {"matrix": [7, 3], "x": 14, "y": 0},
+ {"matrix": [7, 4], "x": 15, "y": 0},
+ {"matrix": [7, 5], "x": 16, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
+ {"matrix": [8, 0], "x": 11, "y": 1},
+ {"matrix": [8, 1], "x": 12, "y": 1},
+ {"matrix": [8, 2], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1},
+ {"matrix": [8, 4], "x": 15, "y": 1},
+ {"matrix": [8, 5], "x": 16, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2},
+ {"matrix": [9, 0], "x": 11, "y": 2},
+ {"matrix": [9, 1], "x": 12, "y": 2},
+ {"matrix": [9, 2], "x": 13, "y": 2},
+ {"matrix": [9, 3], "x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 15, "y": 2},
+ {"matrix": [9, 5], "x": 16, "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},
+ {"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},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
- {"x": 15, "y": 3},
- {"x": 16, "y": 3},
+ {"matrix": [10, 0], "x": 11, "y": 3},
+ {"matrix": [10, 1], "x": 12, "y": 3},
+ {"matrix": [10, 2], "x": 13, "y": 3},
+ {"matrix": [10, 3], "x": 14, "y": 3},
+ {"matrix": [10, 4], "x": 15, "y": 3},
+ {"matrix": [10, 5], "x": 16, "y": 3},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4},
- {"x": 7, "y": 4},
+ {"matrix": [11, 0], "x": 7, "y": 4},
+ {"matrix": [11, 1], "x": 9, "y": 4},
+ {"matrix": [11, 2], "x": 10, "y": 4},
+ {"matrix": [11, 3], "x": 11, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4},
+ {"matrix": [5, 4], "x": 13, "y": 4},
+ {"matrix": [5, 5], "x": 14, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
+ {"matrix": [12, 0], "x": 5, "y": 5},
+ {"matrix": [12, 1], "x": 6, "y": 5},
- {"x": 5, "y": 5},
- {"x": 6, "y": 5},
- {"x": 7, "y": 5},
+ {"matrix": [6, 4], "x": 7, "y": 5},
+ {"matrix": [6, 5], "x": 5, "y": 5},
- {"x": 5, "y": 5},
- {"x": 9, "y": 5},
- {"x": 10, "y": 5}
+ {"matrix": [13, 0], "x": 9, "y": 5},
+ {"matrix": [13, 1], "x": 10, "y": 5}
]
}
}
diff --git a/keyboards/handwired/elrgo_s/elrgo_s.h b/keyboards/handwired/elrgo_s/elrgo_s.h
deleted file mode 100644
index 0fb2b58e518..00000000000
--- a/keyboards/handwired/elrgo_s/elrgo_s.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Yaroslav Smirnov
- *
- * 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_split_3x6_5(\
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L31, L32, L33, L34, L35, R30, R31, R32, R33, R34 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- {KC_NO, L31, L32, L33, L34, L35}, \
- \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, KC_NO} \
-}
diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json
index ba850bb5d40..9a43e14c883 100644
--- a/keyboards/handwired/elrgo_s/info.json
+++ b/keyboards/handwired/elrgo_s/info.json
@@ -21,52 +21,61 @@
"layouts": {
"LAYOUT_split_3x6_5": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"R00", "x":9, "y":0},
- {"label":"R01", "x":10, "y":0},
- {"label":"R02", "x":11, "y":0},
- {"label":"R03", "x":12, "y":0},
- {"label":"R04", "x":13, "y":0},
- {"label":"R05", "x":14, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":9, "y":1},
- {"label":"R11", "x":10, "y":1},
- {"label":"R12", "x":11, "y":1},
- {"label":"R13", "x":12, "y":1},
- {"label":"R14", "x":13, "y":1},
- {"label":"R15", "x":14, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":9, "y":2},
- {"label":"R21", "x":10, "y":2},
- {"label":"R22", "x":11, "y":2},
- {"label":"R23", "x":12, "y":2},
- {"label":"R24", "x":13, "y":2},
- {"label":"R25", "x":14, "y":2},
- {"label":"L31", "x":3, "y":3},
- {"label":"L32", "x":4, "y":3},
- {"label":"L33", "x":5, "y":3},
- {"label":"L34", "x":6, "y":3},
- {"label":"L35", "x":6, "y":2},
- {"label":"R30", "x":8, "y":2},
- {"label":"R31", "x":8, "y":3},
- {"label":"R32", "x":9, "y":3},
- {"label":"R33", "x":10, "y":3},
- {"label":"R34", "x":11, "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": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 4], "x": 13, "y": 0},
+ {"matrix": [4, 5], "x": 14, "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": [5, 0], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 4], "x": 13, "y": 1},
+ {"matrix": [5, 5], "x": 14, "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": [6, 0], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 4], "x": 13, "y": 2},
+ {"matrix": [6, 5], "x": 14, "y": 2},
+
+ {"matrix": [3, 1], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+
+ {"matrix": [3, 5], "x": 6, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/info.json
index d728ba1a73d..6770e467eb0 100644
--- a/keyboards/handwired/pteron38/info.json
+++ b/keyboards/handwired/pteron38/info.json
@@ -18,51 +18,51 @@
"layouts": {
"LAYOUT_split_3x5_4": {
"layout": [
- {"x":0, "y":0.75},
- {"x":1, "y":0.25},
- {"x":2, "y":0},
- {"x":3, "y":0.35},
- {"x":4, "y":0.45},
+ {"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.35},
+ {"matrix": [0, 4], "x": 4, "y": 0.45},
- {"x":10, "y":0.45},
- {"x":11, "y":0.35},
- {"x":12, "y":0},
- {"x":13, "y":0.25},
- {"x":14, "y":0.75},
+ {"matrix": [0, 5], "x": 10, "y": 0.45},
+ {"matrix": [0, 6], "x": 11, "y": 0.35},
+ {"matrix": [0, 7], "x": 12, "y": 0},
+ {"matrix": [0, 8], "x": 13, "y": 0.25},
+ {"matrix": [0, 9], "x": 14, "y": 0.75},
- {"x":0, "y":1.75},
- {"x":1, "y":1.25},
- {"x":2, "y":1},
- {"x":3, "y":1.35},
- {"x":4, "y":1.45},
+ {"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.35},
+ {"matrix": [1, 4], "x": 4, "y": 1.45},
- {"x":10, "y":1.45},
- {"x":11, "y":1.35},
- {"x":12, "y":1},
- {"x":13, "y":1.25},
- {"x":14, "y":1.75},
+ {"matrix": [1, 5], "x": 10, "y": 1.45},
+ {"matrix": [1, 6], "x": 11, "y": 1.35},
+ {"matrix": [1, 7], "x": 12, "y": 1},
+ {"matrix": [1, 8], "x": 13, "y": 1.25},
+ {"matrix": [1, 9], "x": 14, "y": 1.75},
- {"x":0, "y":2.75},
- {"x":1, "y":2.25},
- {"x":2, "y":2},
- {"x":3, "y":2.35},
- {"x":4, "y":2.45},
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.35},
+ {"matrix": [2, 4], "x": 4, "y": 2.45},
- {"x":10, "y":2.45},
- {"x":11, "y":2.35},
- {"x":12, "y":2},
- {"x":13, "y":2.25},
- {"x":14, "y":2.75},
+ {"matrix": [2, 5], "x": 10, "y": 2.45},
+ {"matrix": [2, 6], "x": 11, "y": 2.35},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2.25},
+ {"matrix": [2, 9], "x": 14, "y": 2.75},
- {"x":3, "y":3.35},
- {"x":4, "y":3.45},
- {"x":5, "y":3.65},
- {"x":6, "y":3.95},
+ {"matrix": [3, 1], "x": 3, "y": 3.35},
+ {"matrix": [3, 2], "x": 4, "y": 3.45},
+ {"matrix": [3, 3], "x": 5, "y": 3.65},
+ {"matrix": [3, 4], "x": 6, "y": 3.95},
- {"x":8, "y":3.95},
- {"x":9, "y":3.65},
- {"x":10, "y":3.45},
- {"x":11, "y":3.35}
+ {"matrix": [3, 5], "x": 8, "y": 3.95},
+ {"matrix": [3, 6], "x": 9, "y": 3.65},
+ {"matrix": [3, 7], "x": 10, "y": 3.45},
+ {"matrix": [3, 8], "x": 11, "y": 3.35}
]
}
}
diff --git a/keyboards/handwired/pteron38/pteron38.h b/keyboards/handwired/pteron38/pteron38.h
deleted file mode 100644
index 7b9e734cfbd..00000000000
--- a/keyboards/handwired/pteron38/pteron38.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * 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_split_3x5_4( \
- K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \
- K402, K403, K404, K405, K406, K407, K408, K409 \
-) { \
- { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
- { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
- { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \
- { KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO } \
-}
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index e2e2b4a3f7e..c5f15104f68 100644
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
@@ -22,143 +22,290 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"q", "x":0, "y":0.9},
- {"label":"w", "x":1, "y":0.2},
- {"label":"e", "x":2, "y":0},
- {"label":"r", "x":3, "y":0.1},
- {"label":"t", "x":4, "y":0.15},
+ {"matrix": [0, 0], "x": 0, "y": 0.9},
+ {"matrix": [0, 1], "x": 1, "y": 0.2},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.1},
+ {"matrix": [0, 4], "x": 4, "y": 0.15},
- {"label":"y", "x":5, "y":0.15},
- {"label":"u", "x":6, "y":0.1},
- {"label":"i", "x":7, "y":0},
- {"label":"o", "x":8, "y":0.2},
- {"label":"p", "x":9, "y":0.9},
+ {"matrix": [4, 4], "x": 5, "y": 0.15},
+ {"matrix": [4, 3], "x": 6, "y": 0.1},
+ {"matrix": [4, 2], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0.2},
+ {"matrix": [4, 0], "x": 9, "y": 0.9},
- {"label":"a", "x":0, "y":1.9},
- {"label":"s", "x":1, "y":1.2},
- {"label":"d", "x":2, "y":1},
- {"label":"f", "x":3, "y":1.1},
- {"label":"g", "x":4, "y":1.15},
+ {"matrix": [1, 0], "x": 0, "y": 1.9},
+ {"matrix": [1, 1], "x": 1, "y": 1.2},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.1},
+ {"matrix": [1, 4], "x": 4, "y": 1.15},
- {"label":"h", "x":5, "y":1.15},
- {"label":"j", "x":6, "y":1.1},
- {"label":"k", "x":7, "y":1},
- {"label":"l", "x":8, "y":1.2},
- {"label":"'", "x":9, "y":1.9},
+ {"matrix": [5, 4], "x": 5, "y": 1.15},
+ {"matrix": [5, 3], "x": 6, "y": 1.1},
+ {"matrix": [5, 2], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1.2},
+ {"matrix": [5, 0], "x": 9, "y": 1.9},
- {"label":"z", "x":0, "y":2.9},
- {"label":"x", "x":1, "y":2.2},
- {"label":"c", "x":2, "y":2},
- {"label":"v", "x":3, "y":2.1},
- {"label":"b", "x":4, "y":2.15},
+ {"matrix": [2, 0], "x": 0, "y": 2.9},
+ {"matrix": [2, 1], "x": 1, "y": 2.2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.1},
+ {"matrix": [2, 4], "x": 4, "y": 2.15},
- {"label":"n", "x":5, "y":2.15},
- {"label":"m", "x":6, "y":2.1},
- {"label":",", "x":7, "y":2},
- {"label":".", "x":8, "y":2.2},
- {"label":"/", "x":9, "y":2.9},
+ {"matrix": [6, 4], "x": 5, "y": 2.15},
+ {"matrix": [6, 3], "x": 6, "y": 2.1},
+ {"matrix": [6, 2], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2.2},
+ {"matrix": [6, 0], "x": 9, "y": 2.9},
- {"label":"bspc/lwr", "x":3, "y":3.6, "h":2},
- {"label":"esc/sft", "x":4, "y":3.65, "h":2},
+ {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+ {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
- {"label":"ent/alt", "x":5, "y":3.65, "h":2},
- {"label":"spc/ris", "x":6, "y":3.6, "h":2}
- ]
- },
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"label":"q", "x":0, "y":0.9},
- {"label":"w", "x":1, "y":0.2},
- {"label":"e", "x":2, "y":0},
- {"label":"r", "x":3, "y":0.1},
- {"label":"t", "x":4, "y":0.15},
-
- {"label":"y", "x":5, "y":0.15},
- {"label":"u", "x":6, "y":0.1},
- {"label":"i", "x":7, "y":0},
- {"label":"o", "x":8, "y":0.2},
- {"label":"p", "x":9, "y":0.9},
-
- {"label":"a", "x":0, "y":1.9},
- {"label":"s", "x":1, "y":1.2},
- {"label":"d", "x":2, "y":1},
- {"label":"f", "x":3, "y":1.1},
- {"label":"g", "x":4, "y":1.15},
-
- {"label":"h", "x":5, "y":1.15},
- {"label":"j", "x":6, "y":1.1},
- {"label":"k", "x":7, "y":1},
- {"label":"l", "x":8, "y":1.2},
- {"label":"'", "x":9, "y":1.9},
-
- {"label":"z", "x":0, "y":2.9},
- {"label":"x", "x":1, "y":2.2},
- {"label":"c", "x":2, "y":2},
- {"label":"v", "x":3, "y":2.1},
- {"label":"b", "x":4, "y":2.15},
-
- {"label":"n", "x":5, "y":2.15},
- {"label":"m", "x":6, "y":2.1},
- {"label":",", "x":7, "y":2},
- {"label":".", "x":8, "y":2.2},
- {"label":"/", "x":9, "y":2.9},
-
- {"label":"lower", "x":2, "y":3.6, "h":1.25},
- {"label":"bspc", "x":3, "y":3.6, "h":2},
- {"label":"esc/sft", "x":4, "y":3.65, "h":2},
-
- {"label":"ent/alt", "x":5, "y":3.65, "h":2},
- {"label":"spc", "x":6, "y":3.6, "h":2},
- {"label":"raise", "x":7, "y":3.6, "h":1.25}
+ {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+ {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}
]
},
"LAYOUT_complicated": {
"layout": [
- {"label":"q", "x":0, "y":0.9},
- {"label":"w", "x":1, "y":0.2},
- {"label":"e", "x":2, "y":0},
- {"label":"r", "x":3, "y":0.1},
- {"label":"t", "x":4, "y":0.15},
+ {"matrix": [0, 0], "x": 0, "y": 0.9},
+ {"matrix": [0, 1], "x": 1, "y": 0.2},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.1},
+ {"matrix": [0, 4], "x": 4, "y": 0.15},
- {"label":"y", "x":5, "y":0.15},
- {"label":"u", "x":6, "y":0.1},
- {"label":"i", "x":7, "y":0},
- {"label":"o", "x":8, "y":0.2},
- {"label":"p", "x":9, "y":0.9},
+ {"matrix": [4, 4], "x": 5, "y": 0.15},
+ {"matrix": [4, 3], "x": 6, "y": 0.1},
+ {"matrix": [4, 2], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0.2},
+ {"matrix": [4, 0], "x": 9, "y": 0.9},
- {"label":"a", "x":0, "y":1.9},
- {"label":"s", "x":1, "y":1.2},
- {"label":"d", "x":2, "y":1},
- {"label":"f", "x":3, "y":1.1},
- {"label":"g", "x":4, "y":1.15},
+ {"matrix": [1, 0], "x": 0, "y": 1.9},
+ {"matrix": [1, 1], "x": 1, "y": 1.2},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.1},
+ {"matrix": [1, 4], "x": 4, "y": 1.15},
- {"label":"h", "x":5, "y":1.15},
- {"label":"j", "x":6, "y":1.1},
- {"label":"k", "x":7, "y":1},
- {"label":"l", "x":8, "y":1.2},
- {"label":"'", "x":9, "y":1.9},
+ {"matrix": [5, 4], "x": 5, "y": 1.15},
+ {"matrix": [5, 3], "x": 6, "y": 1.1},
+ {"matrix": [5, 2], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1.2},
+ {"matrix": [5, 0], "x": 9, "y": 1.9},
- {"label":"z", "x":0, "y":2.9},
- {"label":"x", "x":1, "y":2.2},
- {"label":"c", "x":2, "y":2},
- {"label":"v", "x":3, "y":2.1},
- {"label":"b", "x":4, "y":2.15},
+ {"matrix": [2, 0], "x": 0, "y": 2.9},
+ {"matrix": [2, 1], "x": 1, "y": 2.2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.1},
+ {"matrix": [2, 4], "x": 4, "y": 2.15},
- {"label":"n", "x":5, "y":2.15},
- {"label":"m", "x":6, "y":2.1},
- {"label":",", "x":7, "y":2},
- {"label":".", "x":8, "y":2.2},
- {"label":"/", "x":9, "y":2.9},
+ {"matrix": [6, 4], "x": 5, "y": 2.15},
+ {"matrix": [6, 3], "x": 6, "y": 2.1},
+ {"matrix": [6, 2], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2.2},
+ {"matrix": [6, 0], "x": 9, "y": 2.9},
- {"label":"bspc", "x":3, "y":3.6},
- {"label":"esc/sft", "x":4, "y":3.65},
- {"label":"ent/alt", "x":5, "y":3.65},
- {"label":"spc", "x":6, "y":3.6},
+ {"matrix": [3, 3], "x": 3, "y": 3.6},
+ {"matrix": [3, 4], "x": 4, "y": 3.65},
- {"label":"lower", "x":3, "y":4.6},
- {"label":"gui", "x":4, "y":4.65},
- {"label":"tab", "x":5, "y":4.65},
- {"label":"raise", "x":6, "y":4.6}
+ {"matrix": [7, 4], "x": 5, "y": 3.65},
+ {"matrix": [7, 3], "x": 6, "y": 3.6},
+
+ {"matrix": [3, 1], "x": 3, "y": 4.6},
+ {"matrix": [3, 2], "x": 4, "y": 4.65},
+
+ {"matrix": [7, 2], "x": 5, "y": 4.65},
+ {"matrix": [7, 1], "x": 6, "y": 4.6}
+ ]
+ },
+ "LAYOUT_full": {
+ "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": [4, 4], "x": 5, "y": 0},
+ {"matrix": [4, 3], "x": 6, "y": 0},
+ {"matrix": [4, 2], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 0], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 10, "y": 0},
+ {"matrix": [1, 1], "x": 11, "y": 0},
+ {"matrix": [1, 2], "x": 12, "y": 0},
+ {"matrix": [1, 3], "x": 13, "y": 0},
+ {"matrix": [1, 4], "x": 14, "y": 0},
+
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 3], "x": 16, "y": 0},
+ {"matrix": [5, 2], "x": 17, "y": 0},
+ {"matrix": [5, 1], "x": 18, "y": 0},
+ {"matrix": [5, 0], "x": 19, "y": 0},
+
+ {"matrix": [2, 0], "x": 20, "y": 0},
+ {"matrix": [2, 1], "x": 21, "y": 0},
+ {"matrix": [2, 2], "x": 22, "y": 0},
+ {"matrix": [2, 3], "x": 23, "y": 0},
+ {"matrix": [2, 4], "x": 24, "y": 0},
+
+ {"matrix": [6, 4], "x": 25, "y": 0},
+ {"matrix": [6, 3], "x": 26, "y": 0},
+ {"matrix": [6, 2], "x": 27, "y": 0},
+ {"matrix": [6, 1], "x": 28, "y": 0},
+ {"matrix": [6, 0], "x": 29, "y": 0},
+
+ {"matrix": [3, 0], "x": 30, "y": 0},
+ {"matrix": [3, 1], "x": 31, "y": 0},
+ {"matrix": [3, 2], "x": 32, "y": 0},
+ {"matrix": [3, 3], "x": 33, "y": 0},
+ {"matrix": [3, 4], "x": 34, "y": 0},
+
+ {"matrix": [7, 4], "x": 35, "y": 0},
+ {"matrix": [7, 3], "x": 36, "y": 0},
+ {"matrix": [7, 2], "x": 37, "y": 0},
+ {"matrix": [7, 1], "x": 38, "y": 0},
+ {"matrix": [7, 0], "x": 39, "y": 0}
+ ]
+ },
+ "LAYOUT_reversed": {
+ "layout": [
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [4, 1], "x": 1, "y": 0},
+ {"matrix": [4, 2], "x": 2, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+ {"matrix": [4, 4], "x": 4, "y": 0},
+
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [0, 2], "x": 7, "y": 0},
+ {"matrix": [0, 1], "x": 8, "y": 0},
+ {"matrix": [0, 0], "x": 9, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+
+ {"matrix": [1, 4], "x": 15, "y": 0},
+ {"matrix": [1, 3], "x": 16, "y": 0},
+ {"matrix": [1, 2], "x": 17, "y": 0},
+ {"matrix": [1, 1], "x": 18, "y": 0},
+ {"matrix": [1, 0], "x": 19, "y": 0},
+
+ {"matrix": [6, 0], "x": 20, "y": 0},
+ {"matrix": [6, 1], "x": 21, "y": 0},
+ {"matrix": [6, 2], "x": 22, "y": 0},
+ {"matrix": [6, 3], "x": 23, "y": 0},
+ {"matrix": [6, 4], "x": 24, "y": 0},
+
+ {"matrix": [2, 4], "x": 25, "y": 0},
+ {"matrix": [2, 3], "x": 26, "y": 0},
+ {"matrix": [2, 2], "x": 27, "y": 0},
+ {"matrix": [2, 1], "x": 28, "y": 0},
+ {"matrix": [2, 0], "x": 29, "y": 0},
+
+ {"matrix": [7, 3], "x": 30, "y": 0},
+ {"matrix": [7, 4], "x": 31, "y": 0},
+
+ {"matrix": [3, 4], "x": 32, "y": 0},
+ {"matrix": [3, 3], "x": 33, "y": 0}
+ ]
+ },
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.9},
+ {"matrix": [0, 1], "x": 1, "y": 0.2},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.1},
+ {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+ {"matrix": [4, 4], "x": 5, "y": 0.15},
+ {"matrix": [4, 3], "x": 6, "y": 0.1},
+ {"matrix": [4, 2], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0.2},
+ {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.9},
+ {"matrix": [1, 1], "x": 1, "y": 1.2},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.1},
+ {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+ {"matrix": [5, 4], "x": 5, "y": 1.15},
+ {"matrix": [5, 3], "x": 6, "y": 1.1},
+ {"matrix": [5, 2], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1.2},
+ {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.9},
+ {"matrix": [2, 1], "x": 1, "y": 2.2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.1},
+ {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+ {"matrix": [6, 4], "x": 5, "y": 2.15},
+ {"matrix": [6, 3], "x": 6, "y": 2.1},
+ {"matrix": [6, 2], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2.2},
+ {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+ {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+ {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+ {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+ {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2},
+ {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25}
+ ]
+ },
+ "LAYOUT_thumbrow": {
+ "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": [4, 4], "x": 5, "y": 0},
+ {"matrix": [4, 3], "x": 6, "y": 0},
+ {"matrix": [4, 2], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 0], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 10, "y": 0},
+ {"matrix": [1, 1], "x": 11, "y": 0},
+ {"matrix": [1, 2], "x": 12, "y": 0},
+ {"matrix": [1, 3], "x": 13, "y": 0},
+ {"matrix": [1, 4], "x": 14, "y": 0},
+
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 3], "x": 16, "y": 0},
+ {"matrix": [5, 2], "x": 17, "y": 0},
+ {"matrix": [5, 1], "x": 18, "y": 0},
+ {"matrix": [5, 0], "x": 19, "y": 0},
+
+ {"matrix": [2, 0], "x": 20, "y": 0},
+ {"matrix": [2, 1], "x": 21, "y": 0},
+ {"matrix": [2, 2], "x": 22, "y": 0},
+ {"matrix": [2, 3], "x": 23, "y": 0},
+ {"matrix": [2, 4], "x": 24, "y": 0},
+
+ {"matrix": [6, 4], "x": 25, "y": 0},
+ {"matrix": [6, 3], "x": 26, "y": 0},
+ {"matrix": [6, 2], "x": 27, "y": 0},
+ {"matrix": [6, 1], "x": 28, "y": 0},
+ {"matrix": [6, 0], "x": 29, "y": 0},
+
+ {"matrix": [3, 1], "x": 30, "y": 0},
+ {"matrix": [3, 2], "x": 31, "y": 0},
+ {"matrix": [3, 3], "x": 32, "y": 0},
+ {"matrix": [3, 4], "x": 33, "y": 0},
+
+ {"matrix": [7, 4], "x": 34, "y": 0},
+ {"matrix": [7, 3], "x": 35, "y": 0},
+ {"matrix": [7, 2], "x": 36, "y": 0},
+ {"matrix": [7, 1], "x": 37, "y": 0}
]
}
}
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h
deleted file mode 100644
index 7d2ce91cdd8..00000000000
--- a/keyboards/ibnuda/squiggle/rev1/rev1.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#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( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L33, L34, R30, R31 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { ___, ___, ___, L33, L34 }, \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { ___, ___, ___, R31, R30 }, \
-}
-
-#define LAYOUT_reversed( \
- R04, R03, R02, R01, R00, L04, L03, L02, L01, L00, \
- R14, R13, R12, R11, R10, L14, L13, L12, L11, L10, \
- R24, R23, R22, R21, R20, L24, L23, L22, L21, L20, \
- R31, R30, L34, L33 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { ___, ___, ___, L33, L34 }, \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { ___, ___, ___, R31, R30 }, \
-}
-
-#define LAYOUT_split_3x5_3(\
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L32, L33, L34, R30, R31, R32 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { ___, ___, L32, L33, L34 }, \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { ___, ___, R32, R31, R30 }, \
-}
-
-#define LAYOUT_complicated(\
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L33, L34, R30, R31, \
- L31, L32, R32, R33 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { ___, L31, L32, L33, L34 }, \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { ___, R33, R32, R31, R30 }, \
-}
-
-#define LAYOUT_thumbrow(\
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L31, L32, L33, L34, R30, R31, R32, R33 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { ___, L31, L32, L33, L34 }, \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { ___, R33, R32, R31, R30 }, \
-}
-
-#define LAYOUT_full(\
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { L30, L31, L32, L33, L34 }, \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { R34, R33, R32, R31, R30 }, \
-}
-
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json
index 7030086a5c0..d9259d5f322 100644
--- a/keyboards/ingrained/info.json
+++ b/keyboards/ingrained/info.json
@@ -14,266 +14,103 @@
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
- {
- "label": "Esc",
- "x": 0,
- "y": 0.3
- },
- {
- "label": "Q",
- "x": 1,
- "y": 0.3
- },
- {
- "label": "W",
- "x": 2,
- "y": 0.1
- },
- {
- "label": "E",
- "x": 3,
- "y": 0
- },
- {
- "label": "R",
- "x": 4,
- "y": 0.1
- },
- {
- "label": "T",
- "x": 5,
- "y": 0.2
- },
- {
- "label": "Y",
- "x": 9,
- "y": 0.2
- },
- {
- "label": "U",
- "x": 10,
- "y": 0.1
- },
- {
- "label": "I",
- "x": 11,
- "y": 0
- },
- {
- "label": "O",
- "x": 12,
- "y": 0.1
- },
- {
- "label": "P",
- "x": 13,
- "y": 0.3
- },
- {
- "label": "Back Space",
- "x": 14,
- "y": 0.3
- },
- {
- "label": "Tab",
- "x": 0,
- "y": 1.3
- },
- {
- "label": "A",
- "x": 1,
- "y": 1.3
- },
- {
- "label": "S",
- "x": 2,
- "y": 1.1
- },
- {
- "label": "D",
- "x": 3,
- "y": 1
- },
- {
- "label": "F",
- "x": 4,
- "y": 1.1
- },
- {
- "label": "G",
- "x": 5,
- "y": 1.2
- },
- {
- "label": "H",
- "x": 9,
- "y": 1.2
- },
- {
- "label": "J",
- "x": 10,
- "y": 1.1
- },
- {
- "label": "K",
- "x": 11,
- "y": 1
- },
- {
- "label": "L",
- "x": 12,
- "y": 1.1
- },
- {
- "label": ";",
- "x": 13,
- "y": 1.3
- },
- {
- "label": "'",
- "x": 14,
- "y": 1.3
- },
- {
- "label": "Shift",
- "x": 0,
- "y": 2.3
- },
- {
- "label": "Z",
- "x": 1,
- "y": 2.3
- },
- {
- "label": "X",
- "x": 2,
- "y": 2.1
- },
- {
- "label": "C",
- "x": 3,
- "y": 2
- },
- {
- "label": "V",
- "x": 4,
- "y": 2.1
- },
- {
- "label": "B",
- "x": 5,
- "y": 2.2
- },
- {
- "label": "N",
- "x": 9,
- "y": 2.2
- },
- {
- "label": "M",
- "x": 10,
- "y": 2.1
- },
- {
- "label": ",",
- "x": 11,
- "y": 2
- },
- {
- "label": ".",
- "x": 12,
- "y": 2.1
- },
- {
- "label": "/",
- "x": 13,
- "y": 2.3
- },
- {
- "label": "Shift",
- "x": 14,
- "y": 2.3
- },
- {
- "label": "GUI",
- "x": 4,
- "y": 3.7
- },
- {
- "label": "Lower",
- "x": 5,
- "y": 3.7
- },
- {
- "label": "Space",
- "x": 6,
- "y": 3.2,
- "h": 1.5
- },
- {
- "label": "Enter",
- "x": 8,
- "y": 3.2,
- "h": 1.5
- },
- {
- "label": "Raise",
- "x": 9,
- "y": 3.7
- },
- {
- "label": "Alt",
- "x": 10,
- "y": 3.7
- }
+ {"matrix": [0, 0], "x": 0, "y": 0.3},
+ {"matrix": [0, 1], "x": 1, "y": 0.3},
+ {"matrix": [0, 2], "x": 2, "y": 0.1},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.1},
+ {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+ {"matrix": [4, 5], "x": 9, "y": 0.2},
+ {"matrix": [4, 4], "x": 10, "y": 0.1},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0.1},
+ {"matrix": [4, 1], "x": 13, "y": 0.3},
+ {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.3},
+ {"matrix": [1, 1], "x": 1, "y": 1.3},
+ {"matrix": [1, 2], "x": 2, "y": 1.1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.1},
+ {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+ {"matrix": [5, 5], "x": 9, "y": 1.2},
+ {"matrix": [5, 4], "x": 10, "y": 1.1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1.1},
+ {"matrix": [5, 1], "x": 13, "y": 1.3},
+ {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.3},
+ {"matrix": [2, 1], "x": 1, "y": 2.3},
+ {"matrix": [2, 2], "x": 2, "y": 2.1},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.1},
+ {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+ {"matrix": [6, 5], "x": 9, "y": 2.2},
+ {"matrix": [6, 4], "x": 10, "y": 2.1},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2.1},
+ {"matrix": [6, 1], "x": 13, "y": 2.3},
+ {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+ {"matrix": [3, 3], "x": 4, "y": 3.7},
+ {"matrix": [3, 4], "x": 5, "y": 3.7},
+ {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+ {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+ {"matrix": [7, 4], "x": 9, "y": 3.7},
+ {"matrix": [7, 3], "x": 10, "y": 3.7}
]
},
"LAYOUT_split_3x5_3": {
- "layout": [
- {"label":"Q", "x":0, "y":0.3},
- {"label":"W", "x":1, "y":0.1},
- {"label":"E", "x":2, "y":0},
- {"label":"R", "x":3, "y":0.1},
- {"label":"T", "x":4, "y":0.2},
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0.3},
+ {"matrix": [0, 2], "x": 1, "y": 0.1},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0.1},
+ {"matrix": [0, 5], "x": 4, "y": 0.2},
- {"label":"Y", "x":8, "y":0.2},
- {"label":"U", "x":9, "y":0.1},
- {"label":"I", "x":10, "y":0},
- {"label":"O", "x":11, "y":0.1},
- {"label":"P", "x":12, "y":0.3},
+ {"matrix": [4, 5], "x": 8, "y": 0.2},
+ {"matrix": [4, 4], "x": 9, "y": 0.1},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0.1},
+ {"matrix": [4, 1], "x": 12, "y": 0.3},
- {"label":"A", "x":0, "y":1.3},
- {"label":"S", "x":1, "y":1.1},
- {"label":"D", "x":2, "y":1},
- {"label":"F", "x":3, "y":1.1},
- {"label":"G", "x":4, "y":1.2},
+ {"matrix": [1, 1], "x": 0, "y": 1.3},
+ {"matrix": [1, 2], "x": 1, "y": 1.1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1.1},
+ {"matrix": [1, 5], "x": 4, "y": 1.2},
- {"label":"H", "x":8, "y":1.2},
- {"label":"J", "x":9, "y":1.1},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1.1},
- {"label":";", "x":12, "y":1.3},
+ {"matrix": [5, 5], "x": 8, "y": 1.2},
+ {"matrix": [5, 4], "x": 9, "y": 1.1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1.1},
+ {"matrix": [5, 1], "x": 12, "y": 1.3},
- {"label":"Z", "x":0, "y":2.3},
- {"label":"X", "x":1, "y":2.1},
- {"label":"C", "x":2, "y":2},
- {"label":"V", "x":3, "y":2.1},
- {"label":"B", "x":4, "y":2.2},
+ {"matrix": [2, 1], "x": 0, "y": 2.3},
+ {"matrix": [2, 2], "x": 1, "y": 2.1},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2.1},
+ {"matrix": [2, 5], "x": 4, "y": 2.2},
- {"label":"N", "x":8, "y":2.2},
- {"label":"M", "x":9, "y":2.1},
- {"label":",", "x":10, "y":2},
- {"label":".", "x":11, "y":2.1},
- {"label":"/", "x":12, "y":2.3},
+ {"matrix": [6, 5], "x": 8, "y": 2.2},
+ {"matrix": [6, 4], "x": 9, "y": 2.1},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2.1},
+ {"matrix": [6, 1], "x": 12, "y": 2.3},
- {"label":"GUI", "x":3, "y":3.7},
- {"label":"Lower", "x":4, "y":3.7},
- {"label":"Space", "x":5, "y":3.2, "h":1.5},
+ {"matrix": [3, 3], "x": 3, "y": 3.7},
+ {"matrix": [3, 4], "x": 4, "y": 3.7},
+ {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
- {"label":"Enter", "x":7, "y":3.2, "h":1.5},
- {"label":"Raise", "x":8, "y":3.7},
- {"label":"Alt", "x":9, "y":3.7}
- ]
+ {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+ {"matrix": [7, 4], "x": 8, "y": 3.7},
+ {"matrix": [7, 3], "x": 9, "y": 3.7}
+ ]
}
}
}
diff --git a/keyboards/ingrained/ingrained.h b/keyboards/ingrained/ingrained.h
deleted file mode 100644
index d2e30559516..00000000000
--- a/keyboards/ingrained/ingrained.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2021 s8erdude (@jpuerto96)
-// 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 XXX KC_NO
-
-#define LAYOUT_split_3x6_3( \
- k00, k01, k02, k03, k04, k05, k011, k010, k09, k08, k07, k06,\
- k10, k11, k12, k13, k14, k15, k111, k110, k19, k18, k17, k16,\
- k20, k21, k22, k23, k24, k25, k211, k210, k29, k28, k27, k26,\
- k33, k34, k35, k311, k310, k39\
-) { \
- { k00, k01, k02, k03, k04, k05 },\
- { k10, k11, k12, k13, k14, k15 },\
- { k20, k21, k22, k23, k24, k25 },\
- { XXX, XXX, XXX, k33, k34, k35 },\
- { k06, k07, k08, k09, k010, k011 },\
- { k16, k17, k18, k19, k110, k111 },\
- { k26, k27, k28, k29, k210, k211 },\
- { XXX, XXX, XXX, k39, k310, k311 }\
-}
-#define LAYOUT_split_3x5_3( \
- k01, k02, k03, k04, k05, k011, k010, k09, k08, k07,\
- k11, k12, k13, k14, k15, k111, k110, k19, k18, k17,\
- k21, k22, k23, k24, k25, k211, k210, k29, k28, k27,\
- k33, k34, k35, k311, k310, k39\
-) { \
- { XXX, k01, k02, k03, k04, k05 },\
- { XXX, k11, k12, k13, k14, k15 },\
- { XXX, k21, k22, k23, k24, k25 },\
- { XXX, XXX, XXX, k33, k34, k35 },\
- { XXX, k07, k08, k09, k010, k011 },\
- { XXX, k17, k18, k19, k110, k111 },\
- { XXX, k27, k28, k29, k210, k211 },\
- { XXX, XXX, XXX, k39, k310, k311 }\
-}
diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h
deleted file mode 100644
index ba93405ecc8..00000000000
--- a/keyboards/kakunpc/suihankey/split/alpha/alpha.h
+++ /dev/null
@@ -1,45 +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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { L30, L31, L32 }, \
- { R00, R01, R02, R03, R04 }, \
- { R10, R11, R12, R13, R14 }, \
- { R20, R21, R22, R23, R24 }, \
- { R30, R31, R32 }, \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json
index d1bbbdde66d..fa44995dbd8 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/split/alpha/info.json
@@ -3,5 +3,57 @@
"cols": ["D4", "C6", "D7", "E6", "B4"],
"rows": ["F4", "F5", "F6", "F7"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_3"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+ {"matrix": [4, 4], "x": 8.2, "y": 0.25},
+ {"matrix": [4, 3], "x": 9.2, "y": 0.125},
+ {"matrix": [4, 2], "x": 10.2, "y": 0},
+ {"matrix": [4, 1], "x": 11.2, "y": 0.125},
+ {"matrix": [4, 0], "x": 12.2, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [5, 4], "x": 8.2, "y": 1.25},
+ {"matrix": [5, 3], "x": 9.2, "y": 1.125},
+ {"matrix": [5, 2], "x": 10.2, "y": 1},
+ {"matrix": [5, 1], "x": 11.2, "y": 1.125},
+ {"matrix": [5, 0], "x": 12.2, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [6, 4], "x": 8.2, "y": 2.25},
+ {"matrix": [6, 3], "x": 9.2, "y": 2.125},
+ {"matrix": [6, 2], "x": 10.2, "y": 2},
+ {"matrix": [6, 1], "x": 11.2, "y": 2.125},
+ {"matrix": [6, 0], "x": 12.2, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 3.4, "y": 3.25},
+ {"matrix": [3, 1], "x": 4.4, "y": 3.55},
+ {"matrix": [3, 2], "x": 5.4, "y": 3.85},
+
+ {"matrix": [7, 2], "x": 6.8, "y": 3.85},
+ {"matrix": [7, 1], "x": 7.8, "y": 3.55},
+ {"matrix": [7, 0], "x": 8.8, "y": 3.25}
+ ]
+ }
+ }
}
diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json
index 4cab8c48f20..8f624aeb6cf 100644
--- a/keyboards/kakunpc/suihankey/split/info.json
+++ b/keyboards/kakunpc/suihankey/split/info.json
@@ -13,54 +13,5 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "community_layouts": ["split_3x5_3"],
- "layouts": {
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.125},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.125},
- {"x": 4, "y": 0.25},
-
- {"x": 8.2, "y": 0.25},
- {"x": 9.2, "y": 0.125},
- {"x": 10.2, "y": 0},
- {"x": 11.2, "y": 0.125},
- {"x": 12.2, "y": 0.375},
-
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.125},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.125},
- {"x": 4, "y": 1.25},
-
- {"x": 8.2, "y": 1.25},
- {"x": 9.2, "y": 1.125},
- {"x": 10.2, "y": 1},
- {"x": 11.2, "y": 1.125},
- {"x": 12.2, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.125},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.125},
- {"x": 4, "y": 2.25},
-
- {"x": 8.2, "y": 2.25},
- {"x": 9.2, "y": 2.125},
- {"x": 10.2, "y": 2},
- {"x": 11.2, "y": 2.125},
- {"x": 12.2, "y": 2.375},
-
- {"x": 3.4, "y": 3.25},
- {"x": 4.4, "y": 3.55},
- {"x": 5.4, "y": 3.85},
-
- {"x": 6.8, "y": 3.85},
- {"x": 7.8, "y": 3.55},
- {"x": 8.8, "y": 3.25}
- ]
- }
- }
+ "community_layouts": ["split_3x5_3"]
}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
index 3d13b5b2f2c..071d876c1ab 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/split/rev1/info.json
@@ -3,5 +3,57 @@
"cols": ["F4", "F5", "F6", "F7"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_3"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [1, 0], "x": 1, "y": 0.125},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0.125},
+ {"matrix": [4, 0], "x": 4, "y": 0.25},
+
+ {"matrix": [9, 0], "x": 8.2, "y": 0.25},
+ {"matrix": [8, 0], "x": 9.2, "y": 0.125},
+ {"matrix": [7, 0], "x": 10.2, "y": 0},
+ {"matrix": [6, 0], "x": 11.2, "y": 0.125},
+ {"matrix": [5, 0], "x": 12.2, "y": 0.375},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1.125},
+ {"matrix": [4, 1], "x": 4, "y": 1.25},
+
+ {"matrix": [9, 1], "x": 8.2, "y": 1.25},
+ {"matrix": [8, 1], "x": 9.2, "y": 1.125},
+ {"matrix": [7, 1], "x": 10.2, "y": 1},
+ {"matrix": [6, 1], "x": 11.2, "y": 1.125},
+ {"matrix": [5, 1], "x": 12.2, "y": 1.375},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375},
+ {"matrix": [1, 2], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [3, 2], "x": 3, "y": 2.125},
+ {"matrix": [4, 2], "x": 4, "y": 2.25},
+
+ {"matrix": [9, 2], "x": 8.2, "y": 2.25},
+ {"matrix": [8, 2], "x": 9.2, "y": 2.125},
+ {"matrix": [7, 2], "x": 10.2, "y": 2},
+ {"matrix": [6, 2], "x": 11.2, "y": 2.125},
+ {"matrix": [5, 2], "x": 12.2, "y": 2.375},
+
+ {"matrix": [0, 3], "x": 3.4, "y": 3.25},
+ {"matrix": [1, 3], "x": 4.4, "y": 3.55},
+ {"matrix": [2, 3], "x": 5.4, "y": 3.85},
+
+ {"matrix": [7, 3], "x": 6.8, "y": 3.85},
+ {"matrix": [6, 3], "x": 7.8, "y": 3.55},
+ {"matrix": [5, 3], "x": 8.8, "y": 3.25}
+ ]
+ }
+ }
}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h
deleted file mode 100644
index 98618ba7123..00000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/rev1.h
+++ /dev/null
@@ -1,47 +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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30 \
-) \
-{ \
- { L00, L10, L20, L30 }, \
- { L01, L11, L21, L31 }, \
- { L02, L12, L22, L32 }, \
- { L03, L13, L23, KC_NO }, \
- { L04, L14, L24, KC_NO }, \
- { R00, R10, R20, R30 }, \
- { R01, R11, R21, R31 }, \
- { R02, R12, R22, R32 }, \
- { R03, R13, R23, KC_NO }, \
- { R04, R14, R24, KC_NO }, \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index 9d1e2b806f0..e42ec5a08df 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -19,9 +19,56 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["split_3x5_3"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_3"
+ },
"layouts": {
"LAYOUT_split_3x5_3": {
- "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+ {"matrix": [4, 4], "x": 7, "y": 0.25},
+ {"matrix": [4, 3], "x": 8, "y": 0.125},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0.125},
+ {"matrix": [4, 0], "x": 11, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [5, 4], "x": 7, "y": 1.25},
+ {"matrix": [5, 3], "x": 8, "y": 1.125},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1.125},
+ {"matrix": [5, 0], "x": 11, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [6, 4], "x": 7, "y": 2.25},
+ {"matrix": [6, 3], "x": 8, "y": 2.125},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2.125},
+ {"matrix": [6, 0], "x": 11, "y": 2.375},
+
+ {"matrix": [3, 2], "x": 2.5, "y": 4.75},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2},
+
+ {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2},
+ {"matrix": [7, 3], "x": 7.5, "y": 4.75},
+ {"matrix": [7, 2], "x": 8.5, "y": 4.75}
+ ]
}
}
}
diff --git a/keyboards/maple_computing/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h
deleted file mode 100644
index bb8bd646661..00000000000
--- a/keyboards/maple_computing/minidox/rev1/rev1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_3( \
- k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, \
- k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, \
- k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, \
- k33, k34, k35, k75, k74, k73 \
- ) \
- { \
- { k01, k02, k03, k04, k05 }, \
- { k11, k12, k13, k14, k15 }, \
- { k21, k22, k23, k24, k25 }, \
- { ___, ___, k33, k34, k35 }, \
- { k41, k42, k43, k44, k45 }, \
- { k51, k52, k53, k54, k55 }, \
- { k61, k62, k63, k64, k65 }, \
- { ___, ___, k73, k74, k75 } \
- }
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/obosob/arch_36/arch_36.h b/keyboards/obosob/arch_36/arch_36.h
deleted file mode 100644
index 11c5e2de221..00000000000
--- a/keyboards/obosob/arch_36/arch_36.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 Obosob
- *
- * 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_split_3x5_3( \
- L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \
- L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \
- L20, L21, L22, L23, L24, R25, R26, R27, R28, R29, \
- L32, L33, L34, R35, R36, R37 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { KC_NO, KC_NO, L32, L33, L34 }, \
- { R09, R08, R07, R06, R05 }, \
- { R19, R18, R17, R16, R15 }, \
- { R29, R28, R27, R26, R25 }, \
- { KC_NO, KC_NO, R37, R36, R35 }, \
-}
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
index 9b0fa7841e2..9eef360e863 100644
--- a/keyboards/obosob/arch_36/info.json
+++ b/keyboards/obosob/arch_36/info.json
@@ -22,45 +22,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"x":0, "y":1},
- {"x":1, "y":0.25},
- {"x":2, "y":0},
- {"x":3, "y":0.375},
- {"x":4, "y":0.5},
- {"x":9, "y":0.5},
- {"x":10, "y":0.375},
- {"x":11, "y":0},
- {"x":12, "y":0.25},
- {"x":13, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.375},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
- {"x":0, "y":2},
- {"x":1, "y":1.25},
- {"x":2, "y":1},
- {"x":3, "y":1.375},
- {"x":4, "y":1.5},
- {"x":9, "y":1.5},
- {"x":10, "y":1.375},
- {"x":11, "y":1},
- {"x":12, "y":1.25},
- {"x":13, "y":2},
+ {"matrix": [4, 4], "x": 9, "y": 0.5},
+ {"matrix": [4, 3], "x": 10, "y": 0.375},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0.25},
+ {"matrix": [4, 0], "x": 13, "y": 1},
- {"x":0, "y":3},
- {"x":1, "y":2.25},
- {"x":2, "y":2},
- {"x":3, "y":2.375},
- {"x":4, "y":2.5},
- {"x":9, "y":2.5},
- {"x":10, "y":2.375},
- {"x":11, "y":2},
- {"x":12, "y":2.25},
- {"x":13, "y":3},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.375},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"x":3.5, "y":3.5},
- {"x":4.5, "y":3.7},
- {"x":5.5, "y":4.1},
- {"x":7.5, "y":4.1},
- {"x":8.5, "y":3.7},
- {"x":9.5, "y":3.5}
+ {"matrix": [5, 4], "x": 9, "y": 1.5},
+ {"matrix": [5, 3], "x": 10, "y": 1.375},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1.25},
+ {"matrix": [5, 0], "x": 13, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.375},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [6, 4], "x": 9, "y": 2.5},
+ {"matrix": [6, 3], "x": 10, "y": 2.375},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2.25},
+ {"matrix": [6, 0], "x": 13, "y": 3},
+
+ {"matrix": [3, 2], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 4.5, "y": 3.7},
+ {"matrix": [3, 4], "x": 5.5, "y": 4.1},
+
+ {"matrix": [7, 4], "x": 7.5, "y": 4.1},
+ {"matrix": [7, 3], "x": 8.5, "y": 3.7},
+ {"matrix": [7, 2], "x": 9.5, "y": 3.5}
]
}
}
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json
index 1f11badbfce..971b9939cf7 100644
--- a/keyboards/pierce/info.json
+++ b/keyboards/pierce/info.json
@@ -14,46 +14,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0.13},
- {"x":2, "y":0},
- {"x":3, "y":0.13},
- {"x":4, "y":0.25},
- {"x":7, "y":0.25},
- {"x":8, "y":0.13},
- {"x":9, "y":0},
- {"x":10, "y":0.13},
- {"x":11, "y":0.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.13},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.13},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
- {"x":0, "y":1.5},
- {"x":1, "y":1.13},
- {"x":2, "y":1},
- {"x":3, "y":1.13},
- {"x":4, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.13},
- {"x":9, "y":1},
- {"x":10, "y":1.13},
- {"x":11, "y":1.5},
+ {"matrix": [0, 5], "x": 7, "y": 0.25},
+ {"matrix": [0, 6], "x": 8, "y": 0.13},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0.13},
+ {"matrix": [0, 9], "x": 11, "y": 0.5},
- {"x":0, "y":2.5},
- {"x":1, "y":2.13},
- {"x":2, "y":2},
- {"x":3, "y":2.13},
- {"x":4, "y":2.25},
- {"x":7, "y":2.25},
- {"x":8, "y":2.13},
- {"x":9, "y":2},
- {"x":10, "y":2.13},
- {"x":11, "y":2.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.13},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.13},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"x":2.5, "y":3.16},
- {"x":3.5, "y":3.5},
- {"x":4.5, "y":3.75},
+ {"matrix": [1, 5], "x": 7, "y": 1.25},
+ {"matrix": [1, 6], "x": 8, "y": 1.13},
+ {"matrix": [1, 7], "x": 9, "y": 1},
+ {"matrix": [1, 8], "x": 10, "y": 1.13},
+ {"matrix": [1, 9], "x": 11, "y": 1.5},
- {"x":6.5, "y":3.75},
- {"x":7.5, "y":3.5},
- {"x":8.5, "y":3.16}
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.13},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.13},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [2, 5], "x": 7, "y": 2.25},
+ {"matrix": [2, 6], "x": 8, "y": 2.13},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [2, 8], "x": 10, "y": 2.13},
+ {"matrix": [2, 9], "x": 11, "y": 2.5},
+
+ {"matrix": [3, 2], "x": 2.5, "y": 3.16},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.75},
+
+ {"matrix": [3, 5], "x": 6.5, "y": 3.75},
+ {"matrix": [3, 6], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.5, "y": 3.16}
]
}
}
diff --git a/keyboards/pierce/pierce.h b/keyboards/pierce/pierce.h
deleted file mode 100644
index edb4151740f..00000000000
--- a/keyboards/pierce/pierce.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * 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_split_3x5_3( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K32, K33, K34, K35, K36, K37 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}
diff --git a/keyboards/pinky/3/3.h b/keyboards/pinky/3/3.h
deleted file mode 100644
index f4926461764..00000000000
--- a/keyboards/pinky/3/3.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_split_3x7_4( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, R30, R31, R32, R33 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { KC_NO, KC_NO, KC_NO, L30, L31, L32, L33 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, KC_NO, R33, R32, R31, R30 } \
- }
-
-#define LAYOUT LAYOUT_split_3x7_4
diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json
index 13a87f91210..770d368399d 100644
--- a/keyboards/pinky/3/info.json
+++ b/keyboards/pinky/3/info.json
@@ -18,62 +18,69 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x7_4"
+ },
"layouts": {
"LAYOUT_split_3x7_4": {
"layout": [
- {"label":"Esc", "x":0, "y":0.3},
- {"label":"Q", "x":1, "y":0.3},
- {"label":"W", "x":2, "y":0.2},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0.2},
- {"label":"T", "x":5, "y":0.4},
- {"label":"(", "x":6, "y":0.6},
- {"label":")", "x":9, "y":0.6},
- {"label":"Y", "x":10, "y":0.4},
- {"label":"U", "x":11, "y":0.2},
- {"label":"I", "x":12, "y":0},
- {"label":"O", "x":13, "y":0.2},
- {"label":"P", "x":14, "y":0.3},
- {"label":"Backspace", "x":15, "y":0.3},
+ {"matrix": [0, 0], "x": 0, "y": 0.3},
+ {"matrix": [0, 1], "x": 1, "y": 0.3},
+ {"matrix": [0, 2], "x": 2, "y": 0.2},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.2},
+ {"matrix": [0, 5], "x": 5, "y": 0.4},
+ {"matrix": [0, 6], "x": 6, "y": 0.6},
- {"label":"Ctrl / Tab", "x":0, "y":1.3},
- {"label":"A", "x":1, "y":1.3},
- {"label":"S", "x":2, "y":1.2},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1.2},
- {"label":"G", "x":5, "y":1.4},
- {"label":"[", "x":6, "y":1.6},
- {"label":"]", "x":9, "y":1.6},
- {"label":"H", "x":10, "y":1.4},
- {"label":"J", "x":11, "y":1.2},
- {"label":"K", "x":12, "y":1},
- {"label":"L", "x":13, "y":1.2},
- {"label":":", "x":14, "y":1.3},
- {"label":"\"", "x":15, "y":1.3},
+ {"matrix": [4, 6], "x": 9, "y": 0.6},
+ {"matrix": [4, 5], "x": 10, "y": 0.4},
+ {"matrix": [4, 4], "x": 11, "y": 0.2},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0.2},
+ {"matrix": [4, 1], "x": 14, "y": 0.3},
+ {"matrix": [4, 0], "x": 15, "y": 0.3},
- {"label":"Shift", "x":0, "y":2.3},
- {"label":"Z", "x":1, "y":2.3},
- {"label":"X", "x":2, "y":2.2},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2.2},
- {"label":"B", "x":5, "y":2.4},
- {"label":"MO(_ADJUST)", "x":6, "y":3},
- {"label":"MO(_ADJUST)", "x":9, "y":3},
- {"label":"N", "x":10, "y":2.4},
- {"label":"M", "x":11, "y":2.2},
- {"label":"<", "x":12, "y":2},
- {"label":">", "x":13, "y":2.2},
- {"label":"?", "x":14, "y":2.3},
- {"label":"Enter", "x":15, "y":2.3},
+ {"matrix": [1, 0], "x": 0, "y": 1.3},
+ {"matrix": [1, 1], "x": 1, "y": 1.3},
+ {"matrix": [1, 2], "x": 2, "y": 1.2},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.2},
+ {"matrix": [1, 5], "x": 5, "y": 1.4},
+ {"matrix": [1, 6], "x": 6, "y": 1.6},
- {"label":"Alt", "x":3.5, "y":3.7},
- {"label":"MO(_LOWER)", "x":4.5, "y":3.8},
- {"label":"GUI", "x":5.5, "y":4},
- {"label":"Space", "x":6.5, "y":4.3},
- {"label":"Space", "x":8.5, "y":4.3},
- {"label":"GUI", "x":9.5, "y":4},
- {"label":"MO(_RAISE)", "x":10.5, "y":3.8},
- {"label":"Alt", "x":11.5, "y":3.7}
+ {"matrix": [5, 6], "x": 9, "y": 1.6},
+ {"matrix": [5, 5], "x": 10, "y": 1.4},
+ {"matrix": [5, 4], "x": 11, "y": 1.2},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1.2},
+ {"matrix": [5, 1], "x": 14, "y": 1.3},
+ {"matrix": [5, 0], "x": 15, "y": 1.3},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.3},
+ {"matrix": [2, 1], "x": 1, "y": 2.3},
+ {"matrix": [2, 2], "x": 2, "y": 2.2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.2},
+ {"matrix": [2, 5], "x": 5, "y": 2.4},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+
+ {"matrix": [6, 6], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 2.4},
+ {"matrix": [6, 4], "x": 11, "y": 2.2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2.2},
+ {"matrix": [6, 1], "x": 14, "y": 2.3},
+ {"matrix": [6, 0], "x": 15, "y": 2.3},
+
+ {"matrix": [3, 3], "x": 3.5, "y": 3.7},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.8},
+ {"matrix": [3, 5], "x": 5.5, "y": 4},
+ {"matrix": [3, 6], "x": 6.5, "y": 4.3},
+
+ {"matrix": [7, 6], "x": 8.5, "y": 4.3},
+ {"matrix": [7, 5], "x": 9.5, "y": 4},
+ {"matrix": [7, 4], "x": 10.5, "y": 3.8},
+ {"matrix": [7, 3], "x": 11.5, "y": 3.7}
]
}
}
diff --git a/keyboards/pinky/4/4.h b/keyboards/pinky/4/4.h
deleted file mode 100644
index 381ce82bcee..00000000000
--- a/keyboards/pinky/4/4.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_split_4x7_4( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, R40, R41, R42, R43 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { KC_NO, KC_NO, KC_NO, L40, L41, L42, L43 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { KC_NO, KC_NO, KC_NO, R43, R42, R41, R40 } \
- }
-
-#define LAYOUT LAYOUT_split_4x7_4
diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json
index 2c1732ea169..01e44a647b3 100644
--- a/keyboards/pinky/4/info.json
+++ b/keyboards/pinky/4/info.json
@@ -18,77 +18,85 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_4x7_4"
+ },
"layouts": {
"LAYOUT_split_4x7_4": {
"layout": [
- {"label":"Esc", "x":0, "y":0.3},
- {"label":"1", "x":1, "y":0.3},
- {"label":"2", "x":2, "y":0.2},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0.2},
- {"label":"5", "x":5, "y":0.4},
- {"label":"(", "x":6, "y":0.6},
- {"label":")", "x":9, "y":0.6},
- {"label":"6", "x":10, "y":0.4},
- {"label":"7", "x":11, "y":0.2},
- {"label":"8", "x":12, "y":0},
- {"label":"9", "x":13, "y":0.2},
- {"label":"0", "x":14, "y":0.3},
- {"label":"Backspace", "x":15, "y":0.3},
+ {"matrix": [0, 0], "x": 0, "y": 0.3},
+ {"matrix": [0, 1], "x": 1, "y": 0.3},
+ {"matrix": [0, 2], "x": 2, "y": 0.2},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.2},
+ {"matrix": [0, 5], "x": 5, "y": 0.4},
+ {"matrix": [0, 6], "x": 6, "y": 0.6},
- {"label":"Tab", "x":0, "y":1.3},
- {"label":"Q", "x":1, "y":1.3},
- {"label":"W", "x":2, "y":1.2},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1.2},
- {"label":"T", "x":5, "y":1.4},
- {"label":"[", "x":6, "y":1.6},
- {"label":"]", "x":9, "y":1.6},
- {"label":"Y", "x":10, "y":1.4},
- {"label":"U", "x":11, "y":1.2},
- {"label":"I", "x":12, "y":1},
- {"label":"O", "x":13, "y":1.2},
- {"label":"P", "x":14, "y":1.3},
- {"label":"\\", "x":15, "y":1.3},
+ {"matrix": [5, 6], "x": 9, "y": 0.6},
+ {"matrix": [5, 5], "x": 10, "y": 0.4},
+ {"matrix": [5, 4], "x": 11, "y": 0.2},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0.2},
+ {"matrix": [5, 1], "x": 14, "y": 0.3},
+ {"matrix": [5, 0], "x": 15, "y": 0.3},
- {"label":"Ctrl / Tab", "x":0, "y":2.3},
- {"label":"A", "x":1, "y":2.3},
- {"label":"S", "x":2, "y":2.2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2.2},
- {"label":"G", "x":5, "y":2.4},
- {"label":"{", "x":6, "y":2.6},
- {"label":"}", "x":9, "y":2.6},
- {"label":"H", "x":10, "y":2.4},
- {"label":"J", "x":11, "y":2.2},
- {"label":"K", "x":12, "y":2},
- {"label":"L", "x":13, "y":2.2},
- {"label":":", "x":14, "y":2.3},
- {"label":"\"", "x":15, "y":2.3},
+ {"matrix": [1, 0], "x": 0, "y": 1.3},
+ {"matrix": [1, 1], "x": 1, "y": 1.3},
+ {"matrix": [1, 2], "x": 2, "y": 1.2},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.2},
+ {"matrix": [1, 5], "x": 5, "y": 1.4},
+ {"matrix": [1, 6], "x": 6, "y": 1.6},
- {"label":"Shift", "x":0, "y":3.3},
- {"label":"Z", "x":1, "y":3.3},
- {"label":"X", "x":2, "y":3.2},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3.2},
- {"label":"B", "x":5, "y":3.4},
- {"label":"MO(_ADJUST)", "x":6, "y":4},
- {"label":"MO(_ADJUST)", "x":9, "y":4},
- {"label":"N", "x":10, "y":3.4},
- {"label":"M", "x":11, "y":3.2},
- {"label":"<", "x":12, "y":3},
- {"label":">", "x":13, "y":3.2},
- {"label":"?", "x":14, "y":3.3},
- {"label":"Enter", "x":15, "y":3.3},
+ {"matrix": [6, 6], "x": 9, "y": 1.6},
+ {"matrix": [6, 5], "x": 10, "y": 1.4},
+ {"matrix": [6, 4], "x": 11, "y": 1.2},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1.2},
+ {"matrix": [6, 1], "x": 14, "y": 1.3},
+ {"matrix": [6, 0], "x": 15, "y": 1.3},
- {"label":"Alt", "x":3.5, "y":4.7},
- {"label":"MO(_LOWER)", "x":4.5, "y":4.8},
- {"label":"GUI", "x":5.5, "y":5},
- {"label":"Space", "x":6.5, "y":5.3},
- {"label":"Space", "x":8.5, "y":5.3},
- {"label":"GUI", "x":9.5, "y":5},
- {"label":"MO(_RAISE)", "x":10.5, "y":4.8},
- {"label":"Alt", "x":11.5, "y":4.7}
+ {"matrix": [2, 0], "x": 0, "y": 2.3},
+ {"matrix": [2, 1], "x": 1, "y": 2.3},
+ {"matrix": [2, 2], "x": 2, "y": 2.2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.2},
+ {"matrix": [2, 5], "x": 5, "y": 2.4},
+ {"matrix": [2, 6], "x": 6, "y": 2.6},
+
+ {"matrix": [7, 6], "x": 9, "y": 2.6},
+ {"matrix": [7, 5], "x": 10, "y": 2.4},
+ {"matrix": [7, 4], "x": 11, "y": 2.2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2.2},
+ {"matrix": [7, 1], "x": 14, "y": 2.3},
+ {"matrix": [7, 0], "x": 15, "y": 2.3},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.3},
+ {"matrix": [3, 1], "x": 1, "y": 3.3},
+ {"matrix": [3, 2], "x": 2, "y": 3.2},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.2},
+ {"matrix": [3, 5], "x": 5, "y": 3.4},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+
+ {"matrix": [8, 6], "x": 9, "y": 4},
+ {"matrix": [8, 5], "x": 10, "y": 3.4},
+ {"matrix": [8, 4], "x": 11, "y": 3.2},
+ {"matrix": [8, 3], "x": 12, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3.2},
+ {"matrix": [8, 1], "x": 14, "y": 3.3},
+ {"matrix": [8, 0], "x": 15, "y": 3.3},
+
+ {"matrix": [4, 3], "x": 3.5, "y": 4.7},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.8},
+ {"matrix": [4, 5], "x": 5.5, "y": 5},
+ {"matrix": [4, 6], "x": 6.5, "y": 5.3},
+
+ {"matrix": [9, 6], "x": 8.5, "y": 5.3},
+ {"matrix": [9, 5], "x": 9.5, "y": 5},
+ {"matrix": [9, 4], "x": 10.5, "y": 4.8},
+ {"matrix": [9, 3], "x": 11.5, "y": 4.7}
]
}
}
diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json
index f1d548a8a05..e3dfef5ab7e 100644
--- a/keyboards/pisces/info.json
+++ b/keyboards/pisces/info.json
@@ -21,9 +21,49 @@
"layouts": {
"LAYOUT_split_3x6_1": {
"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":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":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":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}
+ {"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": [3, 5], "x": 9, "y": 0},
+ {"matrix": [3, 4], "x": 10, "y": 0},
+ {"matrix": [3, 3], "x": 11, "y": 0},
+ {"matrix": [3, 2], "x": 12, "y": 0},
+ {"matrix": [3, 1], "x": 13, "y": 0},
+ {"matrix": [3, 0], "x": 14, "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": [4, 5], "x": 9, "y": 1},
+ {"matrix": [4, 4], "x": 10, "y": 1},
+ {"matrix": [4, 3], "x": 11, "y": 1},
+ {"matrix": [4, 2], "x": 12, "y": 1},
+ {"matrix": [4, 1], "x": 13, "y": 1},
+ {"matrix": [4, 0], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [5, 6], "x": 8, "y": 2},
+ {"matrix": [5, 5], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [5, 3], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 1], "x": 13, "y": 2},
+ {"matrix": [5, 0], "x": 14, "y": 2}
]
}
}
diff --git a/keyboards/pisces/pisces.c b/keyboards/pisces/pisces.c
index 18814c4744b..ca2016280dc 100644
--- a/keyboards/pisces/pisces.c
+++ b/keyboards/pisces/pisces.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "pisces.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[MATRIX_ROWS] = {
// 87654321
diff --git a/keyboards/pisces/pisces.h b/keyboards/pisces/pisces.h
deleted file mode 100644
index b2d61c17c3e..00000000000
--- a/keyboards/pisces/pisces.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * 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_split_3x6_1( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25 \
-) { \
- { L00, L01, L02, L03, L04, L05, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { R05, R04, R03, R02, R01, R00, KC_NO }, \
- { R15, R14, R13, R12, R11, R10, KC_NO }, \
- { R25, R24, R23, R22, R21, R20, R26 } \
-}
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
index 66092d592ce..54bcb2e7faa 100644
--- a/keyboards/pteron36/info.json
+++ b/keyboards/pteron36/info.json
@@ -34,90 +34,98 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"x":0, "y":1},
- {"x":1, "y":0.5},
- {"x":2, "y":0},
- {"x":3, "y":0.5},
- {"x":4, "y":0.75},
- {"x":10, "y":0.75},
- {"x":11, "y":0.5},
- {"x":12, "y":0},
- {"x":13, "y":0.5},
- {"x":14, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.75},
- {"x":0, "y":2},
- {"x":1, "y":1.5},
- {"x":2, "y":1},
- {"x":3, "y":1.5},
- {"x":4, "y":1.75},
- {"x":10, "y":1.75},
- {"x":11, "y":1.5},
- {"x":12, "y":1},
- {"x":13, "y":1.5},
- {"x":14, "y":2},
+ {"matrix": [4, 4], "x": 10, "y": 0.75},
+ {"matrix": [4, 3], "x": 11, "y": 0.5},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0.5},
+ {"matrix": [4, 0], "x": 14, "y": 1},
- {"x":0, "y":3},
- {"x":1, "y":2.5},
- {"x":2, "y":2},
- {"x":3, "y":2.5},
- {"x":4, "y":2.75},
- {"x":10, "y":2.75},
- {"x":11, "y":2.5},
- {"x":12, "y":2},
- {"x":13, "y":2.5},
- {"x":14, "y":3},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.75},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4}
+ {"matrix": [5, 4], "x": 10, "y": 1.75},
+ {"matrix": [5, 3], "x": 11, "y": 1.5},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1.5},
+ {"matrix": [5, 0], "x": 14, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.75},
+
+ {"matrix": [6, 4], "x": 10, "y": 2.75},
+ {"matrix": [6, 3], "x": 11, "y": 2.5},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2.5},
+ {"matrix": [6, 0], "x": 14, "y": 3},
+
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+
+ {"matrix": [7, 2], "x": 8, "y": 4},
+ {"matrix": [7, 1], "x": 9, "y": 4},
+ {"matrix": [7, 0], "x": 10, "y": 4}
]
},
"LAYOUT_split_3x5_3_encoder": {
"layout": [
- {"x":0, "y":1},
- {"x":1, "y":0.5},
- {"x":2, "y":0},
- {"x":3, "y":0.5},
- {"x":4, "y":0.75},
- {"x":10, "y":0.75},
- {"x":11, "y":0.5},
- {"x":12, "y":0},
- {"x":13, "y":0.5},
- {"x":14, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.75},
- {"x":0, "y":2},
- {"x":1, "y":1.5},
- {"x":2, "y":1},
- {"x":3, "y":1.5},
- {"x":4, "y":1.75},
- {"x":10, "y":1.75},
- {"x":11, "y":1.5},
- {"x":12, "y":1},
- {"x":13, "y":1.5},
- {"x":14, "y":2},
+ {"matrix": [4, 4], "x": 10, "y": 0.75},
+ {"matrix": [4, 3], "x": 11, "y": 0.5},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0.5},
+ {"matrix": [4, 0], "x": 14, "y": 1},
- {"x":0, "y":3},
- {"x":1, "y":2.5},
- {"x":2, "y":2},
- {"x":3, "y":2.5},
- {"x":4, "y":2.75},
- {"label":"enc1", "x":5.5, "y":2.75},
- {"label":"enc2", "x":8.5, "y":2.75},
- {"x":10, "y":2.75},
- {"x":11, "y":2.5},
- {"x":12, "y":2},
- {"x":13, "y":2.5},
- {"x":14, "y":3},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.75},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4}
+ {"matrix": [5, 4], "x": 10, "y": 1.75},
+ {"matrix": [5, 3], "x": 11, "y": 1.5},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1.5},
+ {"matrix": [5, 0], "x": 14, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.75},
+ {"matrix": [3, 4], "x": 5.5, "y": 2.75},
+
+ {"matrix": [7, 4], "x": 8.5, "y": 2.75},
+ {"matrix": [6, 4], "x": 10, "y": 2.75},
+ {"matrix": [6, 3], "x": 11, "y": 2.5},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2.5},
+ {"matrix": [6, 0], "x": 14, "y": 3},
+
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+
+ {"matrix": [7, 2], "x": 8, "y": 4},
+ {"matrix": [7, 1], "x": 9, "y": 4},
+ {"matrix": [7, 0], "x": 10, "y": 4}
]
}
}
diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c
index 4c14e6ebd5b..fbcc64b7069 100644
--- a/keyboards/pteron36/pteron36.c
+++ b/keyboards/pteron36/pteron36.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "pteron36.h"
+#include "quantum.h"
//common encoder setup
diff --git a/keyboards/pteron36/pteron36.h b/keyboards/pteron36/pteron36.h
deleted file mode 100644
index 113e7270dbd..00000000000
--- a/keyboards/pteron36/pteron36.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 Harshit Goel
- *
- * 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_split_3x5_3( \
- L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\
- L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\
- L20, L21, L22,L23, L24 , R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30\
-) {\
- {L00, L01, L02,L03, L04 },\
- {L10, L11, L12,L13, L14 },\
- {L20, L21, L22,L23, L24 },\
- {L30, L31, L32, KC_NO, KC_NO },\
- {R00, R01, R02,R03, R04 },\
- {R10, R11, R12,R13, R14 },\
- {R20, R21, R22,R23, R24 },\
- {R30, R31, R32,KC_NO, KC_NO }\
-}
-#define LAYOUT_split_3x5_3_encoder(\
- L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\
- L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\
- L20, L21, L22,L23, L24 ,L34, R34,R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30\
-){\
- {L00, L01, L02,L03, L04 },\
- {L10, L11, L12,L13, L14 },\
- {L20, L21, L22,L23, L24 },\
- {L30, L31, L32, KC_NO, L34 },\
- {R00, R01, R02,R03, R04 },\
- {R10, R11, R12,R13, R14 },\
- {R20, R21, R22,R23, R24 },\
- {R30, R31, R32,KC_NO, R34 }\
-}
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 3a2b853eacc..03774dcfe57 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -23,59 +23,130 @@
}
}
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x6_5"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_split_3x6_5": {
"layout": [
- {"x":0, "y":0.75},
- {"x":1, "y":0.75},
- {"x":2, "y":0.25},
- {"x":3, "y":0},
- {"x":4, "y":0.25},
- {"x":5, "y":0.5},
- {"x":10.5, "y":0.5},
- {"x":11.5, "y":0.25},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0.25},
- {"x":14.5, "y":0.75},
- {"x":15.5, "y":0.75},
- {"x":0, "y":1.75},
- {"x":1, "y":1.75},
- {"x":2, "y":1.25},
- {"x":3, "y":1},
- {"x":4, "y":1.25},
- {"x":5, "y":1.5},
- {"x":10.5, "y":1.5},
- {"x":11.5, "y":1.25},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1.25},
- {"x":14.5, "y":1.75},
- {"x":15.5, "y":1.75},
- {"x":0, "y":2.75},
- {"x":1, "y":2.75},
- {"x":2, "y":2.25},
- {"x":3, "y":2},
- {"x":4, "y":2.25},
- {"x":5, "y":2.5},
- {"x":6, "y":3},
- {"x":7, "y":3.25},
- {"x":8.5, "y":3.25},
- {"x":9.5, "y":3},
- {"x":10.5, "y":2.5},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2},
- {"x":13.5, "y":2.25},
- {"x":14.5, "y":2.75},
- {"x":15.5, "y":2.75},
- {"x":2.5, "y":3.25},
- {"x":3.5, "y":3.25},
- {"x":4.5, "y":3.5},
- {"x":5.5, "y":4},
- {"x":6.5, "y":4.25},
- {"x":9, "y":4.25},
- {"x":10, "y":4},
- {"x":11, "y":3.5},
- {"x":12, "y":3.25},
- {"x":13, "y":3.25}
+ {"matrix": [0, 7], "x": 0, "y": 0.75},
+ {"matrix": [0, 6], "x": 1, "y": 0.75},
+ {"matrix": [0, 5], "x": 2, "y": 0.25},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0.25},
+ {"matrix": [0, 2], "x": 5, "y": 0.5},
+
+ {"matrix": [4, 2], "x": 10.5, "y": 0.5},
+ {"matrix": [4, 3], "x": 11.5, "y": 0.25},
+ {"matrix": [4, 4], "x": 12.5, "y": 0},
+ {"matrix": [4, 5], "x": 13.5, "y": 0.25},
+ {"matrix": [4, 6], "x": 14.5, "y": 0.75},
+ {"matrix": [4, 7], "x": 15.5, "y": 0.75},
+
+ {"matrix": [1, 7], "x": 0, "y": 1.75},
+ {"matrix": [1, 6], "x": 1, "y": 1.75},
+ {"matrix": [1, 5], "x": 2, "y": 1.25},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1.25},
+ {"matrix": [1, 2], "x": 5, "y": 1.5},
+
+ {"matrix": [5, 2], "x": 10.5, "y": 1.5},
+ {"matrix": [5, 3], "x": 11.5, "y": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1.25},
+ {"matrix": [5, 6], "x": 14.5, "y": 1.75},
+ {"matrix": [5, 7], "x": 15.5, "y": 1.75},
+
+ {"matrix": [2, 7], "x": 0, "y": 2.75},
+ {"matrix": [2, 6], "x": 1, "y": 2.75},
+ {"matrix": [2, 5], "x": 2, "y": 2.25},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2.25},
+ {"matrix": [2, 2], "x": 5, "y": 2.5},
+ {"matrix": [2, 1], "x": 6, "y": 3},
+ {"matrix": [2, 0], "x": 7, "y": 3.25},
+
+ {"matrix": [6, 0], "x": 8.5, "y": 3.25},
+ {"matrix": [6, 1], "x": 9.5, "y": 3},
+ {"matrix": [6, 2], "x": 10.5, "y": 2.5},
+ {"matrix": [6, 3], "x": 11.5, "y": 2.25},
+ {"matrix": [6, 4], "x": 12.5, "y": 2},
+ {"matrix": [6, 5], "x": 13.5, "y": 2.25},
+ {"matrix": [6, 6], "x": 14.5, "y": 2.75},
+ {"matrix": [6, 7], "x": 15.5, "y": 2.75},
+
+ {"matrix": [3, 4], "x": 2.5, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+ {"matrix": [3, 2], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 1], "x": 5.5, "y": 4},
+ {"matrix": [3, 0], "x": 6.5, "y": 4.25},
+
+ {"matrix": [7, 0], "x": 9, "y": 4.25},
+ {"matrix": [7, 1], "x": 10, "y": 4},
+ {"matrix": [7, 2], "x": 11, "y": 3.5},
+ {"matrix": [7, 3], "x": 12, "y": 3.25},
+ {"matrix": [7, 4], "x": 13, "y": 3.25}
+ ]
+ },
+ "LAYOUT_stack": {
+ "layout": [
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [1, 7], "x": 6, "y": 0},
+ {"matrix": [1, 6], "x": 7, "y": 0},
+ {"matrix": [1, 5], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [1, 3], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+
+ {"matrix": [2, 7], "x": 12, "y": 0},
+ {"matrix": [2, 6], "x": 13, "y": 0},
+ {"matrix": [2, 5], "x": 14, "y": 0},
+ {"matrix": [2, 4], "x": 15, "y": 0},
+ {"matrix": [2, 3], "x": 16, "y": 0},
+ {"matrix": [2, 2], "x": 17, "y": 0},
+ {"matrix": [2, 1], "x": 18, "y": 0},
+ {"matrix": [2, 0], "x": 19, "y": 0},
+
+ {"matrix": [3, 4], "x": 20, "y": 0},
+ {"matrix": [3, 3], "x": 21, "y": 0},
+ {"matrix": [3, 2], "x": 22, "y": 0},
+ {"matrix": [3, 1], "x": 23, "y": 0},
+ {"matrix": [3, 0], "x": 24, "y": 0},
+
+ {"matrix": [4, 2], "x": 25, "y": 0},
+ {"matrix": [4, 3], "x": 26, "y": 0},
+ {"matrix": [4, 4], "x": 27, "y": 0},
+ {"matrix": [4, 5], "x": 28, "y": 0},
+ {"matrix": [4, 6], "x": 29, "y": 0},
+ {"matrix": [4, 7], "x": 30, "y": 0},
+
+ {"matrix": [5, 2], "x": 31, "y": 0},
+ {"matrix": [5, 3], "x": 32, "y": 0},
+ {"matrix": [5, 4], "x": 33, "y": 0},
+ {"matrix": [5, 5], "x": 34, "y": 0},
+ {"matrix": [5, 6], "x": 35, "y": 0},
+ {"matrix": [5, 7], "x": 36, "y": 0},
+
+ {"matrix": [6, 0], "x": 37, "y": 0},
+ {"matrix": [6, 1], "x": 38, "y": 0},
+ {"matrix": [6, 2], "x": 39, "y": 0},
+ {"matrix": [6, 3], "x": 40, "y": 0},
+ {"matrix": [6, 4], "x": 41, "y": 0},
+ {"matrix": [6, 5], "x": 42, "y": 0},
+ {"matrix": [6, 6], "x": 43, "y": 0},
+ {"matrix": [6, 7], "x": 44, "y": 0},
+
+ {"matrix": [7, 0], "x": 45, "y": 0},
+ {"matrix": [7, 1], "x": 46, "y": 0},
+ {"matrix": [7, 2], "x": 47, "y": 0},
+ {"matrix": [7, 3], "x": 48, "y": 0},
+ {"matrix": [7, 4], "x": 49, "y": 0}
]
}
}
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c
index 52a62ccef8a..db144119330 100644
--- a/keyboards/splitkb/kyria/rev1/rev1.c
+++ b/keyboards/splitkb/kyria/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"
#ifdef SWAP_HANDS_ENABLE
// clang-format off
diff --git a/keyboards/splitkb/kyria/rev1/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h
deleted file mode 100644
index 9b5ea58eadd..00000000000
--- a/keyboards/splitkb/kyria/rev1/rev1.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2019 Thomas Baart
- *
- * 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( \
- L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
- L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
- L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
- L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
-) \
-{ \
- { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
- { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
- { L31, L30, L29, L28, L27, L26, L25, L24 }, \
- { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
- { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
- { R32, R33, R34, R35, R36, R37, R38, R39 }, \
- { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_stack( \
- L00, L01, L02, L03, L04, L05, \
- L12, L13, L14, L15, L16, L17, \
- L24, L25, L26, L27, L28, L29, L30, L31, \
- L40, L41, L42, L43, L44, \
- \
- R06, R07, R08, R09, R10, R11, \
- R18, R19, R20, R21, R22, R23, \
- R32, R33, R34, R35, R36, R37, R38, R39, \
- R45, R46, R47, R48, R49 \
-) \
-{ \
- { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
- { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
- { L31, L30, L29, L28, L27, L26, L25, L24 }, \
- { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
- { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
- { R32, R33, R34, R35, R36, R37, R38, R39 }, \
- { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_split_3x6_5 LAYOUT
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index c0aa1047c55..67c9e7a775e 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -29,59 +29,130 @@
}
}
},
+ "layout_aliases": {
+ "LAYOUT_split_3x6_5": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.75},
- {"x":1, "y":0.75},
- {"x":2, "y":0.25},
- {"x":3, "y":0},
- {"x":4, "y":0.25},
- {"x":5, "y":0.5},
- {"x":10.5, "y":0.5},
- {"x":11.5, "y":0.25},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0.25},
- {"x":14.5, "y":0.75},
- {"x":15.5, "y":0.75},
- {"x":0, "y":1.75},
- {"x":1, "y":1.75},
- {"x":2, "y":1.25},
- {"x":3, "y":1},
- {"x":4, "y":1.25},
- {"x":5, "y":1.5},
- {"x":10.5, "y":1.5},
- {"x":11.5, "y":1.25},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1.25},
- {"x":14.5, "y":1.75},
- {"x":15.5, "y":1.75},
- {"x":0, "y":2.75},
- {"x":1, "y":2.75},
- {"x":2, "y":2.25},
- {"x":3, "y":2},
- {"x":4, "y":2.25},
- {"x":5, "y":2.5},
- {"x":6, "y":3},
- {"x":7, "y":3.25},
- {"x":8.5, "y":3.25},
- {"x":9.5, "y":3},
- {"x":10.5, "y":2.5},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2},
- {"x":13.5, "y":2.25},
- {"x":14.5, "y":2.75},
- {"x":15.5, "y":2.75},
- {"x":2.5, "y":3.25},
- {"x":3.5, "y":3.25},
- {"x":4.5, "y":3.5},
- {"x":5.5, "y":4},
- {"x":6.5, "y":4.25},
- {"x":9, "y":4.25},
- {"x":10, "y":4},
- {"x":11, "y":3.5},
- {"x":12, "y":3.25},
- {"x":13, "y":3.25}
+ {"matrix": [0, 7], "x": 0, "y": 0.75},
+ {"matrix": [0, 6], "x": 1, "y": 0.75},
+ {"matrix": [0, 5], "x": 2, "y": 0.25},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0.25},
+ {"matrix": [0, 2], "x": 5, "y": 0.5},
+
+ {"matrix": [4, 2], "x": 10.5, "y": 0.5},
+ {"matrix": [4, 3], "x": 11.5, "y": 0.25},
+ {"matrix": [4, 4], "x": 12.5, "y": 0},
+ {"matrix": [4, 5], "x": 13.5, "y": 0.25},
+ {"matrix": [4, 6], "x": 14.5, "y": 0.75},
+ {"matrix": [4, 7], "x": 15.5, "y": 0.75},
+
+ {"matrix": [1, 7], "x": 0, "y": 1.75},
+ {"matrix": [1, 6], "x": 1, "y": 1.75},
+ {"matrix": [1, 5], "x": 2, "y": 1.25},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1.25},
+ {"matrix": [1, 2], "x": 5, "y": 1.5},
+
+ {"matrix": [5, 2], "x": 10.5, "y": 1.5},
+ {"matrix": [5, 3], "x": 11.5, "y": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1.25},
+ {"matrix": [5, 6], "x": 14.5, "y": 1.75},
+ {"matrix": [5, 7], "x": 15.5, "y": 1.75},
+
+ {"matrix": [2, 7], "x": 0, "y": 2.75},
+ {"matrix": [2, 6], "x": 1, "y": 2.75},
+ {"matrix": [2, 5], "x": 2, "y": 2.25},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2.25},
+ {"matrix": [2, 2], "x": 5, "y": 2.5},
+ {"matrix": [2, 1], "x": 6, "y": 3},
+ {"matrix": [2, 0], "x": 7, "y": 3.25},
+
+ {"matrix": [6, 0], "x": 8.5, "y": 3.25},
+ {"matrix": [6, 1], "x": 9.5, "y": 3},
+ {"matrix": [6, 2], "x": 10.5, "y": 2.5},
+ {"matrix": [6, 3], "x": 11.5, "y": 2.25},
+ {"matrix": [6, 4], "x": 12.5, "y": 2},
+ {"matrix": [6, 5], "x": 13.5, "y": 2.25},
+ {"matrix": [6, 6], "x": 14.5, "y": 2.75},
+ {"matrix": [6, 7], "x": 15.5, "y": 2.75},
+
+ {"matrix": [3, 5], "x": 2.5, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+ {"matrix": [3, 2], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 1], "x": 5.5, "y": 4},
+ {"matrix": [3, 0], "x": 6.5, "y": 4.25},
+
+ {"matrix": [7, 0], "x": 9, "y": 4.25},
+ {"matrix": [7, 1], "x": 10, "y": 4},
+ {"matrix": [7, 2], "x": 11, "y": 3.5},
+ {"matrix": [7, 3], "x": 12, "y": 3.25},
+ {"matrix": [7, 5], "x": 13, "y": 3.25}
+ ]
+ },
+ "LAYOUT_stack": {
+ "layout": [
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [1, 7], "x": 6, "y": 0},
+ {"matrix": [1, 6], "x": 7, "y": 0},
+ {"matrix": [1, 5], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [1, 3], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+
+ {"matrix": [2, 7], "x": 12, "y": 0},
+ {"matrix": [2, 6], "x": 13, "y": 0},
+ {"matrix": [2, 5], "x": 14, "y": 0},
+ {"matrix": [2, 4], "x": 15, "y": 0},
+ {"matrix": [2, 3], "x": 16, "y": 0},
+ {"matrix": [2, 2], "x": 17, "y": 0},
+ {"matrix": [2, 1], "x": 18, "y": 0},
+ {"matrix": [2, 0], "x": 19, "y": 0},
+
+ {"matrix": [3, 5], "x": 20, "y": 0},
+ {"matrix": [3, 3], "x": 21, "y": 0},
+ {"matrix": [3, 2], "x": 22, "y": 0},
+ {"matrix": [3, 1], "x": 23, "y": 0},
+ {"matrix": [3, 0], "x": 24, "y": 0},
+
+ {"matrix": [4, 2], "x": 25, "y": 0},
+ {"matrix": [4, 3], "x": 26, "y": 0},
+ {"matrix": [4, 4], "x": 27, "y": 0},
+ {"matrix": [4, 5], "x": 28, "y": 0},
+ {"matrix": [4, 6], "x": 29, "y": 0},
+ {"matrix": [4, 7], "x": 30, "y": 0},
+
+ {"matrix": [5, 2], "x": 31, "y": 0},
+ {"matrix": [5, 3], "x": 32, "y": 0},
+ {"matrix": [5, 4], "x": 33, "y": 0},
+ {"matrix": [5, 5], "x": 34, "y": 0},
+ {"matrix": [5, 6], "x": 35, "y": 0},
+ {"matrix": [5, 7], "x": 36, "y": 0},
+
+ {"matrix": [6, 0], "x": 37, "y": 0},
+ {"matrix": [6, 1], "x": 38, "y": 0},
+ {"matrix": [6, 2], "x": 39, "y": 0},
+ {"matrix": [6, 3], "x": 40, "y": 0},
+ {"matrix": [6, 4], "x": 41, "y": 0},
+ {"matrix": [6, 5], "x": 42, "y": 0},
+ {"matrix": [6, 6], "x": 43, "y": 0},
+ {"matrix": [6, 7], "x": 44, "y": 0},
+
+ {"matrix": [7, 0], "x": 45, "y": 0},
+ {"matrix": [7, 1], "x": 46, "y": 0},
+ {"matrix": [7, 2], "x": 47, "y": 0},
+ {"matrix": [7, 3], "x": 48, "y": 0},
+ {"matrix": [7, 5], "x": 49, "y": 0}
]
}
}
diff --git a/keyboards/splitkb/kyria/rev2/rev2.c b/keyboards/splitkb/kyria/rev2/rev2.c
index 3ec4aa37f0c..37300c81883 100644
--- a/keyboards/splitkb/kyria/rev2/rev2.c
+++ b/keyboards/splitkb/kyria/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"
// Mask out handedness diode to prevent it
// from keeping the keyboard awake
diff --git a/keyboards/splitkb/kyria/rev2/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h
deleted file mode 100644
index 89d69abc9a6..00000000000
--- a/keyboards/splitkb/kyria/rev2/rev2.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2022 Thomas Baart
- *
- * 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( \
- L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
- L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
- L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
- L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
-) \
-{ \
- { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
- { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
- { L31, L30, L29, L28, L27, L26, L25, L24 }, \
- { L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
- { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
- { R32, R33, R34, R35, R36, R37, R38, R39 }, \
- { R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_stack( \
- L00, L01, L02, L03, L04, L05, \
- L12, L13, L14, L15, L16, L17, \
- L24, L25, L26, L27, L28, L29, L30, L31, \
- L40, L41, L42, L43, L44, \
- \
- R06, R07, R08, R09, R10, R11, \
- R18, R19, R20, R21, R22, R23, \
- R32, R33, R34, R35, R36, R37, R38, R39, \
- R45, R46, R47, R48, R49 \
-) \
-{ \
- { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
- { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
- { L31, L30, L29, L28, L27, L26, L25, L24 }, \
- { L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
- { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
- { R32, R33, R34, R35, R36, R37, R38, R39 }, \
- { R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_split_3x6_5 LAYOUT
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json
index 32b7c90d441..c5294d14afc 100644
--- a/keyboards/torn/info.json
+++ b/keyboards/torn/info.json
@@ -18,50 +18,57 @@
"layouts": {
"LAYOUT_split_3x6_4": {
"layout": [
- {"label":"SW1", "x":0, "y":0.375},
- {"label":"SW2", "x":1, "y":0.375},
- {"label":"SW3", "x":2, "y":0.125},
- {"label":"SW4", "x":3, "y":0},
- {"label":"SW5", "x":4, "y":0.125},
- {"label":"SW6", "x":5, "y":0.25},
- {"label":"SW23", "x":9, "y":0.25},
- {"label":"SW24", "x":10, "y":0.125},
- {"label":"SW25", "x":11, "y":0},
- {"label":"SW26", "x":12, "y":0.125},
- {"label":"SW27", "x":13, "y":0.375},
- {"label":"SW28", "x":14, "y":0.375},
- {"label":"SW7", "x":0, "y":1.375},
- {"label":"SW8", "x":1, "y":1.375},
- {"label":"SW9", "x":2, "y":1.125},
- {"label":"SW10", "x":3, "y":1},
- {"label":"SW11", "x":4, "y":1.125},
- {"label":"SW12", "x":5, "y":1.25},
- {"label":"SW29", "x":9, "y":1.25},
- {"label":"SW30", "x":10, "y":1.125},
- {"label":"SW31", "x":11, "y":1},
- {"label":"SW32", "x":12, "y":1.125},
- {"label":"SW33", "x":13, "y":1.375},
- {"label":"SW34", "x":14, "y":1.375},
- {"label":"SW13", "x":0, "y":2.375},
- {"label":"SW14", "x":1, "y":2.375},
- {"label":"SW15", "x":2, "y":2.125},
- {"label":"SW16", "x":3, "y":2},
- {"label":"SW17", "x":4, "y":2.125},
- {"label":"SW18", "x":5, "y":2.25},
- {"label":"SW35", "x":9, "y":2.25},
- {"label":"SW36", "x":10, "y":2.125},
- {"label":"SW37", "x":11, "y":2},
- {"label":"SW38", "x":12, "y":2.125},
- {"label":"SW39", "x":13, "y":2.375},
- {"label":"SW40", "x":14, "y":2.375},
- {"label":"SW19", "x":3, "y":3.1},
- {"label":"SW20", "x":4, "y":3.25},
- {"label":"SW21", "x":5, "y":3.4},
- {"label":"SW22", "x":6, "y":3.55},
- {"label":"SW41", "x":8, "y":3.55},
- {"label":"SW42", "x":9, "y":3.4},
- {"label":"SW43", "x":10, "y":3.25},
- {"label":"SW44", "x":11, "y":3.1}
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [0, 6], "x": 9, "y": 0.25},
+ {"matrix": [0, 7], "x": 10, "y": 0.125},
+ {"matrix": [0, 8], "x": 11, "y": 0},
+ {"matrix": [0, 9], "x": 12, "y": 0.125},
+ {"matrix": [0, 10], "x": 13, "y": 0.375},
+ {"matrix": [0, 11], "x": 14, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 9, "y": 1.25},
+ {"matrix": [1, 7], "x": 10, "y": 1.125},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1.125},
+ {"matrix": [1, 10], "x": 13, "y": 1.375},
+ {"matrix": [1, 11], "x": 14, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 9, "y": 2.25},
+ {"matrix": [2, 7], "x": 10, "y": 2.125},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2.125},
+ {"matrix": [2, 10], "x": 13, "y": 2.375},
+ {"matrix": [2, 11], "x": 14, "y": 2.375},
+
+ {"matrix": [3, 2], "x": 3, "y": 3.1},
+ {"matrix": [3, 3], "x": 4, "y": 3.25},
+ {"matrix": [3, 4], "x": 5, "y": 3.4},
+ {"matrix": [3, 5], "x": 6, "y": 3.55},
+
+ {"matrix": [3, 6], "x": 8, "y": 3.55},
+ {"matrix": [3, 7], "x": 9, "y": 3.4},
+ {"matrix": [3, 8], "x": 10, "y": 3.25},
+ {"matrix": [3, 9], "x": 11, "y": 3.1}
]
}
}
diff --git a/keyboards/torn/torn.h b/keyboards/torn/torn.h
index c25b5c2a0c2..0b4355e86ad 100644
--- a/keyboards/torn/torn.h
+++ b/keyboards/torn/torn.h
@@ -19,22 +19,6 @@
#include "quantum.h"
-#define ___ KC_NO
-
-// clang-format off
-#define LAYOUT_split_3x6_4( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k32, k33, k34, k35, k36, k37, k38, k39 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { ___, ___, k32, k33, k34, k35, k36, k37, k38, k39, ___, ___ } \
-}
-// clang-format on
-
void torn_set_led(uint8_t led, bool on);
void secondary_encoder_read(void);
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json
index 3365ea7cf5e..78aaa10e72d 100644
--- a/keyboards/yanghu/unicorne/info.json
+++ b/keyboards/yanghu/unicorne/info.json
@@ -28,57 +28,57 @@
"layouts": {
"LAYOUT_split_3x6_4": {
"layout": [
- {"label":"Tab", "x":0, "y":0.8},
- {"label":"Q", "x":1, "y":0.8},
- {"label":"W", "x":2, "y":0.1},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0.1},
- {"label":"T", "x":5, "y":0.2},
+ {"matrix": [0, 0], "x": 0, "y": 0.8},
+ {"matrix": [0, 1], "x": 1, "y": 0.8},
+ {"matrix": [0, 2], "x": 2, "y": 0.1},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.1},
+ {"matrix": [0, 5], "x": 5, "y": 0.2},
- {"label":"Y", "x":9, "y":0.2},
- {"label":"U", "x":10, "y":0.1},
- {"label":"I", "x":11, "y":0},
- {"label":"O", "x":12, "y":0.1},
- {"label":"P", "x":13, "y":0.8},
- {"label":"Back Space", "x":14, "y":0.8},
+ {"matrix": [0, 6], "x": 9, "y": 0.2},
+ {"matrix": [0, 7], "x": 10, "y": 0.1},
+ {"matrix": [0, 8], "x": 11, "y": 0},
+ {"matrix": [0, 9], "x": 12, "y": 0.1},
+ {"matrix": [0, 10], "x": 13, "y": 0.8},
+ {"matrix": [0, 11], "x": 14, "y": 0.8},
- {"label":"Ctrl / Esc", "x":0, "y":1.8},
- {"label":"A", "x":1, "y":1.8},
- {"label":"S", "x":2, "y":1.1},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1.1},
- {"label":"G", "x":5, "y":1.2},
+ {"matrix": [1, 0], "x": 0, "y": 1.8},
+ {"matrix": [1, 1], "x": 1, "y": 1.8},
+ {"matrix": [1, 2], "x": 2, "y": 1.1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.1},
+ {"matrix": [1, 5], "x": 5, "y": 1.2},
- {"label":"H", "x":9, "y":1.2},
- {"label":"J", "x":10, "y":1.1},
- {"label":"K", "x":11, "y":1},
- {"label":"L", "x":12, "y":1.1},
- {"label":";", "x":13, "y":1.8},
- {"label":"'", "x":14, "y":1.8},
+ {"matrix": [1, 6], "x": 9, "y": 1.2},
+ {"matrix": [1, 7], "x": 10, "y": 1.1},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1.1},
+ {"matrix": [1, 10], "x": 13, "y": 1.8},
+ {"matrix": [1, 11], "x": 14, "y": 1.8},
- {"label":"Shift", "x":0, "y":2.8},
- {"label":"Z", "x":1, "y":2.8},
- {"label":"X", "x":2, "y":2.1},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2.1},
- {"label":"B", "x":5, "y":2.2},
+ {"matrix": [2, 0], "x": 0, "y": 2.8},
+ {"matrix": [2, 1], "x": 1, "y": 2.8},
+ {"matrix": [2, 2], "x": 2, "y": 2.1},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.1},
+ {"matrix": [2, 5], "x": 5, "y": 2.2},
- {"label":"N", "x":9, "y":2.2},
- {"label":"M", "x":10, "y":2.1},
- {"label":",", "x":11, "y":2},
- {"label":".", "x":12, "y":2.1},
- {"label":"/", "x":13, "y":2.8},
- {"label":"Shift / Enter", "x":14, "y":2.8},
+ {"matrix": [2, 6], "x": 9, "y": 2.2},
+ {"matrix": [2, 7], "x": 10, "y": 2.1},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2.1},
+ {"matrix": [2, 10], "x": 13, "y": 2.8},
+ {"matrix": [2, 11], "x": 14, "y": 2.8},
- {"label":"Ctrl", "x":3, "y":3.7},
- {"label":"Alt", "x":4, "y":3.7},
- {"label":"Lower", "x":5, "y":3.7},
- {"label":"Enter", "x":6, "y":3.2, "h":1.5},
+ {"matrix": [3, 2], "x": 3, "y": 3.7},
+ {"matrix": [3, 3], "x": 4, "y": 3.7},
+ {"matrix": [3, 4], "x": 5, "y": 3.7},
+ {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
- {"label":"Backspace", "x":8, "y":3.2, "h":1.5},
- {"label":"Space", "x":9, "y":3.7},
- {"label":"Raise", "x":10, "y":3.7},
- {"label":"RGUI", "x":11, "y":3.7}
+ {"matrix": [3, 6], "x": 8, "y": 3.2, "h": 1.5},
+ {"matrix": [3, 7], "x": 9, "y": 3.7},
+ {"matrix": [3, 8], "x": 10, "y": 3.7},
+ {"matrix": [3, 9], "x": 11, "y": 3.7}
]
}
}
diff --git a/keyboards/yanghu/unicorne/unicorne.h b/keyboards/yanghu/unicorne/unicorne.h
index f0b5685f1d8..6f89e393a74 100644
--- a/keyboards/yanghu/unicorne/unicorne.h
+++ b/keyboards/yanghu/unicorne/unicorne.h
@@ -23,28 +23,3 @@ void oled_render_capslock(bool caps_on);
void oled_render_mods(void);
void oled_render_keylog(void);
#endif
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// clang-format off
-#define LAYOUT_split_3x6_4( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K33, K34, K35, K36, K37 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { KC_NO, KC_NO, K30, K31, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO} \
-}
-// clang-format on
-
-#define LAYOUT LAYOUT_split_3x6_4
diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json
index d32b1490d11..ebd425050b9 100644
--- a/keyboards/yoichiro/lunakey_mini/info.json
+++ b/keyboards/yoichiro/lunakey_mini/info.json
@@ -21,50 +21,58 @@
"layouts": {
"LAYOUT_split_3x6_4": {
"layout": [
- {"label":"L00", "x":0, "y":1.5},
- {"label":"L01", "x":1, "y":1.25},
- {"label":"L02", "x":2, "y":0.5},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0.25},
- {"label":"L05", "x":5, "y":0.5},
- {"label":"R00", "x":8.75, "y":0.5},
- {"label":"R01", "x":9.75, "y":0.25},
- {"label":"R02", "x":10.75, "y":0},
- {"label":"R03", "x":11.75, "y":0.5},
- {"label":"R04", "x":12.75, "y":1.25},
- {"label":"R05", "x":13.75, "y":1.5},
- {"label":"L10", "x":0, "y":2.5},
- {"label":"L11", "x":1, "y":2.25},
- {"label":"L12", "x":2, "y":1.5},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1.25},
- {"label":"L15", "x":5, "y":1.5},
- {"label":"R10", "x":8.75, "y":1.5},
- {"label":"R11", "x":9.75, "y":1.25},
- {"label":"R12", "x":10.75, "y":1},
- {"label":"R13", "x":11.75, "y":1.5},
- {"label":"R14", "x":12.75, "y":2.25},
- {"label":"R15", "x":13.75, "y":2.5},
- {"label":"L20", "x":0, "y":3.5},
- {"label":"L21", "x":1, "y":3.25},
- {"label":"L22", "x":2, "y":2.5},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2.25},
- {"label":"L25", "x":5, "y":2.5},
- {"label":"R20", "x":8.75, "y":2.5},
- {"label":"R21", "x":9.75, "y":2.25},
- {"label":"R22", "x":10.75, "y":2},
- {"label":"R23", "x":11.75, "y":2.5},
- {"label":"R24", "x":12.75, "y":3.25},
- {"label":"R25", "x":13.75, "y":3.5},
- {"label":"L30", "x":3, "y":4},
- {"label":"L31", "x":4, "y":3.75},
- {"label":"L32", "x":5, "y":3.75},
- {"label":"L33", "x":6, "y":4},
- {"label":"R30", "x":7.75, "y":4},
- {"label":"R31", "x":8.75, "y":3.75},
- {"label":"R32", "x":9.75, "y":3.75},
- {"label":"R33", "x":10.75, "y":4}]
+ {"matrix": [0, 0], "x": 0, "y": 1.5},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+ {"matrix": [4, 5], "x": 8.75, "y": 0.5},
+ {"matrix": [4, 4], "x": 9.75, "y": 0.25},
+ {"matrix": [4, 3], "x": 10.75, "y": 0},
+ {"matrix": [4, 2], "x": 11.75, "y": 0.5},
+ {"matrix": [4, 1], "x": 12.75, "y": 1.25},
+ {"matrix": [4, 0], "x": 13.75, "y": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.5},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+ {"matrix": [5, 5], "x": 8.75, "y": 1.5},
+ {"matrix": [5, 4], "x": 9.75, "y": 1.25},
+ {"matrix": [5, 3], "x": 10.75, "y": 1},
+ {"matrix": [5, 2], "x": 11.75, "y": 1.5},
+ {"matrix": [5, 1], "x": 12.75, "y": 2.25},
+ {"matrix": [5, 0], "x": 13.75, "y": 2.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.5},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+ {"matrix": [6, 5], "x": 8.75, "y": 2.5},
+ {"matrix": [6, 4], "x": 9.75, "y": 2.25},
+ {"matrix": [6, 3], "x": 10.75, "y": 2},
+ {"matrix": [6, 2], "x": 11.75, "y": 2.5},
+ {"matrix": [6, 1], "x": 12.75, "y": 3.25},
+ {"matrix": [6, 0], "x": 13.75, "y": 3.5},
+
+ {"matrix": [3, 2], "x": 3, "y": 4},
+ {"matrix": [3, 3], "x": 4, "y": 3.75},
+ {"matrix": [3, 4], "x": 5, "y": 3.75},
+ {"matrix": [3, 5], "x": 6, "y": 4},
+
+ {"matrix": [7, 5], "x": 7.75, "y": 4},
+ {"matrix": [7, 4], "x": 8.75, "y": 3.75},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.75},
+ {"matrix": [7, 2], "x": 10.75, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h b/keyboards/yoichiro/lunakey_mini/lunakey_mini.h
deleted file mode 100644
index bb649cc0185..00000000000
--- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h
+++ /dev/null
@@ -1,44 +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_split_3x6_4( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, R30, R31, R32, R33 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, L30, L31, L32, L33 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, R33, R32, R31, R30 } \
- }
diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json
index 3253eb7edc3..e98e38a3351 100644
--- a/keyboards/yoichiro/lunakey_pico/info.json
+++ b/keyboards/yoichiro/lunakey_pico/info.json
@@ -59,50 +59,58 @@
"layouts": {
"LAYOUT_split_3x6_4": {
"layout": [
- {"label":"L00", "x":0, "y":1.5},
- {"label":"L01", "x":1, "y":1.25},
- {"label":"L02", "x":2, "y":0.5},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0.25},
- {"label":"L05", "x":5, "y":0.5},
- {"label":"R00", "x":8.75, "y":0.5},
- {"label":"R01", "x":9.75, "y":0.25},
- {"label":"R02", "x":10.75, "y":0},
- {"label":"R03", "x":11.75, "y":0.5},
- {"label":"R04", "x":12.75, "y":1.25},
- {"label":"R05", "x":13.75, "y":1.5},
- {"label":"L10", "x":0, "y":2.5},
- {"label":"L11", "x":1, "y":2.25},
- {"label":"L12", "x":2, "y":1.5},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1.25},
- {"label":"L15", "x":5, "y":1.5},
- {"label":"R10", "x":8.75, "y":1.5},
- {"label":"R11", "x":9.75, "y":1.25},
- {"label":"R12", "x":10.75, "y":1},
- {"label":"R13", "x":11.75, "y":1.5},
- {"label":"R14", "x":12.75, "y":2.25},
- {"label":"R15", "x":13.75, "y":2.5},
- {"label":"L20", "x":0, "y":3.5},
- {"label":"L21", "x":1, "y":3.25},
- {"label":"L22", "x":2, "y":2.5},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2.25},
- {"label":"L25", "x":5, "y":2.5},
- {"label":"R20", "x":8.75, "y":2.5},
- {"label":"R21", "x":9.75, "y":2.25},
- {"label":"R22", "x":10.75, "y":2},
- {"label":"R23", "x":11.75, "y":2.5},
- {"label":"R24", "x":12.75, "y":3.25},
- {"label":"R25", "x":13.75, "y":3.5},
- {"label":"L30", "x":3, "y":4},
- {"label":"L31", "x":4, "y":3.75},
- {"label":"L32", "x":5, "y":3.75},
- {"label":"L33", "x":6, "y":4},
- {"label":"R30", "x":7.75, "y":4},
- {"label":"R31", "x":8.75, "y":3.75},
- {"label":"R32", "x":9.75, "y":3.75},
- {"label":"R33", "x":10.75, "y":4}]
+ {"matrix": [0, 0], "x": 0, "y": 1.5},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+ {"matrix": [4, 5], "x": 8.75, "y": 0.5},
+ {"matrix": [4, 4], "x": 9.75, "y": 0.25},
+ {"matrix": [4, 3], "x": 10.75, "y": 0},
+ {"matrix": [4, 2], "x": 11.75, "y": 0.5},
+ {"matrix": [4, 1], "x": 12.75, "y": 1.25},
+ {"matrix": [4, 0], "x": 13.75, "y": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.5},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+ {"matrix": [5, 5], "x": 8.75, "y": 1.5},
+ {"matrix": [5, 4], "x": 9.75, "y": 1.25},
+ {"matrix": [5, 3], "x": 10.75, "y": 1},
+ {"matrix": [5, 2], "x": 11.75, "y": 1.5},
+ {"matrix": [5, 1], "x": 12.75, "y": 2.25},
+ {"matrix": [5, 0], "x": 13.75, "y": 2.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.5},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+ {"matrix": [6, 5], "x": 8.75, "y": 2.5},
+ {"matrix": [6, 4], "x": 9.75, "y": 2.25},
+ {"matrix": [6, 3], "x": 10.75, "y": 2},
+ {"matrix": [6, 2], "x": 11.75, "y": 2.5},
+ {"matrix": [6, 1], "x": 12.75, "y": 3.25},
+ {"matrix": [6, 0], "x": 13.75, "y": 3.5},
+
+ {"matrix": [3, 2], "x": 3, "y": 4},
+ {"matrix": [3, 3], "x": 4, "y": 3.75},
+ {"matrix": [3, 4], "x": 5, "y": 3.75},
+ {"matrix": [3, 5], "x": 6, "y": 4},
+
+ {"matrix": [7, 5], "x": 7.75, "y": 4},
+ {"matrix": [7, 4], "x": 8.75, "y": 3.75},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.75},
+ {"matrix": [7, 2], "x": 10.75, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h b/keyboards/yoichiro/lunakey_pico/lunakey_pico.h
deleted file mode 100644
index 0725054f0f6..00000000000
--- a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2022 Yoichiro Tanaka (@yoichiro)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_split_3x6_4( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, R30, R31, R32, R33 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, L30, L31, L32, L33 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, R33, R32, R31, R30 } \
- }