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

This commit is contained in:
QMK Bot 2022-05-13 16:36:10 +00:00
commit 6f1097225f

View file

@ -18,10 +18,10 @@
{"label":"F10", "x":10.75, "y":0},
{"label":"F11", "x":11.75, "y":0},
{"label":"F12", "x":12.75, "y":0},
{"label":"Pause", "x":14, "y":0},
{"label":"Encoder CCW", "x":15.25, "y":0, "w":0.5, "h":0.5},
{"label":"Encoder CW", "x":15.75, "y":0, "w":0.5, "h":0.5},
{"label":"Delete", "x":15.25, "y":0.5, "h":0.5},
{"label":"Delete", "x":14, "y":0},
{"label":"Encoder CCW", "x":15, "y":0, "w":0.5},
{"label":"Mute", "x":15.5, "y":0},
{"label":"Encoder CW", "x":16.5, "y":0, "w":0.5},
{"label":"`~", "x":0, "y":1.25},
{"label":"1!", "x":1, "y":1.25},
@ -53,7 +53,7 @@
{"label":"[{", "x":11.5, "y":2.25},
{"label":"]}", "x":12.5, "y":2.25},
{"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
{"label":"PgUp", "x":12.5, "y":2.25},
{"label":"PgUp", "x":15.25, "y":2.25},
{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
{"label":"A", "x":1.75, "y":3.25},
@ -68,7 +68,7 @@
{"label":";:", "x":10.75, "y":3.25},
{"label":"'\"", "x":11.75, "y":3.25},
{"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
{"label":"PgDn", "x":12.5, "y":3.25},
{"label":"PgDn", "x":15.25, "y":3.25},
{"label":"Shift", "x":0, "y":4.25, "w":2.25},
{"label":"Z", "x":2.25, "y":4.25},