diff options
author | QMK Bot <hello@qmk.fm> | 2021-11-13 20:22:39 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-11-13 20:22:39 +0000 |
commit | f7536f3adfa10d2d5a8eaf89004de00a6ad46581 (patch) | |
tree | df49fcd7ca71d90e64d634e87e9c7887da628c2e /keyboards/kb_elmo | |
parent | 04b51e381e2ff3f4c7aba662e1c817ce5daa931d (diff) | |
parent | b785305080fe6454d1a5c8a818c538d9e693090f (diff) | |
download | qmk_firmware-f7536f3adfa10d2d5a8eaf89004de00a6ad46581.tar.gz qmk_firmware-f7536f3adfa10d2d5a8eaf89004de00a6ad46581.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/kb_elmo')
-rw-r--r-- | keyboards/kb_elmo/elmopad/info.json | 2 | ||||
-rw-r--r-- | keyboards/kb_elmo/m0110a_usb/info.json | 160 |
2 files changed, 83 insertions, 79 deletions
diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json index 51709229b..6193342c6 100644 --- a/keyboards/kb_elmo/elmopad/info.json +++ b/keyboards/kb_elmo/elmopad/info.json | |||
@@ -3,7 +3,7 @@ | |||
3 | "url": "https://github.com/kb-elmo/numpad", | 3 | "url": "https://github.com/kb-elmo/numpad", |
4 | "maintainer": "kb-elmo", | 4 | "maintainer": "kb-elmo", |
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT": { | 6 | "LAYOUT_numpad_6x4": { |
7 | "layout": [ | 7 | "layout": [ |
8 | {"x":0, "y":0}, | 8 | {"x":0, "y":0}, |
9 | {"x":1, "y":0}, | 9 | {"x":1, "y":0}, |
diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json index 18b75ad7e..1970c4960 100644 --- a/keyboards/kb_elmo/m0110a_usb/info.json +++ b/keyboards/kb_elmo/m0110a_usb/info.json | |||
@@ -5,84 +5,88 @@ | |||
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT": { | 6 | "LAYOUT": { |
7 | "layout": [ | 7 | "layout": [ |
8 | {"x":0, "y":0}, | 8 | {"label":"Esc", "x":0, "y":0}, |
9 | {"x":1, "y":0}, | 9 | {"label":"1!", "x":1, "y":0}, |
10 | {"x":2, "y":0}, | 10 | {"label":"2@", "x":2, "y":0}, |
11 | {"x":3, "y":0}, | 11 | {"label":"3#", "x":3, "y":0}, |
12 | {"x":4, "y":0}, | 12 | {"label":"4$", "x":4, "y":0}, |
13 | {"x":5, "y":0}, | 13 | {"label":"5%", "x":5, "y":0}, |
14 | {"x":6, "y":0}, | 14 | {"label":"6^", "x":6, "y":0}, |
15 | {"x":7, "y":0}, | 15 | {"label":"7&", "x":7, "y":0}, |
16 | {"x":8, "y":0}, | 16 | {"label":"8*", "x":8, "y":0}, |
17 | {"x":9, "y":0}, | 17 | {"label":"9(", "x":9, "y":0}, |
18 | {"x":10, "y":0}, | 18 | {"label":"0)", "x":10, "y":0}, |
19 | {"x":11, "y":0}, | 19 | {"label":"-_", "x":11, "y":0}, |
20 | {"x":12, "y":0}, | 20 | {"label":"=+", "x":12, "y":0}, |
21 | {"x":13, "y":0, "w":1.5}, | 21 | {"label":"Backspace", "x":13, "y":0, "w":1.5}, |
22 | {"x":15.25, "y":0}, | 22 | {"label":"Delete", "x":15.25, "y":0}, |
23 | {"x":16.25, "y":0}, | 23 | {"label":"=+", "x":16.25, "y":0}, |
24 | {"x":17.25, "y":0}, | 24 | {"label":"/", "x":17.25, "y":0}, |
25 | {"x":18.25, "y":0}, | 25 | {"label":"*", "x":18.25, "y":0}, |
26 | {"x":0, "y":1, "w":1.5}, | 26 | |
27 | {"x":1.5, "y":1}, | 27 | {"label":"Tab", "x":0, "y":1, "w":1.5}, |
28 | {"x":2.5, "y":1}, | 28 | {"label":"Q", "x":1.5, "y":1}, |
29 | {"x":3.5, "y":1}, | 29 | {"label":"W", "x":2.5, "y":1}, |
30 | {"x":4.5, "y":1}, | 30 | {"label":"E", "x":3.5, "y":1}, |
31 | {"x":5.5, "y":1}, | 31 | {"label":"R", "x":4.5, "y":1}, |
32 | {"x":6.5, "y":1}, | 32 | {"label":"T", "x":5.5, "y":1}, |
33 | {"x":7.5, "y":1}, | 33 | {"label":"Y", "x":6.5, "y":1}, |
34 | {"x":8.5, "y":1}, | 34 | {"label":"U", "x":7.5, "y":1}, |
35 | {"x":9.5, "y":1}, | 35 | {"label":"I", "x":8.5, "y":1}, |
36 | {"x":10.5, "y":1}, | 36 | {"label":"O", "x":9.5, "y":1}, |
37 | {"x":11.5, "y":1}, | 37 | {"label":"P", "x":10.5, "y":1}, |
38 | {"x":12.5, "y":1}, | 38 | {"label":"[{", "x":11.5, "y":1}, |
39 | {"x":15.25, "y":1}, | 39 | {"label":"]}", "x":12.5, "y":1}, |
40 | {"x":16.25, "y":1}, | 40 | {"label":"7", "x":15.25, "y":1}, |
41 | {"x":17.25, "y":1}, | 41 | {"label":"8", "x":16.25, "y":1}, |
42 | {"x":18.25, "y":1}, | 42 | {"label":"9", "x":17.25, "y":1}, |
43 | {"x":0, "y":2, "w":1.75}, | 43 | {"label":"-", "x":18.25, "y":1}, |
44 | {"x":1.75, "y":2}, | 44 | |
45 | {"x":2.75, "y":2}, | 45 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, |
46 | {"x":3.75, "y":2}, | 46 | {"label":"A", "x":1.75, "y":2}, |
47 | {"x":4.75, "y":2}, | 47 | {"label":"S", "x":2.75, "y":2}, |
48 | {"x":5.75, "y":2}, | 48 | {"label":"D", "x":3.75, "y":2}, |
49 | {"x":6.75, "y":2}, | 49 | {"label":"F", "x":4.75, "y":2}, |
50 | {"x":7.75, "y":2}, | 50 | {"label":"G", "x":5.75, "y":2}, |
51 | {"x":8.75, "y":2}, | 51 | {"label":"H", "x":6.75, "y":2}, |
52 | {"x":9.75, "y":2}, | 52 | {"label":"J", "x":7.75, "y":2}, |
53 | {"x":10.75, "y":2}, | 53 | {"label":"K", "x":8.75, "y":2}, |
54 | {"x":11.75, "y":2}, | 54 | {"label":"L", "x":9.75, "y":2}, |
55 | {"x":13.5, "y":1, "h":2}, | 55 | {"label":";:", "x":10.75, "y":2}, |
56 | {"x":15.25, "y":2}, | 56 | {"label":"'\"", "x":11.75, "y":2}, |
57 | {"x":16.25, "y":2}, | 57 | {"label":"Enter", "x":13.5, "y":1, "h":2}, |
58 | {"x":17.25, "y":2}, | 58 | {"label":"4", "x":15.25, "y":2}, |
59 | {"x":18.25, "y":2}, | 59 | {"label":"5", "x":16.25, "y":2}, |
60 | {"x":0, "y":3, "w":2.25}, | 60 | {"label":"6", "x":17.25, "y":2}, |
61 | {"x":2.25, "y":3}, | 61 | {"label":"+", "x":18.25, "y":2}, |
62 | {"x":3.25, "y":3}, | 62 | |
63 | {"x":4.25, "y":3}, | 63 | {"label":"Shift", "x":0, "y":3, "w":2.25}, |
64 | {"x":5.25, "y":3}, | 64 | {"label":"Z", "x":2.25, "y":3}, |
65 | {"x":6.25, "y":3}, | 65 | {"label":"X", "x":3.25, "y":3}, |
66 | {"x":7.25, "y":3}, | 66 | {"label":"C", "x":4.25, "y":3}, |
67 | {"x":8.25, "y":3}, | 67 | {"label":"V", "x":5.25, "y":3}, |
68 | {"x":9.25, "y":3}, | 68 | {"label":"B", "x":6.25, "y":3}, |
69 | {"x":10.25, "y":3}, | 69 | {"label":"N", "x":7.25, "y":3}, |
70 | {"x":11.25, "y":3}, | 70 | {"label":"M", "x":8.25, "y":3}, |
71 | {"x":12.25, "y":3, "w":1.25}, | 71 | {"label":",<", "x":9.25, "y":3}, |
72 | {"x":13.5, "y":3}, | 72 | {"label":".>", "x":10.25, "y":3}, |
73 | {"x":15.25, "y":3}, | 73 | {"label":"/?", "x":11.25, "y":3}, |
74 | {"x":16.25, "y":3}, | 74 | {"label":"MO(1)", "x":12.25, "y":3, "w":1.25}, |
75 | {"x":17.25, "y":3}, | 75 | {"label":"Up", "x":13.5, "y":3}, |
76 | {"x":18.25, "y":3, "h":2}, | 76 | {"label":"1", "x":15.25, "y":3}, |
77 | {"x":0, "y":4, "w":1.5}, | 77 | {"label":"2", "x":16.25, "y":3}, |
78 | {"x":1.5, "y":4, "w":2}, | 78 | {"label":"3", "x":17.25, "y":3}, |
79 | {"x":3.5, "y":4, "w":7}, | 79 | |
80 | {"x":10.5, "y":4}, | 80 | {"label":"Ctrl", "x":0, "y":4, "w":1.5}, |
81 | {"x":11.5, "y":4}, | 81 | {"label":"GUI", "x":1.5, "y":4, "w":2}, |
82 | {"x":12.5, "y":4}, | 82 | {"label":"Space", "x":3.5, "y":4, "w":7}, |
83 | {"x":13.5, "y":4}, | 83 | {"label":"\\|", "x":10.5, "y":4}, |
84 | {"x":15.25, "y":4, "w":2}, | 84 | {"label":"Left", "x":11.5, "y":4}, |
85 | {"x":17.25, "y":4} | 85 | {"label":"Right", "x":12.5, "y":4}, |
86 | {"label":"Down", "x":13.5, "y":4}, | ||
87 | {"label":"0", "x":15.25, "y":4, "w":2}, | ||
88 | {"label":".", "x":17.25, "y":4}, | ||
89 | {"label":"Enter", "x":18.25, "y":3, "h":2} | ||
86 | ] | 90 | ] |
87 | } | 91 | } |
88 | } | 92 | } |