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

This commit is contained in:
QMK Bot 2021-08-16 20:16:47 +00:00
commit 3867c70859
2 changed files with 67 additions and 8 deletions

View file

@ -1,12 +1,71 @@
{
"keyboard_name": "Chocolate Bar",
"url": "https://github.com/misonoworks/chocolate-bar",
"maintainer": "Robin Bayardo",
"width": 16,
"height": 4.25,
"keyboard_name": "Chocolate Bar",
"url": "https://github.com/misonoworks/chocolate-bar",
"maintainer": "Robin Bayardo",
"width": 16,
"height": 4.25,
"layouts": {
"LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":"Enter", "x":10.5, "y":1, "w":1.5}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"Shift", "x":0, "y":2, "w":2}, {"label":"Z", "x":2, "y":2}, {"label":"X", "x":3, "y":2}, {"label":"C", "x":4, "y":2}, {"label":"V", "x":5, "y":2}, {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":", <", "x":9, "y":2}, {"label":"Shift", "x":10, "y":2, "w":1.5}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"Up", "x":11.75, "y":2.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.5}, {"label":"Alt", "x":1.5, "y":3, "w":1.5}, {"label":"Meta", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"label":"Super", "x":8, "y":3}, {"label":"Ctrl", "x":9, "y":3, "w":1.5}, {"label":"0", "x":14, "y":3}, {"label":"Calc", "x":15, "y":3}, {"label":"Left", "x":10.75, "y":3.25}, {"label":"Down", "x":11.75, "y":3.25}, {"label":"Right", "x":12.75, "y":3.25}]
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"Q", "x":1, "y":0},
{"label":"W", "x":2, "y":0},
{"label":"E", "x":3, "y":0},
{"label":"R", "x":4, "y":0},
{"label":"T", "x":5, "y":0},
{"label":"Y", "x":6, "y":0},
{"label":"U", "x":7, "y":0},
{"label":"I", "x":8, "y":0},
{"label":"O", "x":9, "y":0},
{"label":"P", "x":10, "y":0},
{"label":"Back Space", "x":11, "y":0},
{"label":"7", "x":13, "y":0},
{"label":"8", "x":14, "y":0},
{"label":"9", "x":15, "y":0},
{"label":"Tab", "x":0, "y":1, "w":1.5},
{"label":"A", "x":1.5, "y":1},
{"label":"S", "x":2.5, "y":1},
{"label":"D", "x":3.5, "y":1},
{"label":"F", "x":4.5, "y":1},
{"label":"G", "x":5.5, "y":1},
{"label":"H", "x":6.5, "y":1},
{"label":"J", "x":7.5, "y":1},
{"label":"K", "x":8.5, "y":1},
{"label":"L", "x":9.5, "y":1},
{"label":"Enter", "x":10.5, "y":1, "w":1.5},
{"label":"4", "x":13, "y":1},
{"label":"5", "x":14, "y":1},
{"label":"6", "x":15, "y":1},
{"label":"Shift", "x":0, "y":2, "w":2},
{"label":"Z", "x":2, "y":2},
{"label":"X", "x":3, "y":2},
{"label":"C", "x":4, "y":2},
{"label":"V", "x":5, "y":2},
{"label":"B", "x":6, "y":2},
{"label":"N", "x":7, "y":2},
{"label":"M", "x":8, "y":2},
{"label":", <", "x":9, "y":2},
{"label":"Shift", "x":10, "y":2, "w":1.5},
{"label":"Up", "x":11.75, "y":2.25},
{"label":"1", "x":13, "y":2},
{"label":"2", "x":14, "y":2},
{"label":"3", "x":15, "y":2},
{"label":"Ctrl", "x":0, "y":3, "w":1.5},
{"label":"Alt", "x":1.5, "y":3, "w":1.5},
{"label":"Meta", "x":3, "y":3},
{"x":4, "y":3, "w":2},
{"x":6, "y":3, "w":2},
{"label":"Super", "x":8, "y":3},
{"label":"Ctrl", "x":9, "y":3, "w":1.5},
{"label":"Left", "x":10.75, "y":3.25},
{"label":"Down", "x":11.75, "y":3.25},
{"label":"Right", "x":12.75, "y":3.25},
{"label":"0", "x":14, "y":3},
{"label":"Calc", "x":15, "y":3}
]
}
}
}
}

View file

@ -5,7 +5,7 @@
An 1800-Style 40% Choc Keyboard
* Keyboard Maintainer: [MisonoWorks](https://github.com/autumnisacutie/)
* Keyboard Maintainer: [MisonoWorks](https://github.com/misonoworks/)
* Hardware Supported: Chocolate Bar PCB
* Hardware Availability: [MKUltra.click](https://mkultra.click/)