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/rev2/info.json
View File

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

2
keyboards/jian/rev2/rev2.c
View File

@@ -1,4 +1,4 @@
#include "rev2.h"
#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))

58
keyboards/jian/rev2/rev2.h
View File

@@ -1,58 +0,0 @@
#pragma once
#include "quantum.h"
#define XXX KC_NO
#define LAYOUT( \
L20, L00, L01, L12, L02, L03, L04, R04, R03, R02, R12, R01, R00, R20, \
L10, L11, L22, L13, L14, L05, R05, R14, R13, R22, R11, R10, \
L21, L32, L33, L23, L24, L15, R15, R24, R23, R33, R32, R21, \
L34, L25, L35, R35, R25, R34 \
) \
{ \
{L00, L01, L02, L03, L04, L05 }, \
{L10, L11, L12, L13, L14, L15 }, \
{L20, L21, L22, L23, L24, L25 }, \
{XXX, XXX, L32, L33, L34, L35 }, \
{R00, R01, R02, R03, R04, R05 }, \
{R10, R11, R12, R13, R14, R15 }, \
{R20, R21, R22, R23, R24, R25 }, \
{XXX, XXX, R32, R33, R34, R35 } \
}
#define LAYOUT_symmetric( \
K20, K00, K01, K12, K02, K03, K04, \
K10, K11, K22, K13, K14, K05, \
K21, K32, K33, K23, K24, K15, \
K34, K25, K35 \
) \
{ \
{K00, K01, K02, K03, K04, K05 }, \
{K10, K11, K12, K13, K14, K15 }, \
{K20, K21, K22, K23, K24, K25 }, \
{XXX, XXX, K32, K33, K34, K35 }, \
{K00, K01, K02, K03, K04, K05 }, \
{K10, K11, K12, K13, K14, K15 }, \
{K20, K21, K22, K23, K24, K25 }, \
{XXX, XXX, K32, K33, K34, K35 } \
}
#define LAYOUT_symmetric_left LAYOUT_symmetric
#define LAYOUT_symmetric_right( \
K04, K03, K02, K12, K01, K00, K20, \
K05, K14, K13, K22, K11, K10, \
K15, K24, K23, K33, K32, K21, \
K35, K25, K34 \
) \
{ \
{K00, K01, K02, K03, K04, K05 }, \
{K10, K11, K12, K13, K14, K15 }, \
{K20, K21, K22, K23, K24, K25 }, \
{XXX, XXX, K32, K33, K34, K35 }, \
{K00, K01, K02, K03, K04, K05 }, \
{K10, K11, K12, K13, K14, K15 }, \
{K20, K21, K22, K23, K24, K25 }, \
{XXX, XXX, K32, K33, K34, K35 } \
}