diff options
author | QMK Bot <hello@qmk.fm> | 2021-10-06 05:54:29 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-10-06 05:54:29 +0000 |
commit | a94c6fa620ce8daf6436773accec89965c675ce5 (patch) | |
tree | 99fe0d36831f0ff5e65d49dc33b94cb95a6d6f0c | |
parent | 181ba6bbbb9655647705963259c03177c8c68408 (diff) | |
parent | c33491d72b6a0da0b589c36200e983a150a0e415 (diff) | |
download | qmk_firmware-a94c6fa620ce8daf6436773accec89965c675ce5.tar.gz qmk_firmware-a94c6fa620ce8daf6436773accec89965c675ce5.zip |
Merge remote-tracking branch 'origin/master' into develop
-rwxr-xr-x | keyboards/melgeek/mach80/info.json | 350 |
1 files changed, 175 insertions, 175 deletions
diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json index e786df7c1..ea7c628c6 100755 --- a/keyboards/melgeek/mach80/info.json +++ b/keyboards/melgeek/mach80/info.json | |||
@@ -4,192 +4,192 @@ | |||
4 | "maintainer": "melgeek001365", | 4 | "maintainer": "melgeek001365", |
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT_tkl_ansi": { | 6 | "LAYOUT_tkl_ansi": { |
7 | "layout": [ | 7 | "layout": [ |
8 | {"x":0, "y":0}, | 8 | {"x": 0, "y": 0}, |
9 | {"x":2, "y":0}, | 9 | {"x": 2, "y": 0}, |
10 | {"x":3, "y":0}, | 10 | {"x": 3, "y": 0}, |
11 | {"x":4, "y":0}, | 11 | {"x": 4, "y": 0}, |
12 | {"x":5, "y":0}, | 12 | {"x": 5, "y": 0}, |
13 | {"x":6.5, "y":0}, | 13 | {"x": 6.5, "y": 0}, |
14 | {"x":7.5, "y":0}, | 14 | {"x": 7.5, "y": 0}, |
15 | {"x":8.5, "y":0}, | 15 | {"x": 8.5, "y": 0}, |
16 | {"x":9.5, "y":0}, | 16 | {"x": 9.5, "y": 0}, |
17 | {"x":11, "y":0}, | 17 | {"x": 11, "y": 0}, |
18 | {"x":12, "y":0}, | 18 | {"x": 12, "y": 0}, |
19 | {"x":13, "y":0}, | 19 | {"x": 13, "y": 0}, |
20 | {"x":14, "y":0}, | 20 | {"x": 14, "y": 0}, |
21 | {"x":15.25, "y":0}, | 21 | {"x": 15.25, "y": 0}, |
22 | {"x":16.25, "y":0}, | 22 | {"x": 16.25, "y": 0}, |
23 | {"x":17.25, "y":0}, | 23 | {"x": 17.25, "y": 0}, |
24 | 24 | ||
25 | {"x":0, "y":1}, | 25 | {"x": 0, "y": 1.5}, |
26 | {"x":1, "y":1}, | 26 | {"x": 1, "y": 1.5}, |
27 | {"x":2, "y":1}, | 27 | {"x": 2, "y": 1.5}, |
28 | {"x":3, "y":1}, | 28 | {"x": 3, "y": 1.5}, |
29 | {"x":4, "y":1}, | 29 | {"x": 4, "y": 1.5}, |
30 | {"x":5, "y":1}, | 30 | {"x": 5, "y": 1.5}, |
31 | {"x":6, "y":1}, | 31 | {"x": 6, "y": 1.5}, |
32 | {"x":7, "y":1}, | 32 | {"x": 7, "y": 1.5}, |
33 | {"x":8, "y":1}, | 33 | {"x": 8, "y": 1.5}, |
34 | {"x":9, "y":1}, | 34 | {"x": 9, "y": 1.5}, |
35 | {"x":10, "y":1}, | 35 | {"x": 10, "y": 1.5}, |
36 | {"x":11, "y":1}, | 36 | {"x": 11, "y": 1.5}, |
37 | {"x":12, "y":1}, | 37 | {"x": 12, "y": 1.5}, |
38 | {"x":13, "y":1, "w":2.0}, | 38 | {"x": 13, "y": 1.5, "w": 2.0}, |
39 | {"x":15.25, "y":1}, | 39 | {"x": 15.25, "y": 1.5}, |
40 | {"x":16.25, "y":1}, | 40 | {"x": 16.25, "y": 1.5}, |
41 | {"x":17.25, "y":1}, | 41 | {"x": 17.25, "y": 1.5}, |
42 | 42 | ||
43 | {"x":0, "y":2, "w":1.5}, | 43 | {"x": 0, "y": 2.5, "w": 1.5}, |
44 | {"x":1.5, "y":2}, | 44 | {"x": 1.5, "y": 2.5}, |
45 | {"x":2.5, "y":2}, | 45 | {"x": 2.5, "y": 2.5}, |
46 | {"x":3.5, "y":2}, | 46 | {"x": 3.5, "y": 2.5}, |
47 | {"x":4.5, "y":2}, | 47 | {"x": 4.5, "y": 2.5}, |
48 | {"x":5.5, "y":2}, | 48 | {"x": 5.5, "y": 2.5}, |
49 | {"x":6.5, "y":2}, | 49 | {"x": 6.5, "y": 2.5}, |
50 | {"x":7.5, "y":2}, | 50 | {"x": 7.5, "y": 2.5}, |
51 | {"x":8.5, "y":2}, | 51 | {"x": 8.5, "y": 2.5}, |
52 | {"x":9.5, "y":2}, | 52 | {"x": 9.5, "y": 2.5}, |
53 | {"x":10.5, "y":2}, | 53 | {"x": 10.5, "y": 2.5}, |
54 | {"x":11.5, "y":2}, | 54 | {"x": 11.5, "y": 2.5}, |
55 | {"x":12.5, "y":2}, | 55 | {"x": 12.5, "y": 2.5}, |
56 | {"x":13.5, "y":2, "w":1.5}, | 56 | {"x": 13.5, "y": 2.5, "w": 1.5}, |
57 | {"x":15.25, "y":2}, | 57 | {"x": 15.25, "y": 2.5}, |
58 | {"x":16.25, "y":2}, | 58 | {"x": 16.25, "y": 2.5}, |
59 | {"x":17.25, "y":2}, | 59 | {"x": 17.25, "y": 2.5}, |
60 | 60 | ||
61 | {"x":0, "y":3, "w":1.75}, | 61 | {"x": 0, "y": 3.5, "w": 1.75}, |
62 | {"x":1.75, "y":3}, | 62 | {"x": 1.75, "y": 3.5}, |
63 | {"x":2.75, "y":3}, | 63 | {"x": 2.75, "y": 3.5}, |
64 | {"x":3.75, "y":3}, | 64 | {"x": 3.75, "y": 3.5}, |
65 | {"x":4.75, "y":3}, | 65 | {"x": 4.75, "y": 3.5}, |
66 | {"x":5.75, "y":3}, | 66 | {"x": 5.75, "y": 3.5}, |
67 | {"x":6.75, "y":3}, | 67 | {"x": 6.75, "y": 3.5}, |
68 | {"x":7.75, "y":3}, | 68 | {"x": 7.75, "y": 3.5}, |
69 | {"x":8.75, "y":3}, | 69 | {"x": 8.75, "y": 3.5}, |
70 | {"x":9.75, "y":3}, | 70 | {"x": 9.75, "y": 3.5}, |
71 | {"x":10.75, "y":3}, | 71 | {"x": 10.75, "y": 3.5}, |
72 | {"x":11.75, "y":3}, | 72 | {"x": 11.75, "y": 3.5}, |
73 | {"x":12.75, "y":3, "w":2.25}, | 73 | {"x": 12.75, "y": 3.5, "w": 2.25}, |
74 | |||
75 | {"x":0, "y":4, "w":2.25}, | ||
76 | {"x":2.25, "y":4}, | ||
77 | {"x":3.25, "y":4}, | ||
78 | {"x":4.25, "y":4}, | ||
79 | {"x":5.25, "y":4}, | ||
80 | {"x":6.25, "y":4}, | ||
81 | {"x":7.25, "y":4}, | ||
82 | {"x":8.25, "y":4}, | ||
83 | {"x":9.25, "y":4}, | ||
84 | {"x":10.25, "y":4}, | ||
85 | {"x":11.25, "y":4}, | ||
86 | {"x":12.25, "y":4, "w":2.75}, | ||
87 | {"x":16.25, "y":4}, | ||
88 | 74 | ||
89 | {"x":0, "y":5, "w":1.25}, | 75 | {"x": 0, "y": 4.5, "w": 2.25}, |
90 | {"x":1.25, "y":5, "w":1.25}, | 76 | {"x": 2.25, "y": 4.5}, |
91 | {"x":2.5, "y":5, "w":1.25}, | 77 | {"x": 3.25, "y": 4.5}, |
92 | {"x":3.75, "y":5, "w":6.25}, | 78 | {"x": 4.25, "y": 4.5}, |
93 | {"x":10, "y":5, "w":1.25}, | 79 | {"x": 5.25, "y": 4.5}, |
94 | {"x":11.25, "y":5, "w":1.25}, | 80 | {"x": 6.25, "y": 4.5}, |
95 | {"x":12.5, "y":5, "w":1.25}, | 81 | {"x": 7.25, "y": 4.5}, |
96 | {"x":13.75, "y":5, "w":1.25}, | 82 | {"x": 8.25, "y": 4.5}, |
97 | {"x":15.25, "y":5}, | 83 | {"x": 9.25, "y": 4.5}, |
98 | {"x":16.25, "y":5}, | 84 | {"x": 10.25, "y": 4.5}, |
99 | {"x":17.25, "y":5} | 85 | {"x": 11.25, "y": 4.5}, |
86 | {"x": 12.25, "y": 4.5, "w": 2.75}, | ||
87 | {"x": 16.25, "y": 4.5}, | ||
88 | |||
89 | {"x": 0, "y": 5.5, "w": 1.25}, | ||
90 | {"x": 1.25, "y": 5.5, "w": 1.25}, | ||
91 | {"x": 2.5, "y": 5.5, "w": 1.25}, | ||
92 | {"x": 3.75, "y": 5.5, "w": 6.25}, | ||
93 | {"x": 10, "y": 5.5, "w": 1.25}, | ||
94 | {"x": 11.25, "y": 5.5, "w": 1.25}, | ||
95 | {"x": 12.5, "y": 5.5, "w": 1.25}, | ||
96 | {"x": 13.75, "y": 5.5, "w": 1.25}, | ||
97 | {"x": 15.25, "y": 5.5}, | ||
98 | {"x": 16.25, "y": 5.5}, | ||
99 | {"x": 17.25, "y": 5.5} | ||
100 | ] | 100 | ] |
101 | }, | 101 | }, |
102 | "LAYOUT_tkl_ansi_wkl": { | 102 | "LAYOUT_tkl_ansi_wkl": { |
103 | "layout": [ | 103 | "layout": [ |
104 | {"x":0, "y":0}, | 104 | {"x": 0, "y": 0}, |
105 | {"x":2, "y":0}, | 105 | {"x": 2, "y": 0}, |
106 | {"x":3, "y":0}, | 106 | {"x": 3, "y": 0}, |
107 | {"x":4, "y":0}, | 107 | {"x": 4, "y": 0}, |
108 | {"x":5, "y":0}, | 108 | {"x": 5, "y": 0}, |
109 | {"x":6.5, "y":0}, | 109 | {"x": 6.5, "y": 0}, |
110 | {"x":7.5, "y":0}, | 110 | {"x": 7.5, "y": 0}, |
111 | {"x":8.5, "y":0}, | 111 | {"x": 8.5, "y": 0}, |
112 | {"x":9.5, "y":0}, | 112 | {"x": 9.5, "y": 0}, |
113 | {"x":11, "y":0}, | 113 | {"x": 11, "y": 0}, |
114 | {"x":12, "y":0}, | 114 | {"x": 12, "y": 0}, |
115 | {"x":13, "y":0}, | 115 | {"x": 13, "y": 0}, |
116 | {"x":14, "y":0}, | 116 | {"x": 14, "y": 0}, |
117 | {"x":15.25, "y":0}, | 117 | {"x": 15.25, "y": 0}, |
118 | {"x":16.25, "y":0}, | 118 | {"x": 16.25, "y": 0}, |
119 | {"x":17.25, "y":0}, | 119 | {"x": 17.25, "y": 0}, |
120 | |||
121 | {"x": 0, "y": 1.5}, | ||
122 | {"x": 1, "y": 1.5}, | ||
123 | {"x": 2, "y": 1.5}, | ||
124 | {"x": 3, "y": 1.5}, | ||
125 | {"x": 4, "y": 1.5}, | ||
126 | {"x": 5, "y": 1.5}, | ||
127 | {"x": 6, "y": 1.5}, | ||
128 | {"x": 7, "y": 1.5}, | ||
129 | {"x": 8, "y": 1.5}, | ||
130 | {"x": 9, "y": 1.5}, | ||
131 | {"x": 10, "y": 1.5}, | ||
132 | {"x": 11, "y": 1.5}, | ||
133 | {"x": 12, "y": 1.5}, | ||
134 | {"x": 13, "y": 1.5, "w": 2.0}, | ||
135 | {"x": 15.25, "y": 1.5}, | ||
136 | {"x": 16.25, "y": 1.5}, | ||
137 | {"x": 17.25, "y": 1.5}, | ||
120 | 138 | ||
121 | {"x":0, "y":1}, | 139 | {"x": 0, "y": 2.5, "w": 1.5}, |
122 | {"x":1, "y":1}, | 140 | {"x": 1.5, "y": 2.5}, |
123 | {"x":2, "y":1}, | 141 | {"x": 2.5, "y": 2.5}, |
124 | {"x":3, "y":1}, | 142 | {"x": 3.5, "y": 2.5}, |
125 | {"x":4, "y":1}, | 143 | {"x": 4.5, "y": 2.5}, |
126 | {"x":5, "y":1}, | 144 | {"x": 5.5, "y": 2.5}, |
127 | {"x":6, "y":1}, | 145 | {"x": 6.5, "y": 2.5}, |
128 | {"x":7, "y":1}, | 146 | {"x": 7.5, "y": 2.5}, |
129 | {"x":8, "y":1}, | 147 | {"x": 8.5, "y": 2.5}, |
130 | {"x":9, "y":1}, | 148 | {"x": 9.5, "y": 2.5}, |
131 | {"x":10, "y":1}, | 149 | {"x": 10.5, "y": 2.5}, |
132 | {"x":11, "y":1}, | 150 | {"x": 11.5, "y": 2.5}, |
133 | {"x":12, "y":1}, | 151 | {"x": 12.5, "y": 2.5}, |
134 | {"x":13, "y":1, "w":2.0}, | 152 | {"x": 13.5, "y": 2.5, "w": 1.5}, |
135 | {"x":15.25, "y":1}, | 153 | {"x": 15.25, "y": 2.5}, |
136 | {"x":16.25, "y":1}, | 154 | {"x": 16.25, "y": 2.5}, |
137 | {"x":17.25, "y":1}, | 155 | {"x": 17.25, "y": 2.5}, |
138 | 156 | ||
139 | {"x":0, "y":2, "w":1.5}, | 157 | {"x": 0, "y": 3.5, "w": 1.75}, |
140 | {"x":1.5, "y":2}, | 158 | {"x": 1.75, "y": 3.5}, |
141 | {"x":2.5, "y":2}, | 159 | {"x": 2.75, "y": 3.5}, |
142 | {"x":3.5, "y":2}, | 160 | {"x": 3.75, "y": 3.5}, |
143 | {"x":4.5, "y":2}, | 161 | {"x": 4.75, "y": 3.5}, |
144 | {"x":5.5, "y":2}, | 162 | {"x": 5.75, "y": 3.5}, |
145 | {"x":6.5, "y":2}, | 163 | {"x": 6.75, "y": 3.5}, |
146 | {"x":7.5, "y":2}, | 164 | {"x": 7.75, "y": 3.5}, |
147 | {"x":8.5, "y":2}, | 165 | {"x": 8.75, "y": 3.5}, |
148 | {"x":9.5, "y":2}, | 166 | {"x": 9.75, "y": 3.5}, |
149 | {"x":10.5, "y":2}, | 167 | {"x": 10.75, "y": 3.5}, |
150 | {"x":11.5, "y":2}, | 168 | {"x": 11.75, "y": 3.5}, |
151 | {"x":12.5, "y":2}, | 169 | {"x": 12.75, "y": 3.5, "w": 2.25}, |
152 | {"x":13.5, "y":2, "w":1.5}, | ||
153 | {"x":15.25, "y":2}, | ||
154 | {"x":16.25, "y":2}, | ||
155 | {"x":17.25, "y":2}, | ||
156 | 170 | ||
157 | {"x":0, "y":3, "w":1.75}, | 171 | {"x": 0, "y": 4.5, "w": 2.25}, |
158 | {"x":1.75, "y":3}, | 172 | {"x": 2.25, "y": 4.5}, |
159 | {"x":2.75, "y":3}, | 173 | {"x": 3.25, "y": 4.5}, |
160 | {"x":3.75, "y":3}, | 174 | {"x": 4.25, "y": 4.5}, |
161 | {"x":4.75, "y":3}, | 175 | {"x": 5.25, "y": 4.5}, |
162 | {"x":5.75, "y":3}, | 176 | {"x": 6.25, "y": 4.5}, |
163 | {"x":6.75, "y":3}, | 177 | {"x": 7.25, "y": 4.5}, |
164 | {"x":7.75, "y":3}, | 178 | {"x": 8.25, "y": 4.5}, |
165 | {"x":8.75, "y":3}, | 179 | {"x": 9.25, "y": 4.5}, |
166 | {"x":9.75, "y":3}, | 180 | {"x": 10.25, "y": 4.5}, |
167 | {"x":10.75, "y":3}, | 181 | {"x": 11.25, "y": 4.5}, |
168 | {"x":11.75, "y":3}, | 182 | {"x": 12.25, "y": 4.5, "w": 2.75}, |
169 | {"x":12.75, "y":3, "w":2.25}, | 183 | {"x": 16.25, "y": 4.5}, |
170 | |||
171 | {"x":0, "y":4, "w":2.25}, | ||
172 | {"x":2.25, "y":4}, | ||
173 | {"x":3.25, "y":4}, | ||
174 | {"x":4.25, "y":4}, | ||
175 | {"x":5.25, "y":4}, | ||
176 | {"x":6.25, "y":4}, | ||
177 | {"x":7.25, "y":4}, | ||
178 | {"x":8.25, "y":4}, | ||
179 | {"x":9.25, "y":4}, | ||
180 | {"x":10.25, "y":4}, | ||
181 | {"x":11.25, "y":4}, | ||
182 | {"x":12.25, "y":4, "w":2.75}, | ||
183 | {"x":16.25, "y":4}, | ||
184 | 184 | ||
185 | {"x":0, "y":5, "w":1.5}, | 185 | {"x": 0, "y": 5.5, "w": 1.5}, |
186 | {"x":2.5, "y":5, "w":1.5}, | 186 | {"x": 2.5, "y": 5.5, "w": 1.5}, |
187 | {"x":4, "y":5, "w":7}, | 187 | {"x": 4, "y": 5.5, "w": 7}, |
188 | {"x":11, "y":5, "w":1.5}, | 188 | {"x": 11, "y": 5.5, "w": 1.5}, |
189 | {"x":13.5, "y":5, "w":1.5}, | 189 | {"x": 13.5, "y": 5.5, "w": 1.5}, |
190 | {"x":15.25, "y":5}, | 190 | {"x": 15.25, "y": 5.5}, |
191 | {"x":16.25, "y":5}, | 191 | {"x": 16.25, "y": 5.5}, |
192 | {"x":17.25, "y":5} | 192 | {"x": 17.25, "y": 5.5} |
193 | ] | 193 | ] |
194 | } | 194 | } |
195 | } | 195 | } |