aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-09-17 20:48:14 +0000
committerGitHub <noreply@github.com>2021-09-17 13:48:14 -0700
commit7c09b2667b49839d6c1a27133751d43642149a84 (patch)
tree8657df6e5811b41a66e8f80223c9978e9bbd14e2
parent0c1341daa80b79ccbef8a9e7f895552ff57456e9 (diff)
downloadqmk_firmware-7c09b2667b49839d6c1a27133751d43642149a84.tar.gz
qmk_firmware-7c09b2667b49839d6c1a27133751d43642149a84.zip
Nix Studio OXALYS80 Refactor (#14473)
* update grid alignment of keycodes * update key assignments on via keymap A seemingly-misplaced key assignment on Layers 1 through 3 of the via keymap led to keys being off by one in comparison to the default keymap. * switch Backslash and Backspace on via keymap base layer Matches the via keymap's key mapping to that of the default keymap. * use QMK 3-character notation in oxalys80.h * add matrix diagram; remove Planck reference * add LAYOUT_tkl_ansi and LAYOUT_tkl_ansi_wkl layout macros * add LAYOUT_tkl_ansi_tsangan macro * add ISO layouts Add LAYOUT_tkl_iso, LAYOUT_tkl_iso_tsangan, and LAYOUT_tkl_iso_wkl macros. * enable Community Layouts support * tidy up rules.mk * readme tidy-up
-rw-r--r--keyboards/nix_studio/oxalys80/info.json382
-rw-r--r--keyboards/nix_studio/oxalys80/keymaps/default/keymap.c28
-rw-r--r--keyboards/nix_studio/oxalys80/keymaps/via/keymap.c56
-rw-r--r--keyboards/nix_studio/oxalys80/oxalys80.h194
-rw-r--r--keyboards/nix_studio/oxalys80/readme.md64
-rw-r--r--keyboards/nix_studio/oxalys80/rules.mk10
6 files changed, 640 insertions, 94 deletions
diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json
index 73277b55a..d2fd76597 100644
--- a/keyboards/nix_studio/oxalys80/info.json
+++ b/keyboards/nix_studio/oxalys80/info.json
@@ -198,6 +198,101 @@
198 {"label":"\u2192", "x":17.25, "y":5.5} 198 {"label":"\u2192", "x":17.25, "y":5.5}
199 ] 199 ]
200 }, 200 },
201 "LAYOUT_tkl_ansi_tsangan": {
202 "layout": [
203 {"label":"Esc", "x":0, "y":0},
204 {"label":"F1", "x":2, "y":0},
205 {"label":"F2", "x":3, "y":0},
206 {"label":"F3", "x":4, "y":0},
207 {"label":"F4", "x":5, "y":0},
208 {"label":"F5", "x":6.5, "y":0},
209 {"label":"F6", "x":7.5, "y":0},
210 {"label":"F7", "x":8.5, "y":0},
211 {"label":"F8", "x":9.5, "y":0},
212 {"label":"F9", "x":11, "y":0},
213 {"label":"F10", "x":12, "y":0},
214 {"label":"F11", "x":13, "y":0},
215 {"label":"F12", "x":14, "y":0},
216 {"label":"PrtSc", "x":15.25, "y":0},
217 {"label":"Scroll Lock", "x":16.25, "y":0},
218 {"label":"Pause", "x":17.25, "y":0},
219
220 {"label":"~", "x":0, "y":1.5},
221 {"label":"!", "x":1, "y":1.5},
222 {"label":"@", "x":2, "y":1.5},
223 {"label":"#", "x":3, "y":1.5},
224 {"label":"$", "x":4, "y":1.5},
225 {"label":"%", "x":5, "y":1.5},
226 {"label":"^", "x":6, "y":1.5},
227 {"label":"&", "x":7, "y":1.5},
228 {"label":"*", "x":8, "y":1.5},
229 {"label":"(", "x":9, "y":1.5},
230 {"label":")", "x":10, "y":1.5},
231 {"label":"_", "x":11, "y":1.5},
232 {"label":"+", "x":12, "y":1.5},
233 {"label":"Bksp", "x":13, "y":1.5, "w":2},
234 {"label":"Insert", "x":15.25, "y":1.5},
235 {"label":"Home", "x":16.25, "y":1.5},
236 {"label":"PgUp", "x":17.25, "y":1.5},
237
238 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
239 {"label":"Q", "x":1.5, "y":2.5},
240 {"label":"W", "x":2.5, "y":2.5},
241 {"label":"E", "x":3.5, "y":2.5},
242 {"label":"R", "x":4.5, "y":2.5},
243 {"label":"T", "x":5.5, "y":2.5},
244 {"label":"Y", "x":6.5, "y":2.5},
245 {"label":"U", "x":7.5, "y":2.5},
246 {"label":"I", "x":8.5, "y":2.5},
247 {"label":"O", "x":9.5, "y":2.5},
248 {"label":"P", "x":10.5, "y":2.5},
249 {"label":"{", "x":11.5, "y":2.5},
250 {"label":"}", "x":12.5, "y":2.5},
251 {"label":"|", "x":13.5, "y":2.5, "w":1.5},
252 {"label":"Delete", "x":15.25, "y":2.5},
253 {"label":"End", "x":16.25, "y":2.5},
254 {"label":"PgDn", "x":17.25, "y":2.5},
255
256 {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
257 {"label":"A", "x":1.75, "y":3.5},
258 {"label":"S", "x":2.75, "y":3.5},
259 {"label":"D", "x":3.75, "y":3.5},
260 {"label":"F", "x":4.75, "y":3.5},
261 {"label":"G", "x":5.75, "y":3.5},
262 {"label":"H", "x":6.75, "y":3.5},
263 {"label":"J", "x":7.75, "y":3.5},
264 {"label":"K", "x":8.75, "y":3.5},
265 {"label":"L", "x":9.75, "y":3.5},
266 {"label":":", "x":10.75, "y":3.5},
267 {"label":"\"", "x":11.75, "y":3.5},
268 {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
269
270 {"label":"Shift", "x":0, "y":4.5, "w":2.25},
271 {"label":"Z", "x":2.25, "y":4.5},
272 {"label":"X", "x":3.25, "y":4.5},
273 {"label":"C", "x":4.25, "y":4.5},
274 {"label":"V", "x":5.25, "y":4.5},
275 {"label":"B", "x":6.25, "y":4.5},
276 {"label":"N", "x":7.25, "y":4.5},
277 {"label":"M", "x":8.25, "y":4.5},
278 {"label":"<", "x":9.25, "y":4.5},
279 {"label":">", "x":10.25, "y":4.5},
280 {"label":"?", "x":11.25, "y":4.5},
281 {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
282 {"label":"\u2191", "x":16.25, "y":4.5},
283
284 {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
285 {"label":"Win", "x":1.5, "y":5.5},
286 {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
287 { "x":4, "y":5.5, "w":7},
288 {"label":"Win", "x":11, "y":5.5, "w":1.5},
289 {"label":"Menu", "x":12.5, "y":5.5},
290 {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
291 {"label":"\u2190", "x":15.25, "y":5.5},
292 {"label":"\u2193", "x":16.25, "y":5.5},
293 {"label":"\u2192", "x":17.25, "y":5.5}
294 ]
295 },
201 "LAYOUT_tkl_ansi_wkl": { 296 "LAYOUT_tkl_ansi_wkl": {
202 "layout": [ 297 "layout": [
203 {"label":"Esc", "x":0, "y":0}, 298 {"label":"Esc", "x":0, "y":0},
@@ -290,6 +385,293 @@
290 {"label":"\u2193", "x":16.25, "y":5.5}, 385 {"label":"\u2193", "x":16.25, "y":5.5},
291 {"label":"\u2192", "x":17.25, "y":5.5} 386 {"label":"\u2192", "x":17.25, "y":5.5}
292 ] 387 ]
388 },
389 "LAYOUT_tkl_iso": {
390 "layout": [
391 {"label":"Esc", "x":0, "y":0},
392 {"label":"F1", "x":2, "y":0},
393 {"label":"F2", "x":3, "y":0},
394 {"label":"F3", "x":4, "y":0},
395 {"label":"F4", "x":5, "y":0},
396 {"label":"F5", "x":6.5, "y":0},
397 {"label":"F6", "x":7.5, "y":0},
398 {"label":"F7", "x":8.5, "y":0},
399 {"label":"F8", "x":9.5, "y":0},
400 {"label":"F9", "x":11, "y":0},
401 {"label":"F10", "x":12, "y":0},
402 {"label":"F11", "x":13, "y":0},
403 {"label":"F12", "x":14, "y":0},
404 {"label":"PrtSc", "x":15.25, "y":0},
405 {"label":"Scroll Lock", "x":16.25, "y":0},
406 {"label":"Pause", "x":17.25, "y":0},
407
408 {"label":"~", "x":0, "y":1.5},
409 {"label":"!", "x":1, "y":1.5},
410 {"label":"@", "x":2, "y":1.5},
411 {"label":"#", "x":3, "y":1.5},
412 {"label":"$", "x":4, "y":1.5},
413 {"label":"%", "x":5, "y":1.5},
414 {"label":"^", "x":6, "y":1.5},
415 {"label":"&", "x":7, "y":1.5},
416 {"label":"*", "x":8, "y":1.5},
417 {"label":"(", "x":9, "y":1.5},
418 {"label":")", "x":10, "y":1.5},
419 {"label":"_", "x":11, "y":1.5},
420 {"label":"+", "x":12, "y":1.5},
421 {"label":"Bksp", "x":13, "y":1.5, "w":2},
422 {"label":"Insert", "x":15.25, "y":1.5},
423 {"label":"Home", "x":16.25, "y":1.5},
424 {"label":"PgUp", "x":17.25, "y":1.5},
425
426 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
427 {"label":"Q", "x":1.5, "y":2.5},
428 {"label":"W", "x":2.5, "y":2.5},
429 {"label":"E", "x":3.5, "y":2.5},
430 {"label":"R", "x":4.5, "y":2.5},
431 {"label":"T", "x":5.5, "y":2.5},
432 {"label":"Y", "x":6.5, "y":2.5},
433 {"label":"U", "x":7.5, "y":2.5},
434 {"label":"I", "x":8.5, "y":2.5},
435 {"label":"O", "x":9.5, "y":2.5},
436 {"label":"P", "x":10.5, "y":2.5},
437 {"label":"{", "x":11.5, "y":2.5},
438 {"label":"}", "x":12.5, "y":2.5},
439 {"label":"Delete", "x":15.25, "y":2.5},
440 {"label":"End", "x":16.25, "y":2.5},
441 {"label":"PgDn", "x":17.25, "y":2.5},
442
443 {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
444 {"label":"A", "x":1.75, "y":3.5},
445 {"label":"S", "x":2.75, "y":3.5},
446 {"label":"D", "x":3.75, "y":3.5},
447 {"label":"F", "x":4.75, "y":3.5},
448 {"label":"G", "x":5.75, "y":3.5},
449 {"label":"H", "x":6.75, "y":3.5},
450 {"label":"J", "x":7.75, "y":3.5},
451 {"label":"K", "x":8.75, "y":3.5},
452 {"label":"L", "x":9.75, "y":3.5},
453 {"label":":", "x":10.75, "y":3.5},
454 {"label":"\"", "x":11.75, "y":3.5},
455 {"label":"~", "x":12.75, "y":3.5},
456 {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
457
458 {"label":"Shift", "x":0, "y":4.5, "w":1.25},
459 {"label":"NUBS", "x":1.25, "y":4.5},
460 {"label":"Z", "x":2.25, "y":4.5},
461 {"label":"X", "x":3.25, "y":4.5},
462 {"label":"C", "x":4.25, "y":4.5},
463 {"label":"V", "x":5.25, "y":4.5},
464 {"label":"B", "x":6.25, "y":4.5},
465 {"label":"N", "x":7.25, "y":4.5},
466 {"label":"M", "x":8.25, "y":4.5},
467 {"label":"<", "x":9.25, "y":4.5},
468 {"label":">", "x":10.25, "y":4.5},
469 {"label":"?", "x":11.25, "y":4.5},
470 {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
471 {"label":"\u2191", "x":16.25, "y":4.5},
472
473 {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
474 {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
475 {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
476 {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
477 {"label":"Alt", "x":10, "y":5.5, "w":1.25},
478 {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
479 {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
480 {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
481 {"label":"\u2190", "x":15.25, "y":5.5},
482 {"label":"\u2193", "x":16.25, "y":5.5},
483 {"label":"\u2192", "x":17.25, "y":5.5}
484 ]
485 },
486 "LAYOUT_tkl_iso_tsangan": {
487 "layout": [
488 {"label":"Esc", "x":0, "y":0},
489 {"label":"F1", "x":2, "y":0},
490 {"label":"F2", "x":3, "y":0},
491 {"label":"F3", "x":4, "y":0},
492 {"label":"F4", "x":5, "y":0},
493 {"label":"F5", "x":6.5, "y":0},
494 {"label":"F6", "x":7.5, "y":0},
495 {"label":"F7", "x":8.5, "y":0},
496 {"label":"F8", "x":9.5, "y":0},
497 {"label":"F9", "x":11, "y":0},
498 {"label":"F10", "x":12, "y":0},
499 {"label":"F11", "x":13, "y":0},
500 {"label":"F12", "x":14, "y":0},
501 {"label":"PrtSc", "x":15.25, "y":0},
502 {"label":"Scroll Lock", "x":16.25, "y":0},
503 {"label":"Pause", "x":17.25, "y":0},
504
505 {"label":"~", "x":0, "y":1.5},
506 {"label":"!", "x":1, "y":1.5},
507 {"label":"@", "x":2, "y":1.5},
508 {"label":"#", "x":3, "y":1.5},
509 {"label":"$", "x":4, "y":1.5},
510 {"label":"%", "x":5, "y":1.5},
511 {"label":"^", "x":6, "y":1.5},
512 {"label":"&", "x":7, "y":1.5},
513 {"label":"*", "x":8, "y":1.5},
514 {"label":"(", "x":9, "y":1.5},
515 {"label":")", "x":10, "y":1.5},
516 {"label":"_", "x":11, "y":1.5},
517 {"label":"+", "x":12, "y":1.5},
518 {"label":"Bksp", "x":13, "y":1.5, "w":2},
519 {"label":"Insert", "x":15.25, "y":1.5},
520 {"label":"Home", "x":16.25, "y":1.5},
521 {"label":"PgUp", "x":17.25, "y":1.5},
522
523 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
524 {"label":"Q", "x":1.5, "y":2.5},
525 {"label":"W", "x":2.5, "y":2.5},
526 {"label":"E", "x":3.5, "y":2.5},
527 {"label":"R", "x":4.5, "y":2.5},
528 {"label":"T", "x":5.5, "y":2.5},
529 {"label":"Y", "x":6.5, "y":2.5},
530 {"label":"U", "x":7.5, "y":2.5},
531 {"label":"I", "x":8.5, "y":2.5},
532 {"label":"O", "x":9.5, "y":2.5},
533 {"label":"P", "x":10.5, "y":2.5},
534 {"label":"{", "x":11.5, "y":2.5},
535 {"label":"}", "x":12.5, "y":2.5},
536 {"label":"Delete", "x":15.25, "y":2.5},
537 {"label":"End", "x":16.25, "y":2.5},
538 {"label":"PgDn", "x":17.25, "y":2.5},
539
540 {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
541 {"label":"A", "x":1.75, "y":3.5},
542 {"label":"S", "x":2.75, "y":3.5},
543 {"label":"D", "x":3.75, "y":3.5},
544 {"label":"F", "x":4.75, "y":3.5},
545 {"label":"G", "x":5.75, "y":3.5},
546 {"label":"H", "x":6.75, "y":3.5},
547 {"label":"J", "x":7.75, "y":3.5},
548 {"label":"K", "x":8.75, "y":3.5},
549 {"label":"L", "x":9.75, "y":3.5},
550 {"label":":", "x":10.75, "y":3.5},
551 {"label":"\"", "x":11.75, "y":3.5},
552 {"label":"~", "x":12.75, "y":3.5},
553 {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
554
555 {"label":"Shift", "x":0, "y":4.5, "w":1.25},
556 {"label":"NUBS", "x":1.25, "y":4.5},
557 {"label":"Z", "x":2.25, "y":4.5},
558 {"label":"X", "x":3.25, "y":4.5},
559 {"label":"C", "x":4.25, "y":4.5},
560 {"label":"V", "x":5.25, "y":4.5},
561 {"label":"B", "x":6.25, "y":4.5},
562 {"label":"N", "x":7.25, "y":4.5},
563 {"label":"M", "x":8.25, "y":4.5},
564 {"label":"<", "x":9.25, "y":4.5},
565 {"label":">", "x":10.25, "y":4.5},
566 {"label":"?", "x":11.25, "y":4.5},
567 {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
568 {"label":"\u2191", "x":16.25, "y":4.5},
569
570 {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
571 {"label":"Win", "x":1.5, "y":5.5},
572 {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
573 {"label":"Space", "x":4, "y":5.5, "w":7},
574 {"label":"Win", "x":11, "y":5.5, "w":1.5},
575 {"label":"Menu", "x":12.5, "y":5.5},
576 {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
577 {"label":"\u2190", "x":15.25, "y":5.5},
578 {"label":"\u2193", "x":16.25, "y":5.5},
579 {"label":"\u2192", "x":17.25, "y":5.5}
580 ]
581 },
582 "LAYOUT_tkl_iso_wkl": {
583 "layout": [
584 {"label":"Esc", "x":0, "y":0},
585 {"label":"F1", "x":2, "y":0},
586 {"label":"F2", "x":3, "y":0},
587 {"label":"F3", "x":4, "y":0},
588 {"label":"F4", "x":5, "y":0},
589 {"label":"F5", "x":6.5, "y":0},
590 {"label":"F6", "x":7.5, "y":0},
591 {"label":"F7", "x":8.5, "y":0},
592 {"label":"F8", "x":9.5, "y":0},
593 {"label":"F9", "x":11, "y":0},
594 {"label":"F10", "x":12, "y":0},
595 {"label":"F11", "x":13, "y":0},
596 {"label":"F12", "x":14, "y":0},
597 {"label":"PrtSc", "x":15.25, "y":0},
598 {"label":"Scroll Lock", "x":16.25, "y":0},
599 {"label":"Pause", "x":17.25, "y":0},
600
601 {"label":"~", "x":0, "y":1.5},
602 {"label":"!", "x":1, "y":1.5},
603 {"label":"@", "x":2, "y":1.5},
604 {"label":"#", "x":3, "y":1.5},
605 {"label":"$", "x":4, "y":1.5},
606 {"label":"%", "x":5, "y":1.5},
607 {"label":"^", "x":6, "y":1.5},
608 {"label":"&", "x":7, "y":1.5},
609 {"label":"*", "x":8, "y":1.5},
610 {"label":"(", "x":9, "y":1.5},
611 {"label":")", "x":10, "y":1.5},
612 {"label":"_", "x":11, "y":1.5},
613 {"label":"+", "x":12, "y":1.5},
614 {"label":"Bksp", "x":13, "y":1.5, "w":2},
615 {"label":"Insert", "x":15.25, "y":1.5},
616 {"label":"Home", "x":16.25, "y":1.5},
617 {"label":"PgUp", "x":17.25, "y":1.5},
618
619 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
620 {"label":"Q", "x":1.5, "y":2.5},
621 {"label":"W", "x":2.5, "y":2.5},
622 {"label":"E", "x":3.5, "y":2.5},
623 {"label":"R", "x":4.5, "y":2.5},
624 {"label":"T", "x":5.5, "y":2.5},
625 {"label":"Y", "x":6.5, "y":2.5},
626 {"label":"U", "x":7.5, "y":2.5},
627 {"label":"I", "x":8.5, "y":2.5},
628 {"label":"O", "x":9.5, "y":2.5},
629 {"label":"P", "x":10.5, "y":2.5},
630 {"label":"{", "x":11.5, "y":2.5},
631 {"label":"}", "x":12.5, "y":2.5},
632 {"label":"Delete", "x":15.25, "y":2.5},
633 {"label":"End", "x":16.25, "y":2.5},
634 {"label":"PgDn", "x":17.25, "y":2.5},
635
636 {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
637 {"label":"A", "x":1.75, "y":3.5},
638 {"label":"S", "x":2.75, "y":3.5},
639 {"label":"D", "x":3.75, "y":3.5},
640 {"label":"F", "x":4.75, "y":3.5},
641 {"label":"G", "x":5.75, "y":3.5},
642 {"label":"H", "x":6.75, "y":3.5},
643 {"label":"J", "x":7.75, "y":3.5},
644 {"label":"K", "x":8.75, "y":3.5},
645 {"label":"L", "x":9.75, "y":3.5},
646 {"label":":", "x":10.75, "y":3.5},
647 {"label":"\"", "x":11.75, "y":3.5},
648 {"label":"~", "x":12.75, "y":3.5},
649 {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
650
651 {"label":"Shift", "x":0, "y":4.5, "w":1.25},
652 {"label":"NUBS", "x":1.25, "y":4.5},
653 {"label":"Z", "x":2.25, "y":4.5},
654 {"label":"X", "x":3.25, "y":4.5},
655 {"label":"C", "x":4.25, "y":4.5},
656 {"label":"V", "x":5.25, "y":4.5},
657 {"label":"B", "x":6.25, "y":4.5},
658 {"label":"N", "x":7.25, "y":4.5},
659 {"label":"M", "x":8.25, "y":4.5},
660 {"label":"<", "x":9.25, "y":4.5},
661 {"label":">", "x":10.25, "y":4.5},
662 {"label":"?", "x":11.25, "y":4.5},
663 {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
664 {"label":"\u2191", "x":16.25, "y":4.5},
665
666 {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
667 {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
668 {"label":"Space", "x":4, "y":5.5, "w":7},
669 {"label":"Alt", "x":11, "y":5.5, "w":1.5},
670 {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
671 {"label":"\u2190", "x":15.25, "y":5.5},
672 {"label":"\u2193", "x":16.25, "y":5.5},
673 {"label":"\u2192", "x":17.25, "y":5.5}
674 ]
293 } 675 }
294 } 676 }
295} 677}
diff --git a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
index 70d05e7b9..f2e62ec6c 100644
--- a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
+++ b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
@@ -17,20 +17,20 @@
17 17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 19
20 [0] = LAYOUT_all( 20 [0] = LAYOUT_all(
21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
22 KC_GRV, 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_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, 22 KC_GRV, 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_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP,
23 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_BSPC, KC_DEL, KC_END, KC_PGDN, 23 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_BSPC, KC_DEL, KC_END, KC_PGDN,
24 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, 24 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,
25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, 25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
27 27
28 [1] = LAYOUT_all( 28 [1] = LAYOUT_all(
29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, 29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, 31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
35 35
36}; 36};
diff --git a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
index a81dface9..9ad66c923 100644
--- a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
+++ b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
@@ -17,36 +17,36 @@
17 17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 19
20 [0] = LAYOUT_all( 20 [0] = LAYOUT_all(
21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
22 KC_GRV, 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_GRV, KC_INS, KC_HOME, KC_PGUP, 22 KC_GRV, 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_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP,
23 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_DEL, KC_END, KC_PGDN, 23 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_BSPC, KC_DEL, KC_END, KC_PGDN,
24 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, 24 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,
25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, 25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
27 27
28 [1] = LAYOUT_all( 28 [1] = LAYOUT_all(
29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, 29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, 31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
35 35
36 [2] = LAYOUT_all( 36 [2] = LAYOUT_all(
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, 37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, 39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
43 43
44 [3] = LAYOUT_all( 44 [3] = LAYOUT_all(
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
51 51
52}; 52};
diff --git a/keyboards/nix_studio/oxalys80/oxalys80.h b/keyboards/nix_studio/oxalys80/oxalys80.h
index a4f36b2ac..2a9f789b5 100644
--- a/keyboards/nix_studio/oxalys80/oxalys80.h
+++ b/keyboards/nix_studio/oxalys80/oxalys80.h
@@ -17,29 +17,185 @@
17 17
18#include "quantum.h" 18#include "quantum.h"
19 19
20#define ___ KC_NO
21
22/* LAYOUT_all
23 * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
24 * │00 │ │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │15 │06 │16 │ │07 │17 │08 │
25 * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
26 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───────┐
27 * │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │66 │ │27 │37 │28 │ │36 │ 2u Backspace
28 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ └─┬─────┤
29 * │40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │ │47 │57 │48 │ │ │
30 * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐76 │ ISO Enter
31 * LShift │60 │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │76 │ │56 │ │
32 * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ┌─┴───┴────┤
33 * │80 │ │80 │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86 │96 │ │97 │ │86 │ 2.75u RShift
34 * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘
35 * │A0 │B0 │A1 │A3 │A5 │B5 │A6 │B6 │ │A7 │B7 │A8 │
36 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
37 * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
38 * │A0 │B0 │A1 │A3 │B5 │A6 │B6 │ Tsangan
39 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
40 * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
41 * │A0 │ │A1 │A3 │B5 │ │B6 │ WKL
42 * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘
43 */
44
20// This a shortcut to help you visually see your layout. 45// This a shortcut to help you visually see your layout.
21// The following is an example using the Planck MIT layout
22// The first section contains all of the arguments 46// The first section contains all of the arguments
23// The second converts the arguments into a two-dimensional array 47// The second converts the arguments into a two-dimensional array
24 48
25#define LAYOUT_all(\ 49#define LAYOUT_all(\
26 K000, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \ 50 K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
27 K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K066, K027, K037, K028, \ 51 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K66, K27, K37, K28, \
28 K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \ 52 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, \
29 K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, \ 53 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \
30 K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K096, K097, \ 54 K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K97, \
31 K100, K110, K101, K103, K105, K115, K106, K116, K107, K117, K108 \ 55 KA0, KB0, KA1, KA3, KA5, KB5, KA6, KB6, KA7, KB7, KA8 \
56) { \
57 { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
58 { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
59 { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
60 { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
61 { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
62 { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
63 { K60, K61, K62, K63, K64, K65, K66, ___, ___ }, \
64 { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
65 { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
66 { K90, K91, K92, K93, K94, K95, K96, K97, ___ }, \
67 { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
68 { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ } \
69}
70
71#define LAYOUT_tkl_ansi(\
72 K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
73 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, \
74 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, \
75 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \
76 K80, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K97, \
77 KA0, KB0, KA1, KA3, KA5, KB5, KA6, KB6, KA7, KB7, KA8 \
78) { \
79 { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
80 { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
81 { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
82 { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
83 { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
84 { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
85 { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
86 { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
87 { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
88 { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
89 { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
90 { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ } \
91}
92
93#define LAYOUT_tkl_ansi_tsangan(\
94 K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
95 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, \
96 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, \
97 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \
98 K80, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K97, \
99 KA0, KB0, KA1, KA3, KB5, KA6, KB6, KA7, KB7, KA8 \
100) { \
101 { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
102 { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
103 { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
104 { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
105 { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
106 { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
107 { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
108 { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
109 { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
110 { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
111 { KA0, KA1, ___, KA3, ___, ___, KA6, KA7, KA8 }, \
112 { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ } \
113}
114
115#define LAYOUT_tkl_ansi_wkl(\
116 K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
117 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, \
118 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, \
119 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \
120 K80, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K97, \
121 KA0, KA1, KA3, KB5, KB6, KA7, KB7, KA8 \
122) { \
123 { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
124 { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
125 { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
126 { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
127 { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
128 { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
129 { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
130 { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
131 { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
132 { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
133 { KA0, KA1, ___, KA3, ___, ___, ___, KA7, KA8 }, \
134 { ___, ___, ___, ___, ___, KB5, KB6, KB7, ___ } \
135}
136
137#define LAYOUT_tkl_iso(\
138 K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
139 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, \
140 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, K57, K48, \
141 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76, \
142 K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K97, \
143 KA0, KB0, KA1, KA3, KA5, KB5, KA6, KB6, KA7, KB7, KA8 \
144) { \
145 { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
146 { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
147 { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
148 { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
149 { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
150 { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
151 { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
152 { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
153 { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
154 { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
155 { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
156 { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ } \
157}
158
159#define LAYOUT_tkl_iso_tsangan(\
160 K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
161 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, \
162 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, K57, K48, \
163 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76, \
164 K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K97, \
165 KA0, KB0, KA1, KA3, KB5, KA6, KB6, KA7, KB7, KA8 \
166) { \
167 { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
168 { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
169 { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
170 { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
171 { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
172 { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
173 { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
174 { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
175 { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
176 { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
177 { KA0, KA1, ___, KA3, ___, ___, KA6, KA7, KA8 }, \
178 { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ } \
179}
180
181#define LAYOUT_tkl_iso_wkl(\
182 K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
183 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, \
184 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, K57, K48, \
185 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76, \
186 K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K97, \
187 KA0, KA1, KA3, KB5, KB6, KA7, KB7, KA8 \
32) { \ 188) { \
33 { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \ 189 { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
34 { KC_NO, K011, K012, K013, K014, K015, K016, K017, KC_NO }, \ 190 { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
35 { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \ 191 { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
36 { K030, K031, K032, K033, K034, K035, K036, K037, KC_NO }, \ 192 { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
37 { K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \ 193 { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
38 { K050, K051, K052, K053, K054, K055, K056, K057, KC_NO }, \ 194 { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
39 { K060, K061, K062, K063, K064, K065, K066, KC_NO, KC_NO }, \ 195 { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
40 { K070, K071, K072, K073, K074, K075, K076, KC_NO, KC_NO }, \ 196 { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
41 { K080, K081, K082, K083, K084, K085, K086, KC_NO, KC_NO }, \ 197 { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
42 { K090, K091, K092, K093, K094, K095, K096, K097, KC_NO }, \ 198 { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
43 { K100, K101, KC_NO, K103, KC_NO, K105, K106, K107, K108 }, \ 199 { KA0, KA1, ___, KA3, ___, ___, ___, KA7, KA8 }, \
44 { K110, KC_NO, KC_NO, KC_NO, KC_NO, K115, K116, K117, KC_NO } \ 200 { ___, ___, ___, ___, ___, KB5, KB6, KB7, ___ } \
45} 201}
diff --git a/keyboards/nix_studio/oxalys80/readme.md b/keyboards/nix_studio/oxalys80/readme.md
index 44ad7e828..a1b009ebe 100644
--- a/keyboards/nix_studio/oxalys80/readme.md
+++ b/keyboards/nix_studio/oxalys80/readme.md
@@ -1,43 +1,49 @@
1oxalys80 1# OXALYS80
2===
3 2
4A QMK-powered replacement PCB for custom TKL keyboards. This PCB has the same size of the b.87 PCB, Hiney H87a, KBD8X. 3A QMK-powered replacement PCB for custom TKL keyboards. This PCB has the same size of the b.87 PCB, Hiney H87a, and KBD8X.
5 4
6Keyboard Maintainer: [Nix Studio](https://github.com/Nix-Studio) 5* Keyboard Maintainer: [Nix Studio](https://github.com/Nix-Studio)
7Hardware Supported: oxalys80 ver. 1.0 6* Hardware Supported: oxalys80 ver. 1.0
8Hardware Availability: [Nix Studio](https://www.instagram.com/nix.studio/) 7* Hardware Availability: [Nix Studio](https://www.instagram.com/nix.studio/)
9 8
10Make example for this keyboard (after setting up your build environment): 9Make example for this keyboard (after setting up your build environment):
11 10
12 make nix_studio/oxalys80:default 11 make nix_studio/oxalys80:default
13 12
13Flashing example for this keyboard:
14
15 make nix_studio/oxalys80:default:flash
16
14See 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). 17See 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).
15 18
16## oxalys80 hardware information 19## OXALYS80 Hardware Information
20
21Controller: ATmega32U4
22
23### Column Pin Configuration
24
25| col: | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |
26|------|----|----|----|----|----|----|----|----|----|
27| pin: | F0 | F1 | F4 | F5 | F6 | F7 | C7 | B0 | B1 |
28
29### Row Pin Configuration
30
31| row: | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 |
32|------|----|----|----|----|----|----|----|----|----|----|----|----|
33| pin: | C6 | B6 | B5 | B4 | D7 | D6 | D4 | D5 | D3 | D2 | D1 | D0 |
17 34
18Controller: Atmega32u4 35The OXALYS80 PCB utilizes duplex matrix organization.
19 36
20 /* Column pin configuration 37### LED Pins
21 * col: 0 1 2 3 4 5 6 7 8
22 * pin: F0 F1 F4 F5 F6 F7 C7 B0 B1
23 */
24
25 /* Row pin configuration
26 * row: 0 1 2 3 4 5 6 7 8 9 10 11
27 * pin: C6 B6 B5 B4 D7 D6 D4 D5 D3 D2 D1 D0
28 */
29
30The oxalys PCB utilizes duplex matrix organization.
31 38
32 Caps Lock LED: E6 39* Caps Lock LED: E6
33 Scroll Lock LED: B2 40* Scroll Lock LED: B2
34 Num Lock LED: not supported 41* Num Lock LED: not supported
35 Backlight Pin: B7 42* Backlight Pin: B7
36 RGB Data Pin: B3 43* RGB Data Pin: B3
37
38 44
45## In-switch Indicators
39 46
40In-switch indicators:
41To connect the Caps Lock LED to the main backlight matrix, turn switch to top position on SW3. To use the Caps Lock LED as an indicator, turn switch to bottom position on SW3. 47To connect the Caps Lock LED to the main backlight matrix, turn switch to top position on SW3. To use the Caps Lock LED as an indicator, turn switch to bottom position on SW3.
42 48
43To connect the Scroll Lock LED to the main backlight matrix, turn switch to left position on SW2. To use the Scroll Lock LED as an indicator, turn switch to right position on SW2. 49To connect the Scroll Lock LED to the main backlight matrix, turn switch to left position on SW2. To use the Scroll Lock LED as an indicator, turn switch to right position on SW2.
diff --git a/keyboards/nix_studio/oxalys80/rules.mk b/keyboards/nix_studio/oxalys80/rules.mk
index cc0852ead..3da643f9f 100644
--- a/keyboards/nix_studio/oxalys80/rules.mk
+++ b/keyboards/nix_studio/oxalys80/rules.mk
@@ -10,14 +10,16 @@ BOOTLOADER = atmel-dfu
10BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite 10BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
11MOUSEKEY_ENABLE = yes # Mouse keys 11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration 14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = no # USB Nkey Rollover 18NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default 19BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable RGB underglow 20RGBLIGHT_ENABLE = yes # Enable RGB underglow
21UNICODE_ENABLE = no # Unicode 21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output 22AUDIO_ENABLE = no # Audio output
23LTO_ENABLE = yes 23LTO_ENABLE = yes
24
25LAYOUTS = tkl_ansi tkl_iso