Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-01-01 13:43:06 +00:00
commit 7b83bb188a

View file

@ -26,19 +26,19 @@
* represents the switch matrix.
*/
#define LAYOUT_ortho_4x12( \
K00, K70, K01, K71, K02, K72, K04, K84, K05, K75, K06, K76, \
K10, K60, K11, K61, K12, K62, K14, K74, K15, K65, K16, K66, \
K20, K50, K21, K51, K22, K52, K24, K64, K25, K55, K26, K56,\
K30, K40, K31, K41, K32, K42, K34, K54, K35, K45, K36, K46\
K00, K70, K01, K71, K02, K72, K04, K74, K05, K75, K06, K76, \
K10, K60, K11, K61, K12, K62, K14, K64, K15, K65, K16, K66, \
K20, K50, K21, K51, K22, K52, K24, K54, K25, K55, K26, K56, \
K30, K40, K31, K41, K32, K42, K34, K44, K35, K45, K36, K46 \
) { \
{ K00, K01, K02, K04, K05, K06, K07}, \
{ K10, K11, K12, K14, K15, K16, K17 }, \
{ K20, K21, K22, K24, K25, K26, K27 }, \
{ K30, K31, K32, K34, K35, K36, K37 }, \
{ K40, K41, K42, K44, K45, K46, K47 }, \
{ K50, K51, K52, K54, K55, K56, K57 }, \
{ K60, K61, K62, K64, K65, K66, K67 }, \
{ K70, K71, K72, K74, K75, K76, K77 } \
{ K00, K01, K02, KC_NO, K04, K05, K06}, \
{ K10, K11, K12, KC_NO, K14, K15, K16}, \
{ K20, K21, K22, KC_NO, K24, K25, K26}, \
{ K30, K31, K32, KC_NO, K34, K35, K36}, \
{ K40, K41, K42, KC_NO, K44, K45, K46}, \
{ K50, K51, K52, KC_NO, K54, K55, K56}, \
{ K60, K61, K62, KC_NO, K64, K65, K66}, \
{ K70, K71, K72, KC_NO, K74, K75, K76} \
}
#define LAYOUT_all( \