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

master
QMK Bot 2021-03-24 04:25:05 +00:00
commit bbc48b0ef5
1 changed files with 70 additions and 69 deletions

View File

@ -3,7 +3,7 @@
"url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
"maintainer": "GloriousThrall",
"width": 16.5,
"height": 6.75,
"height": 6.5,
"layouts": {
"LAYOUT": {
"layout": [
@ -25,85 +25,86 @@
{"x":12.75, "y":0},
{"x":14, "y":0},
{"x":15.5, "y":0},
{"x":0, "y":1.5},
{"x":1, "y":1.5},
{"x":2, "y":1.5},
{"x":3, "y":1.5},
{"x":4, "y":1.5},
{"x":5, "y":1.5},
{"x":6, "y":1.5},
{"x":7, "y":1.5},
{"x":8, "y":1.5},
{"x":9, "y":1.5},
{"x":10, "y":1.5},
{"x":11, "y":1.5},
{"x":12, "y":1.5},
{"x":13, "y":1.5, "w":2},
{"x":0, "y":1.25},
{"x":1, "y":1.25},
{"x":2, "y":1.25},
{"x":3, "y":1.25},
{"x":4, "y":1.25},
{"x":5, "y":1.25},
{"x":6, "y":1.25},
{"x":7, "y":1.25},
{"x":8, "y":1.25},
{"x":9, "y":1.25},
{"x":10, "y":1.25},
{"x":11, "y":1.25},
{"x":12, "y":1.25},
{"x":13, "y":1.25, "w":2},
{"x":15.5, "y":1.5},
{"x":15.5, "y":1.25},
{"x":0, "y":2.5, "w":1.5},
{"x":1.5, "y":2.5},
{"x":2.5, "y":2.5},
{"x":3.5, "y":2.5},
{"x":4.5, "y":2.5},
{"x":5.5, "y":2.5},
{"x":6.5, "y":2.5},
{"x":7.5, "y":2.5},
{"x":8.5, "y":2.5},
{"x":9.5, "y":2.5},
{"x":10.5, "y":2.5},
{"x":11.5, "y":2.5},
{"x":12.5, "y":2.5},
{"x":13.5, "y":2.5, "w":1.5},
{"x":0, "y":2.25, "w":1.5},
{"x":1.5, "y":2.25},
{"x":2.5, "y":2.25},
{"x":3.5, "y":2.25},
{"x":4.5, "y":2.25},
{"x":5.5, "y":2.25},
{"x":6.5, "y":2.25},
{"x":7.5, "y":2.25},
{"x":8.5, "y":2.25},
{"x":9.5, "y":2.25},
{"x":10.5, "y":2.25},
{"x":11.5, "y":2.25},
{"x":12.5, "y":2.25},
{"x":13.5, "y":2.25, "w":1.5},
{"x":15.5, "y":2.5},
{"x":15.5, "y":2.25},
{"x":0, "y":3.5, "w":1.75},
{"x":1.75, "y":3.5},
{"x":2.75, "y":3.5},
{"x":3.75, "y":3.5},
{"x":4.75, "y":3.5},
{"x":5.75, "y":3.5},
{"x":6.75, "y":3.5},
{"x":7.75, "y":3.5},
{"x":8.75, "y":3.5},
{"x":9.75, "y":3.5},
{"x":10.75, "y":3.5},
{"x":11.75, "y":3.5},
{"x":12.75, "y":3.5, "w":2.25},
{"x":0, "y":3.25, "w":1.75},
{"x":1.75, "y":3.25},
{"x":2.75, "y":3.25},
{"x":3.75, "y":3.25},
{"x":4.75, "y":3.25},
{"x":5.75, "y":3.25},
{"x":6.75, "y":3.25},
{"x":7.75, "y":3.25},
{"x":8.75, "y":3.25},
{"x":9.75, "y":3.25},
{"x":10.75, "y":3.25},
{"x":11.75, "y":3.25},
{"x":12.75, "y":3.25, "w":2.25},
{"x":15.5, "y":3.5},
{"x":15.5, "y":3.25},
{"x":0, "y":4.5, "w":2.25},
{"x":2.25, "y":4.5},
{"x":3.25, "y":4.5},
{"x":4.25, "y":4.5},
{"x":5.25, "y":4.5},
{"x":6.25, "y":4.5},
{"x":7.25, "y":4.5},
{"x":8.25, "y":4.5},
{"x":9.25, "y":4.5},
{"x":10.25, "y":4.5},
{"x":11.25, "y":4.5},
{"x":12.25, "y":4.5, "w":1.75},
{"x":0, "y":4.25, "w":2.25},
{"x":2.25, "y":4.25},
{"x":3.25, "y":4.25},
{"x":4.25, "y":4.25},
{"x":5.25, "y":4.25},
{"x":6.25, "y":4.25},
{"x":7.25, "y":4.25},
{"x":8.25, "y":4.25},
{"x":9.25, "y":4.25},
{"x":10.25, "y":4.25},
{"x":11.25, "y":4.25},
{"x":12.25, "y":4.25, "w":1.75},
{"x":14.25, "y":4.75},
{"x":14.25, "y":4.5},
{"x":15.5, "y":4.5},
{"x":15.5, "y":4.25},
{"x":0, "y":5.5, "w":1.25},
{"x":1.25, "y":5.5, "w":1.25},
{"x":2.5, "y":5.5, "w":1.25},
{"x":3.75, "y":5.5, "w":6.25},
{"x":10, "y":5.5},
{"x":11, "y":5.5},
{"x":12, "y":5.5},
{"x":0, "y":5.25, "w":1.25},
{"x":1.25, "y":5.25, "w":1.25},
{"x":2.5, "y":5.25, "w":1.25},
{"x":3.75, "y":5.25, "w":6.25},
{"x":10, "y":5.25},
{"x":11, "y":5.25},
{"x":12, "y":5.25},
{"x":13.25, "y":5.75},
{"x":14.25, "y":5.75},
{"x":15.25, "y":5.75}
{"x":13.25, "y":5.5},
{"x":14.25, "y":5.5},
{"x":15.25, "y":5.5}
]
}
}