aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-16 20:16:47 +0000
committerQMK Bot <hello@qmk.fm>2021-08-16 20:16:47 +0000
commit3867c708595023beab0654743dd309c394c7a42c (patch)
tree1c8b677232efcc241e5aa8e1ee63a87013345dd0
parentfc50b6d22ebd9fc637ddfe45e326f01e0db320f6 (diff)
parent08b2d08593caf61ad404f83f7336ef08fe0ebe08 (diff)
downloadqmk_firmware-3867c708595023beab0654743dd309c394c7a42c.tar.gz
qmk_firmware-3867c708595023beab0654743dd309c394c7a42c.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/misonoworks/chocolatebar/info.json73
-rw-r--r--keyboards/misonoworks/chocolatebar/readme.md2
2 files changed, 67 insertions, 8 deletions
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index 717e77b94..5da5a5cc2 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -1,12 +1,71 @@
1{ 1{
2 "keyboard_name": "Chocolate Bar", 2 "keyboard_name": "Chocolate Bar",
3 "url": "https://github.com/misonoworks/chocolate-bar", 3 "url": "https://github.com/misonoworks/chocolate-bar",
4 "maintainer": "Robin Bayardo", 4 "maintainer": "Robin Bayardo",
5 "width": 16, 5 "width": 16,
6 "height": 4.25, 6 "height": 4.25,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "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}] 9 "layout": [
10 {"label":"Esc", "x":0, "y":0},
11 {"label":"Q", "x":1, "y":0},
12 {"label":"W", "x":2, "y":0},
13 {"label":"E", "x":3, "y":0},
14 {"label":"R", "x":4, "y":0},
15 {"label":"T", "x":5, "y":0},
16 {"label":"Y", "x":6, "y":0},
17 {"label":"U", "x":7, "y":0},
18 {"label":"I", "x":8, "y":0},
19 {"label":"O", "x":9, "y":0},
20 {"label":"P", "x":10, "y":0},
21 {"label":"Back Space", "x":11, "y":0},
22 {"label":"7", "x":13, "y":0},
23 {"label":"8", "x":14, "y":0},
24 {"label":"9", "x":15, "y":0},
25
26 {"label":"Tab", "x":0, "y":1, "w":1.5},
27 {"label":"A", "x":1.5, "y":1},
28 {"label":"S", "x":2.5, "y":1},
29 {"label":"D", "x":3.5, "y":1},
30 {"label":"F", "x":4.5, "y":1},
31 {"label":"G", "x":5.5, "y":1},
32 {"label":"H", "x":6.5, "y":1},
33 {"label":"J", "x":7.5, "y":1},
34 {"label":"K", "x":8.5, "y":1},
35 {"label":"L", "x":9.5, "y":1},
36 {"label":"Enter", "x":10.5, "y":1, "w":1.5},
37 {"label":"4", "x":13, "y":1},
38 {"label":"5", "x":14, "y":1},
39 {"label":"6", "x":15, "y":1},
40
41 {"label":"Shift", "x":0, "y":2, "w":2},
42 {"label":"Z", "x":2, "y":2},
43 {"label":"X", "x":3, "y":2},
44 {"label":"C", "x":4, "y":2},
45 {"label":"V", "x":5, "y":2},
46 {"label":"B", "x":6, "y":2},
47 {"label":"N", "x":7, "y":2},
48 {"label":"M", "x":8, "y":2},
49 {"label":", <", "x":9, "y":2},
50 {"label":"Shift", "x":10, "y":2, "w":1.5},
51 {"label":"Up", "x":11.75, "y":2.25},
52 {"label":"1", "x":13, "y":2},
53 {"label":"2", "x":14, "y":2},
54 {"label":"3", "x":15, "y":2},
55
56 {"label":"Ctrl", "x":0, "y":3, "w":1.5},
57 {"label":"Alt", "x":1.5, "y":3, "w":1.5},
58 {"label":"Meta", "x":3, "y":3},
59 {"x":4, "y":3, "w":2},
60 {"x":6, "y":3, "w":2},
61 {"label":"Super", "x":8, "y":3},
62 {"label":"Ctrl", "x":9, "y":3, "w":1.5},
63 {"label":"Left", "x":10.75, "y":3.25},
64 {"label":"Down", "x":11.75, "y":3.25},
65 {"label":"Right", "x":12.75, "y":3.25},
66 {"label":"0", "x":14, "y":3},
67 {"label":"Calc", "x":15, "y":3}
68 ]
10 } 69 }
11 } 70 }
12} \ No newline at end of file 71}
diff --git a/keyboards/misonoworks/chocolatebar/readme.md b/keyboards/misonoworks/chocolatebar/readme.md
index 062e7c0b0..b652c0714 100644
--- a/keyboards/misonoworks/chocolatebar/readme.md
+++ b/keyboards/misonoworks/chocolatebar/readme.md
@@ -5,7 +5,7 @@
5 5
6An 1800-Style 40% Choc Keyboard 6An 1800-Style 40% Choc Keyboard
7 7
8* Keyboard Maintainer: [MisonoWorks](https://github.com/autumnisacutie/) 8* Keyboard Maintainer: [MisonoWorks](https://github.com/misonoworks/)
9* Hardware Supported: Chocolate Bar PCB 9* Hardware Supported: Chocolate Bar PCB
10* Hardware Availability: [MKUltra.click](https://mkultra.click/) 10* Hardware Availability: [MKUltra.click](https://mkultra.click/)
11 11
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 20:54:33 +0000