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

This commit is contained in:
QMK Bot 2021-07-21 17:14:33 +00:00
commit d2cdb0b1d3

View File

@ -149,9 +149,9 @@
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e |68 |69 |6a |6b |
*
* 10 11 12 13 14 15 16 17 18 19 1a 1b 1c |58 |59 |5a |5b |
* 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 2d |58 |59 |5a |5b |
* | |
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c |2d |5c |5d |5e | |
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c | |5c |5d |5e | |
*
* 30 |31 32 33 34 35 36 37 38 39 3a 3b 3c |3d |48 |49 |4a |4b |
* |
@ -160,13 +160,13 @@
*/
#define LAYOUT_all_iso_6_25( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k68, k69, k6a, k6b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k58, k59, k5a, k5b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k5c, k5d, k5e, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2d, k58, k59, k5a, k5b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k5c, k5d, k5e, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k48, k49, k4a, k4b, \
k40, k41, k42, k43, k44, k45, k46, k47, k4c, k4d \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \
@ -178,9 +178,9 @@
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d |0e |68 |69 |6a |6b |
*
* 10 11 12 13 14 15 16 17 18 19 1a 1b 1c |58 |59 |5a |5b |
* 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 2d |58 |59 |5a |5b |
* | |
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c |2d |5c |5d |5e | |
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c | |5c |5d |5e | |
*
* 30 |31 32 33 34 35 36 37 38 39 3a 3b 3c |3d |48 |49 |4a |4b |
* |
@ -189,13 +189,13 @@
*/
#define LAYOUT_all_iso_7( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k68, k69, k6a, k6b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k58, k59, k5a, k5b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k5c, k5d, k5e, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2d, k58, k59, k5a, k5b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k5c, k5d, k5e, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k48, k49, k4a, k4b, \
k40, k41, k42, k43, k45, k46, k47, k4c, k4d \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \
{ k40, k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \