summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-09-25 12:34:48 +1000
committerNick Brassel <nick@tzarc.org>2023-09-25 12:34:48 +1000
commit1fb02d5ad87e69d459ae63235bbb3057083866ef (patch)
treedbaff204657253b22732f8092036e556b596ba8b
parenta360900fbb87cec0aa721d527b251a3dcc72c671 (diff)
parent131bc92b7723d38015e7e82b7dccd773c90f7818 (diff)
Merge remote-tracking branch 'upstream/master' into develop
Diffstat
-rw-r--r--keyboards/bredworks/wyvern_hs/info.json308
-rw-r--r--keyboards/bredworks/wyvern_hs/keymaps/default/keymap.c33
-rw-r--r--keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c33
-rw-r--r--keyboards/bredworks/wyvern_hs/keymaps/via/keymap.c33
-rw-r--r--keyboards/bredworks/wyvern_hs/keymaps/via/rules.mk2
-rw-r--r--keyboards/bredworks/wyvern_hs/readme.md23
-rw-r--r--keyboards/bredworks/wyvern_hs/rules.mk1
-rw-r--r--layouts/community/ortho_4x12/drashna/rules.mk2
-rw-r--r--quantum/process_keycode/process_combo.c2
9 files changed, 435 insertions, 2 deletions
diff --git a/keyboards/bredworks/wyvern_hs/info.json b/keyboards/bredworks/wyvern_hs/info.json
new file mode 100644
index 0000000000..63e85496ae
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/info.json
@@ -0,0 +1,308 @@
1{
2 "manufacturer": "Bred Works",
3 "keyboard_name": "Wyvern HS",
4 "maintainer": "DeskDaily",
5 "bootloader": "atmel-dfu",
6 "diode_direction": "COL2ROW",
7 "features": {
8 "bootmagic": true,
9 "command": false,
10 "console": false,
11 "extrakey": true,
12 "mousekey": true,
13 "nkro": true
14 },
15 "matrix_pins": {
16 "cols": ["B3", "B2", "B1", "B0", "F7", "D5", "D3", "D2", "D1", "D0", "E6", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
17 "rows": ["B7", "F1", "F6", "F5", "F4"]
18 },
19 "processor": "atmega32u4",
20 "url": "https://bredworks.com/products/wyvern-hotswap-pcb",
21 "usb": {
22 "device_version": "0.0.1",
23 "pid": "0x0001",
24 "vid": "0x0571"
25 },
26 "layouts": {
27 "LAYOUT_all": {
28 "layout": [
29 {"matrix": [0, 0], "x": 0, "y": 0},
30 {"matrix": [0, 1], "x": 1, "y": 0},
31 {"matrix": [0, 2], "x": 2, "y": 0},
32 {"matrix": [0, 3], "x": 3, "y": 0},
33 {"matrix": [0, 4], "x": 4.25, "y": 0},
34 {"matrix": [0, 5], "x": 5.25, "y": 0},
35 {"matrix": [0, 6], "x": 6.25, "y": 0},
36 {"matrix": [0, 7], "x": 7.25, "y": 0},
37 {"matrix": [0, 8], "x": 8.25, "y": 0},
38 {"matrix": [0, 9], "x": 9.25, "y": 0},
39 {"matrix": [0, 10], "x": 10.25, "y": 0},
40 {"matrix": [0, 11], "x": 11.25, "y": 0},
41 {"matrix": [0, 12], "x": 12.25, "y": 0},
42 {"matrix": [0, 13], "x": 13.25, "y": 0},
43 {"matrix": [0, 14], "x": 14.25, "y": 0},
44 {"matrix": [0, 15], "x": 15.25, "y": 0},
45 {"matrix": [0, 16], "x": 16.25, "y": 0},
46 {"matrix": [0, 17], "x": 17.25, "y": 0},
47 {"matrix": [0, 19], "x": 19.75, "y": 0},
48 {"matrix": [1, 0], "x": 0, "y": 1},
49 {"matrix": [1, 1], "x": 1, "y": 1},
50 {"matrix": [1, 2], "x": 2, "y": 1},
51 {"matrix": [1, 3], "x": 3, "y": 1},
52 {"matrix": [1, 4], "x": 4.25, "y": 1, "w": 1.5},
53 {"matrix": [1, 5], "x": 5.75, "y": 1},
54 {"matrix": [1, 6], "x": 6.75, "y": 1},
55 {"matrix": [1, 7], "x": 7.75, "y": 1},
56 {"matrix": [1, 8], "x": 8.75, "y": 1},
57 {"matrix": [1, 9], "x": 9.75, "y": 1},
58 {"matrix": [1, 10], "x": 10.75, "y": 1},
59 {"matrix": [1, 11], "x": 11.75, "y": 1},
60 {"matrix": [1, 12], "x": 12.75, "y": 1},
61 {"matrix": [1, 13], "x": 13.75, "y": 1},
62 {"matrix": [1, 14], "x": 14.75, "y": 1},
63 {"matrix": [1, 15], "x": 15.75, "y": 1},
64 {"matrix": [1, 16], "x": 16.75, "y": 1},
65 {"matrix": [1, 17], "x": 17.75, "y": 1, "w": 1.5},
66 {"matrix": [1, 19], "x": 19.75, "y": 1},
67 {"matrix": [2, 0], "x": 0, "y": 2},
68 {"matrix": [2, 1], "x": 1, "y": 2},
69 {"matrix": [2, 2], "x": 2, "y": 2},
70 {"matrix": [2, 3], "x": 3, "y": 2},
71 {"matrix": [2, 4], "x": 4.25, "y": 2, "w": 1.75},
72 {"matrix": [2, 5], "x": 6, "y": 2},
73 {"matrix": [2, 6], "x": 7, "y": 2},
74 {"matrix": [2, 7], "x": 8, "y": 2},
75 {"matrix": [2, 8], "x": 9, "y": 2},
76 {"matrix": [2, 9], "x": 10, "y": 2},
77 {"matrix": [2, 10], "x": 11, "y": 2},
78 {"matrix": [2, 11], "x": 12, "y": 2},
79 {"matrix": [2, 12], "x": 13, "y": 2},
80 {"matrix": [2, 13], "x": 14, "y": 2},
81 {"matrix": [2, 14], "x": 15, "y": 2},
82 {"matrix": [2, 15], "x": 16, "y": 2},
83 {"matrix": [2, 16], "x": 17, "y": 2, "w": 2.25},
84 {"matrix": [2, 19], "x": 19.75, "y": 2},
85 {"matrix": [3, 0], "x": 0, "y": 3, "h": 2},
86 {"matrix": [3, 1], "x": 1, "y": 3},
87 {"matrix": [3, 2], "x": 2, "y": 3},
88 {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
89 {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.25},
90 {"matrix": [3, 5], "x": 5.5, "y": 3},
91 {"matrix": [3, 6], "x": 6.5, "y": 3},
92 {"matrix": [3, 7], "x": 7.5, "y": 3},
93 {"matrix": [3, 8], "x": 8.5, "y": 3},
94 {"matrix": [3, 9], "x": 9.5, "y": 3},
95 {"matrix": [3, 10], "x": 10.5, "y": 3},
96 {"matrix": [3, 11], "x": 11.5, "y": 3},
97 {"matrix": [3, 12], "x": 12.5, "y": 3},
98 {"matrix": [3, 13], "x": 13.5, "y": 3},
99 {"matrix": [3, 14], "x": 14.5, "y": 3},
100 {"matrix": [3, 15], "x": 15.5, "y": 3},
101 {"matrix": [3, 16], "x": 16.5, "y": 3, "w": 1.75},
102 {"matrix": [3, 19], "x": 19.75, "y": 3},
103 {"matrix": [3, 17], "x": 18.5, "y": 3.25},
104 {"matrix": [4, 1], "x": 1, "y": 4},
105 {"matrix": [4, 2], "x": 2, "y": 4},
106 {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
107 {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 1.25},
108 {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
109 {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
110 {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
111 {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 2.75},
112 {"matrix": [4, 13], "x": 14.25, "y": 4},
113 {"matrix": [4, 14], "x": 15.25, "y": 4},
114 {"matrix": [4, 15], "x": 16.25, "y": 4},
115 {"matrix": [4, 16], "x": 17.5, "y": 4.25},
116 {"matrix": [4, 17], "x": 18.5, "y": 4.25},
117 {"matrix": [4, 18], "x": 19.5, "y": 4.25},
118 {"matrix": [0, 18], "x": 18.25, "y": 0}
119 ]
120 },
121 "LAYOUT_mirrored_numpad": {
122 "layout": [
123 {"matrix": [0, 0], "x": 0, "y": 0},
124 {"matrix": [0, 1], "x": 1, "y": 0},
125 {"matrix": [0, 2], "x": 2, "y": 0},
126 {"matrix": [0, 3], "x": 3, "y": 0},
127 {"matrix": [0, 4], "x": 4.25, "y": 0},
128 {"matrix": [0, 5], "x": 5.25, "y": 0},
129 {"matrix": [0, 6], "x": 6.25, "y": 0},
130 {"matrix": [0, 7], "x": 7.25, "y": 0},
131 {"matrix": [0, 8], "x": 8.25, "y": 0},
132 {"matrix": [0, 9], "x": 9.25, "y": 0},
133 {"matrix": [0, 10], "x": 10.25, "y": 0},
134 {"matrix": [0, 11], "x": 11.25, "y": 0},
135 {"matrix": [0, 12], "x": 12.25, "y": 0},
136 {"matrix": [0, 13], "x": 13.25, "y": 0},
137 {"matrix": [0, 14], "x": 14.25, "y": 0},
138 {"matrix": [0, 15], "x": 15.25, "y": 0},
139 {"matrix": [0, 16], "x": 16.25, "y": 0},
140 {"matrix": [0, 17], "x": 17.25, "y": 0},
141 {"matrix": [0, 19], "x": 19.75, "y": 0},
142 {"matrix": [1, 0], "x": 0, "y": 1, "h": 2},
143 {"matrix": [1, 1], "x": 1, "y": 1},
144 {"matrix": [1, 2], "x": 2, "y": 1},
145 {"matrix": [1, 3], "x": 3, "y": 1},
146 {"matrix": [1, 4], "x": 4.25, "y": 1, "w": 1.5},
147 {"matrix": [1, 5], "x": 5.75, "y": 1},
148 {"matrix": [1, 6], "x": 6.75, "y": 1},
149 {"matrix": [1, 7], "x": 7.75, "y": 1},
150 {"matrix": [1, 8], "x": 8.75, "y": 1},
151 {"matrix": [1, 9], "x": 9.75, "y": 1},
152 {"matrix": [1, 10], "x": 10.75, "y": 1},
153 {"matrix": [1, 11], "x": 11.75, "y": 1},
154 {"matrix": [1, 12], "x": 12.75, "y": 1},
155 {"matrix": [1, 13], "x": 13.75, "y": 1},
156 {"matrix": [1, 14], "x": 14.75, "y": 1},
157 {"matrix": [1, 15], "x": 15.75, "y": 1},
158 {"matrix": [1, 16], "x": 16.75, "y": 1},
159 {"matrix": [1, 17], "x": 17.75, "y": 1, "w": 1.5},
160 {"matrix": [1, 19], "x": 19.75, "y": 1},
161 {"matrix": [2, 1], "x": 1, "y": 2},
162 {"matrix": [2, 2], "x": 2, "y": 2},
163 {"matrix": [2, 3], "x": 3, "y": 2},
164 {"matrix": [2, 4], "x": 4.25, "y": 2, "w": 1.75},
165 {"matrix": [2, 5], "x": 6, "y": 2},
166 {"matrix": [2, 6], "x": 7, "y": 2},
167 {"matrix": [2, 7], "x": 8, "y": 2},
168 {"matrix": [2, 8], "x": 9, "y": 2},
169 {"matrix": [2, 9], "x": 10, "y": 2},
170 {"matrix": [2, 10], "x": 11, "y": 2},
171 {"matrix": [2, 11], "x": 12, "y": 2},
172 {"matrix": [2, 12], "x": 13, "y": 2},
173 {"matrix": [2, 13], "x": 14, "y": 2},
174 {"matrix": [2, 14], "x": 15, "y": 2},
175 {"matrix": [2, 15], "x": 16, "y": 2},
176 {"matrix": [2, 16], "x": 17, "y": 2, "w": 2.25},
177 {"matrix": [2, 19], "x": 19.75, "y": 2},
178 {"matrix": [3, 0], "x": 0, "y": 3, "h": 2},
179 {"matrix": [3, 1], "x": 1, "y": 3},
180 {"matrix": [3, 2], "x": 2, "y": 3},
181 {"matrix": [3, 3], "x": 3, "y": 3},
182 {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.25},
183 {"matrix": [3, 5], "x": 5.5, "y": 3},
184 {"matrix": [3, 6], "x": 6.5, "y": 3},
185 {"matrix": [3, 7], "x": 7.5, "y": 3},
186 {"matrix": [3, 8], "x": 8.5, "y": 3},
187 {"matrix": [3, 9], "x": 9.5, "y": 3},
188 {"matrix": [3, 10], "x": 10.5, "y": 3},
189 {"matrix": [3, 11], "x": 11.5, "y": 3},
190 {"matrix": [3, 12], "x": 12.5, "y": 3},
191 {"matrix": [3, 13], "x": 13.5, "y": 3},
192 {"matrix": [3, 14], "x": 14.5, "y": 3},
193 {"matrix": [3, 15], "x": 15.5, "y": 3},
194 {"matrix": [3, 16], "x": 16.5, "y": 3, "w": 1.75},
195 {"matrix": [3, 19], "x": 19.75, "y": 3},
196 {"matrix": [3, 17], "x": 18.5, "y": 3.25},
197 {"matrix": [4, 1], "x": 1, "y": 4},
198 {"matrix": [4, 2], "x": 2, "y": 4, "w": 2},
199 {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
200 {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 1.25},
201 {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
202 {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
203 {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
204 {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 2.75},
205 {"matrix": [4, 13], "x": 14.25, "y": 4},
206 {"matrix": [4, 14], "x": 15.25, "y": 4},
207 {"matrix": [4, 15], "x": 16.25, "y": 4},
208 {"matrix": [4, 16], "x": 17.5, "y": 4.25},
209 {"matrix": [4, 17], "x": 18.5, "y": 4.25},
210 {"matrix": [4, 18], "x": 19.5, "y": 4.25},
211 {"matrix": [0, 18], "x": 18.25, "y": 0}
212 ]
213 },
214 "LAYOUT_regular_numpad": {
215 "layout": [
216 {"matrix": [0, 0], "x": 0, "y": 0},
217 {"matrix": [0, 1], "x": 1, "y": 0},
218 {"matrix": [0, 2], "x": 2, "y": 0},
219 {"matrix": [0, 3], "x": 3, "y": 0},
220 {"matrix": [0, 4], "x": 4.25, "y": 0},
221 {"matrix": [0, 5], "x": 5.25, "y": 0},
222 {"matrix": [0, 6], "x": 6.25, "y": 0},
223 {"matrix": [0, 7], "x": 7.25, "y": 0},
224 {"matrix": [0, 8], "x": 8.25, "y": 0},
225 {"matrix": [0, 9], "x": 9.25, "y": 0},
226 {"matrix": [0, 10], "x": 10.25, "y": 0},
227 {"matrix": [0, 11], "x": 11.25, "y": 0},
228 {"matrix": [0, 12], "x": 12.25, "y": 0},
229 {"matrix": [0, 13], "x": 13.25, "y": 0},
230 {"matrix": [0, 14], "x": 14.25, "y": 0},
231 {"matrix": [0, 15], "x": 15.25, "y": 0},
232 {"matrix": [0, 16], "x": 16.25, "y": 0},
233 {"matrix": [0, 17], "x": 17.25, "y": 0},
234 {"matrix": [0, 19], "x": 19.75, "y": 0},
235 {"matrix": [1, 0], "x": 0, "y": 1},
236 {"matrix": [1, 1], "x": 1, "y": 1},
237 {"matrix": [1, 2], "x": 2, "y": 1},
238 {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
239 {"matrix": [1, 4], "x": 4.25, "y": 1, "w": 1.5},
240 {"matrix": [1, 5], "x": 5.75, "y": 1},
241 {"matrix": [1, 6], "x": 6.75, "y": 1},
242 {"matrix": [1, 7], "x": 7.75, "y": 1},
243 {"matrix": [1, 8], "x": 8.75, "y": 1},
244 {"matrix": [1, 9], "x": 9.75, "y": 1},
245 {"matrix": [1, 10], "x": 10.75, "y": 1},
246 {"matrix": [1, 11], "x": 11.75, "y": 1},
247 {"matrix": [1, 12], "x": 12.75, "y": 1},
248 {"matrix": [1, 13], "x": 13.75, "y": 1},
249 {"matrix": [1, 14], "x": 14.75, "y": 1},
250 {"matrix": [1, 15], "x": 15.75, "y": 1},
251 {"matrix": [1, 16], "x": 16.75, "y": 1},
252 {"matrix": [1, 17], "x": 17.75, "y": 1, "w": 1.5},
253 {"matrix": [1, 19], "x": 19.75, "y": 1},
254 {"matrix": [2, 0], "x": 0, "y": 2},
255 {"matrix": [2, 1], "x": 1, "y": 2},
256 {"matrix": [2, 2], "x": 2, "y": 2},
257 {"matrix": [2, 4], "x": 4.25, "y": 2, "w": 1.75},
258 {"matrix": [2, 5], "x": 6, "y": 2},
259 {"matrix": [2, 6], "x": 7, "y": 2},
260 {"matrix": [2, 7], "x": 8, "y": 2},
261 {"matrix": [2, 8], "x": 9, "y": 2},
262 {"matrix": [2, 9], "x": 10, "y": 2},
263 {"matrix": [2, 10], "x": 11, "y": 2},
264 {"matrix": [2, 11], "x": 12, "y": 2},
265 {"matrix": [2, 12], "x": 13, "y": 2},
266 {"matrix": [2, 13], "x": 14, "y": 2},
267 {"matrix": [2, 14], "x": 15, "y": 2},
268 {"matrix": [2, 15], "x": 16, "y": 2},
269 {"matrix": [2, 16], "x": 17, "y": 2, "w": 2.25},
270 {"matrix": [2, 19], "x": 19.75, "y": 2},
271 {"matrix": [3, 0], "x": 0, "y": 3},
272 {"matrix": [3, 1], "x": 1, "y": 3},
273 {"matrix": [3, 2], "x": 2, "y": 3},
274 {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
275 {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.25},
276 {"matrix": [3, 5], "x": 5.5, "y": 3},
277 {"matrix": [3, 6], "x": 6.5, "y": 3},
278 {"matrix": [3, 7], "x": 7.5, "y": 3},
279 {"matrix": [3, 8], "x": 8.5, "y": 3},
280 {"matrix": [3, 9], "x": 9.5, "y": 3},
281 {"matrix": [3, 10], "x": 10.5, "y": 3},
282 {"matrix": [3, 11], "x": 11.5, "y": 3},
283 {"matrix": [3, 12], "x": 12.5, "y": 3},
284 {"matrix": [3, 13], "x": 13.5, "y": 3},
285 {"matrix": [3, 14], "x": 14.5, "y": 3},
286 {"matrix": [3, 15], "x": 15.5, "y": 3},
287 {"matrix": [3, 16], "x": 16.5, "y": 3, "w": 1.75},
288 {"matrix": [3, 19], "x": 19.75, "y": 3},
289 {"matrix": [3, 17], "x": 18.5, "y": 3.25},
290 {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
291 {"matrix": [4, 2], "x": 2, "y": 4},
292 {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
293 {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 1.25},
294 {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
295 {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
296 {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
297 {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 2.75},
298 {"matrix": [4, 13], "x": 14.25, "y": 4},
299 {"matrix": [4, 14], "x": 15.25, "y": 4},
300 {"matrix": [4, 15], "x": 16.25, "y": 4},
301 {"matrix": [4, 16], "x": 17.5, "y": 4.25},
302 {"matrix": [4, 17], "x": 18.5, "y": 4.25},
303 {"matrix": [4, 18], "x": 19.5, "y": 4.25},
304 {"matrix": [0, 18], "x": 18.25, "y": 0}
305 ]
306 }
307 }
308} \ No newline at end of file
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/default/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3d0e067215
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
1/* Copyright 2023 DeskDaily
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_mirrored_numpad(
20 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
21 KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
22 KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
23 KC_ENT, KC_P1, KC_P2, KC_P3, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), KC_UP,
24 KC_DEL, KC_P0, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC
25 ),
26 [1] = LAYOUT_mirrored_numpad(
27 _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
32 )
33}; \ No newline at end of file
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c
new file mode 100644
index 0000000000..78037bac14
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c
@@ -0,0 +1,33 @@
1/* Copyright 2023 DeskDaily
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_regular_numpad(
20 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
21 KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
22 KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
23 KC_P1, KC_P2, KC_P3, KC_ENT, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), KC_UP,
24 KC_P0, KC_DEL, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC
25 ),
26 [1] = LAYOUT_regular_numpad(
27 _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
32 )
33}; \ No newline at end of file
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/via/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0b73184e01
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
1/* Copyright 2023 DeskDaily
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_all(
20 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
21 KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
22 KC_PPLS, KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
23 KC_ENT, KC_P1, KC_P2, KC_P3, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), KC_UP,
24 KC_DEL, KC_P0, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC
25 ),
26 [1] = LAYOUT_all(
27 _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
32 )
33}; \ No newline at end of file
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/via/rules.mk b/keyboards/bredworks/wyvern_hs/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes
diff --git a/keyboards/bredworks/wyvern_hs/readme.md b/keyboards/bredworks/wyvern_hs/readme.md
new file mode 100644
index 0000000000..0d0ed4e099
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/readme.md
@@ -0,0 +1,23 @@
1# Bredworks Wyvern HS
2
3* Keyboard Maintainer: [DeskDaily](https://github.com/DeskDaily)
4* Hardware Supported: Atmega32u4
5* Hardware Availability: [BredWorks](https://bredworks.com/products/wyvern-hotswap-pcb)
6
7Make example for this keyboard (after setting up your build environment):
8
9 make bredworks/wyvern_hs:default
10
11Flashing example for this keyboard:
12
13 make bredworks/wyvern_hs:default:flash
14
15## Bootloader
16
17Enter the bootloader in 3 ways:
18
19* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the upper left key/esc) and plug in the keyboard
20* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
21* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
22
23See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/bredworks/wyvern_hs/rules.mk b/keyboards/bredworks/wyvern_hs/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/rules.mk
@@ -0,0 +1 @@
# This file intentionally left blank
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk
index a2278e931d..15775bcbe3 100644
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@@ -8,7 +8,7 @@ CONSOLE_ENABLE = no
8COMMAND_ENABLE = no 8COMMAND_ENABLE = no
9BACKLIGHT_ENABLE = no 9BACKLIGHT_ENABLE = no
10 10
11ifeq ($(strip $(LAYOUT_HAS_RGB)), yes) 11ifeq ($(strip $(LAYOUTS_HAS_RGB)), yes)
12 RGBLIGHT_ENABLE = yes 12 RGBLIGHT_ENABLE = yes
13endif 13endif
14 14
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 64d30fc140..b0034d136a 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -557,7 +557,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
557 /* Only check keycodes from one layer. */ 557 /* Only check keycodes from one layer. */
558 keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key); 558 keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
559#else 559#else
560 uint8_t highest_layer = get_highest_layer(layer_state); 560 uint8_t highest_layer = get_highest_layer(layer_state | default_layer_state);
561 uint8_t ref_layer = combo_ref_from_layer(highest_layer); 561 uint8_t ref_layer = combo_ref_from_layer(highest_layer);
562 if (ref_layer != highest_layer) { 562 if (ref_layer != highest_layer) {
563 keycode = keymap_key_to_keycode(ref_layer, record->event.key); 563 keycode = keymap_key_to_keycode(ref_layer, record->event.key);
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:35:34 +0000