drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Pluckey: Fix QMK Configurator Implementation (#15254)

Browse source 
* rename LAYOUT to LAYOUT_all

* pluckey.h: add matrix diagram

* pluckey.h: use XXX for KC_NO

* add LAYOUT_ergo macro with keymap

`info.json` had layout data for this macro, but the macro was not present in the source code.

* info.json: correct key sequence

Fixes incorrect key assignments in QMK Configurator.
This commit is contained in:
James Young 2021-11-23 19:02:38 +00:00 • committed by GitHub
parent e73d22d7f1
commit 8b05d30cd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 273 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

57
keyboards/pluckey/pluckey.h
View file

@ -18,6 +18,22 @@
#include "quantum.h"
#define XXX KC_NO
/*
* ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐
* ┌─────┬───┤L02│L03│L04│L05│L06│ │R00│R01│R02│R03│R04├───┬─────┐
* │L00 │L01├───┼───┼───┼───┼───┤ ┌───┐ ┌───┐ ├───┼───┼───┼───┼───┤R05│R06 │
* ├─────┼───┤L12│L13│L14│L15│L16│ │L16│ │R10│ │R10│R11│R12│R13│R14├───┼─────┤
* │L10 │L11├───┼───┼───┼───┼───┤ │ │ │ │ ├───┼───┼───┼───┼───┤R15│R16 │
* ├─────┼───┤L22│L23│L24│L25│L26│ ├───┤ ├───┤ │R20│R21│R22│R23│R24├───┼─────┤
* │L20 │L21├───┼───┼───┼───┼───┼───┐ │L36├───┐ ┌───┤R30│ ┌───┼───┼───┼───┼───┼───┤R25│R26 │
* ├─────┼───┤L32│L33│L34│L35│L36│L41│ │ │ │ │ │ │ │R45│R30│R31│R32│R33│R34├───┼─────┤
* │L30 │L31├───┼───┼───┼┬──┴──┬┴──┬┘ └──┬┘ ┌┘ └┐ └┬──┘ └┬──┴┬──┴──┬┼───┼───┼───┤R35│R36 │
* └─────┴───┤L42│L43│L44││L45 │L46│ │L46│ │R40│ │R40│R41 ││R42│R43│R44├───┴─────┘
* └───┴───┴───┘└─────┴───┘ └───┘ └───┘ └───┴─────┘└───┴───┴───┘
*/
/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
@ -26,21 +42,40 @@
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT( \
#define LAYOUT_all( \
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, l41, r45, r30, r31, r32, r33, r34, r35, r36, \
l42, l43, l44, l45, l46, r40, r41, r42, r43, r44 \
){ \
{ 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, l41, l42, l43, l44, l45, l46 }, \
{ 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, r45, r44, r43, r42, r41, r40 } \
{ 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 }, \
{ XXX, l41, l42, l43, l44, l45, l46 }, \
{ 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 }, \
{ XXX, r45, r44, r43, r42, r41, r40 } \
}
#define LAYOUT_ergo( \
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, r21, r22, r23, r24, r25, r26, \
l30, l31, l32, l33, l34, l35, l36, l41, r45, r30, r31, r32, r33, r34, r35, r36, \
l42, l43, l44, l45, l46, r40, r41, r42, r43, r44 \
){ \
{ l00, l01, l02, l03, l04, l05, l06 }, \
{ l10, l11, l12, l13, l14, l15, l16 }, \
{ l20, l21, l22, l23, l24, l25, XXX }, \
{ l30, l31, l32, l33, l34, l35, l36 }, \
{ XXX, l41, l42, l43, l44, l45, l46 }, \
{ r06, r05, r04, r03, r02, r01, r00 }, \
{ r16, r15, r14, r13, r12, r11, r10 }, \
{ r26, r25, r24, r23, r22, r21, XXX }, \
{ r36, r35, r34, r33, r32, r31, r30 }, \
{ XXX, r45, r44, r43, r42, r41, r40 } \
}