mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-17 01:14:48 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
f010af0c8e
2 changed files with 27 additions and 18 deletions
|
@ -20,10 +20,10 @@
|
|||
#define ___ KC_NO
|
||||
|
||||
#define LAYOUT_euiso_mit( \
|
||||
k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
|
||||
k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
|
||||
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
|
||||
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
|
||||
k32, k33, k34, k35, k36, k37, k39, k3a, k3b, k3c, k3d \
|
||||
k32, k33, k34, k35, k36, k37, k39, k3a, k3b, k3c, k3d \
|
||||
) \
|
||||
{ \
|
||||
{ ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
|
||||
|
@ -33,10 +33,10 @@
|
|||
}
|
||||
|
||||
#define LAYOUT_euiso_ortho( \
|
||||
k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
|
||||
k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
|
||||
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
|
||||
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
|
||||
k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d \
|
||||
k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d \
|
||||
) \
|
||||
{ \
|
||||
{ ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
|
||||
|
@ -46,10 +46,10 @@
|
|||
}
|
||||
|
||||
#define LAYOUT_euiso_bigspace( \
|
||||
k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
|
||||
k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
|
||||
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
|
||||
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
|
||||
k32, k33, k37, k3c, k3d \
|
||||
k32, k33, k37, k3c, k3d \
|
||||
) \
|
||||
{ \
|
||||
{ ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
|
||||
|
|
|
@ -23,6 +23,9 @@
|
|||
{"x":11, "y":0},
|
||||
{"x":12, "y":0},
|
||||
{"x":13, "y":0},
|
||||
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
{"x":2, "y":1},
|
||||
{"x":3, "y":1},
|
||||
{"x":4, "y":1},
|
||||
|
@ -35,8 +38,9 @@
|
|||
{"x":11, "y":1},
|
||||
{"x":12, "y":1},
|
||||
{"x":13, "y":1},
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":2},
|
||||
{"x":2, "y":2},
|
||||
{"x":3, "y":2},
|
||||
{"x":4, "y":2},
|
||||
|
@ -49,8 +53,7 @@
|
|||
{"x":11, "y":2},
|
||||
{"x":12, "y":2},
|
||||
{"x":13, "y":2},
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":2},
|
||||
|
||||
{"x":2, "y":3},
|
||||
{"x":3, "y":3},
|
||||
{"x":4, "y":3},
|
||||
|
@ -80,6 +83,9 @@
|
|||
{"x":11, "y":0},
|
||||
{"x":12, "y":0},
|
||||
{"x":13, "y":0},
|
||||
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
{"x":2, "y":1},
|
||||
{"x":3, "y":1},
|
||||
{"x":4, "y":1},
|
||||
|
@ -92,8 +98,9 @@
|
|||
{"x":11, "y":1},
|
||||
{"x":12, "y":1},
|
||||
{"x":13, "y":1},
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":2},
|
||||
{"x":2, "y":2},
|
||||
{"x":3, "y":2},
|
||||
{"x":4, "y":2},
|
||||
|
@ -106,8 +113,7 @@
|
|||
{"x":11, "y":2},
|
||||
{"x":12, "y":2},
|
||||
{"x":13, "y":2},
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":2},
|
||||
|
||||
{"x":2, "y":3},
|
||||
{"x":3, "y":3},
|
||||
{"x":4, "y":3},
|
||||
|
@ -136,6 +142,9 @@
|
|||
{"x":11, "y":0},
|
||||
{"x":12, "y":0},
|
||||
{"x":13, "y":0},
|
||||
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
{"x":2, "y":1},
|
||||
{"x":3, "y":1},
|
||||
{"x":4, "y":1},
|
||||
|
@ -148,8 +157,9 @@
|
|||
{"x":11, "y":1},
|
||||
{"x":12, "y":1},
|
||||
{"x":13, "y":1},
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":2},
|
||||
{"x":2, "y":2},
|
||||
{"x":3, "y":2},
|
||||
{"x":4, "y":2},
|
||||
|
@ -162,8 +172,7 @@
|
|||
{"x":11, "y":2},
|
||||
{"x":12, "y":2},
|
||||
{"x":13, "y":2},
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":2},
|
||||
|
||||
{"x":2, "y":3, "w":1.25},
|
||||
{"x":3.25, "y":3, "w":1.25},
|
||||
{"x":4.5, "y":3, "w":7},
|
||||
|
|
Loading…
Reference in a new issue