sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layouts containing keys with multiple matrix positions (#20191)

Browse Source
This commit is contained in:
Ryan
2023-03-29 15:47:59 +11:00
committed by GitHub
parent dc2a625a34
commit 06664e8a94
43 changed files with 2144 additions and 1818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
keyboards/jian/rev1/info.json
View File

@@ -13,5 +13,62 @@
"levels": 5
},
"processor": "atmega32u4",
"bootloader": "caterina"
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 1.5},
{"matrix": [0, 1], "x": 1, "y": 0.75},
{"matrix": [0, 2], "x": 2, "y": 0.625},
{"matrix": [0, 3], "x": 3, "y": 0.25},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0.25},
{"matrix": [0, 6], "x": 6, "y": 0.375},
{"matrix": [4, 6], "x": 10, "y": 0.375},
{"matrix": [4, 5], "x": 11, "y": 0.25},
{"matrix": [4, 4], "x": 12, "y": 0},
{"matrix": [4, 3], "x": 13, "y": 0.25},
{"matrix": [4, 2], "x": 14, "y": 0.625},
{"matrix": [4, 1], "x": 15, "y": 0.75},
{"matrix": [4, 0], "x": 16, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.75},
{"matrix": [1, 2], "x": 2, "y": 1.625},
{"matrix": [1, 3], "x": 3, "y": 1.25},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1.25},
{"matrix": [1, 6], "x": 6, "y": 1.375},
{"matrix": [5, 6], "x": 10, "y": 1.375},
{"matrix": [5, 5], "x": 11, "y": 1.25},
{"matrix": [5, 4], "x": 12, "y": 1},
{"matrix": [5, 3], "x": 13, "y": 1.25},
{"matrix": [5, 2], "x": 14, "y": 1.625},
{"matrix": [5, 1], "x": 15, "y": 1.75},
{"matrix": [2, 1], "x": 1, "y": 2.75},
{"matrix": [2, 2], "x": 2, "y": 2.625},
{"matrix": [2, 3], "x": 3, "y": 2.25},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2.25},
{"matrix": [2, 6], "x": 6, "y": 2.375},
{"matrix": [6, 6], "x": 10, "y": 2.375},
{"matrix": [6, 5], "x": 11, "y": 2.25},
{"matrix": [6, 4], "x": 12, "y": 2},
{"matrix": [6, 3], "x": 13, "y": 2.25},
{"matrix": [6, 2], "x": 14, "y": 2.625},
{"matrix": [6, 1], "x": 15, "y": 2.75},
{"matrix": [3, 4], "x": 5, "y": 3.25},
{"matrix": [3, 5], "x": 6, "y": 3.375},
{"matrix": [3, 6], "x": 7, "y": 3.5},
{"matrix": [7, 6], "x": 9, "y": 3.5},
{"matrix": [7, 5], "x": 10, "y": 3.375},
{"matrix": [7, 4], "x": 11, "y": 3.25}
]
}
}
}

34
keyboards/jian/rev1/rev1.h
View File

@@ -4,40 +4,6 @@
#define XXX KC_NO
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, \
L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, \
L34, L35, L36, R36, R35, R34 \
) \
{ \
{L00, L01, L02, L03, L04, L05, L06}, \
{XXX, L11, L12, L13, L14, L15, L16}, \
{XXX, L21, L22, L23, L24, L25, L26}, \
{XXX, XXX, XXX, XXX, L34, L35, L36}, \
{R00, R01, R02, R03, R04, R05, R06}, \
{XXX, R11, R12, R13, R14, R15, R16}, \
{XXX, R21, R22, R23, R24, R25, R26}, \
{XXX, XXX, XXX, XXX, R34, R35, R36} \
}
#define LAYOUT_symmetric( \
K00, K01, K02, K03, K04, K05, K06, \
K11, K12, K13, K14, K15, K16, \
K21, K22, K23, K24, K25, K26, \
K34, K35, K36 \
) \
{ \
{K00, K01, K02, K03, K04, K05, K06}, \
{XXX, K11, K12, K13, K14, K15, K16}, \
{XXX, K21, K22, K23, K24, K25, K26}, \
{XXX, XXX, XXX, XXX, K34, K35, K36}, \
{K00, K01, K02, K03, K04, K05, K06}, \
{XXX, K11, K12, K13, K14, K15, K16}, \
{XXX, K21, K22, K23, K24, K25, K26}, \
{XXX, XXX, XXX, XXX, K34, K35, K36} \
}
#ifdef DIPS_ENABLE
#define LAYOUT_dips( \
DL0, DL1, DL2, DL3, DL4, DL5, \