summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] Add Mojo68 for Melgeek (#13578)bomb
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] Add Emi20 (#13603)AquaCylinder
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] add cherryb studio cb1800 keyboard (#13639)DA
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] Add X-Bows Ranger Keyboard (#13660)X-Bows Tech
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29[Keymap] Jonavin keymap Mercutio add win key lockout function (#13670)Jonavin
Co-authored-by: Jonavin <=>
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] Add halfcliff keyboard (#13515)N2-Sumikko
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] Add GetawayVan (#13412)ESCA47
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] Added Orthocode keyboard (#13487)Jordan Blackbourn
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29Fix unit tests after recent refactor (#13765)Joel Challis
2021-07-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-28Allison Numpad: Configurator fix for LAYOUT_numpad_6x4 (#13759)James Young
* info.json: human-friendly formatting - one key object per line; line breaks between physical rows - four-space indent - remove trailing whitespace * info.json: correct key object order for LAYOUT_numpad_6x4
2021-07-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-28Update "make format" message (#13741)Ryan
* Update "make format" message * Add examples for `qmk` command as well
2021-07-28Minor tidy up of key overrides (#13747)Joel Challis
* Minor tidy up of key overrides * Update quantum/quantum.c * Update quantum/quantum.c
2021-07-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-28matrix_scan_x -> x_task (#13748)Joel Challis
2021-07-28fix: Fix typo in documentation for one shot keys. ON_TOGG -> OS_TOGG (#13754)Shane Celis
`ON_TOGG` doesn't exist in the codebase.
2021-07-28Allow for higher USB Polling rate on ATSAM boards (#13755)Drashna Jaelre
2021-07-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-28[Keyboard] fix short circuit in led_update_kb for quefrency rev3 (#13752)Jonavin
Co-authored-by: Jonavin <=>
2021-07-27Remove some legacy files (#13715)Joel Challis
2021-07-27Align AW20216 driver (#13712)Joel Challis
* Align AW20216 driver * Update drivers/awinic/aw20216.h Co-authored-by: Ryan <fauxpark@gmail.com> * Review comments * formatting fixes * stop if start failed? * review comments Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-27Fix typo in Dactyl Manuform (#13740)Ryan
2021-07-27Dactyl Manuform cleanup (#13686)Ryan
2021-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-26[Docs] Add `default` case in Tap Dance Example 6 (#13727)ForsakenRei
Added a `default` case in `switch(ql_tap_state.state)` at line 493 and 494. Without it compile firmware with Example 6 code will encounter 2 errors: `enumeration value 'TD_NONE' not handled in switch` `enumeration value 'TD_UNKNOWN' not handled in switch`
2021-07-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-26[Keyboard] Ares refactor (#13730)James Young
2021-07-26[Keyboard] Add RGB matrix support for Kyria (#12789)Albert Y
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-27Reduce firmware size in prep for #12670 (#13724)Drashna Jaelre
* Reduce firmware size in pre for #12670 * Also disable pixel mode, just in case
2021-07-26[Keyboard] Update kyria make path example (#13720)Albert Y
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-26[Keymap] Drashna's Defaults cleanup (#13722)Drashna Jaelre
2021-07-27Remove legacy BACKLIGHT_CUSTOM_DRIVER option (#13731)Joel Challis
2021-07-27Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-07-27Add bootloader size (#13729)datafx
* Add bootloader size Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic * Include dz60rgb v2.1 Add boot loader size to this pcb also
2021-07-2640percentclub/nein: update info.json layout macro reference (#13726)James Young
- change LAYOUT to LAYOUT_ortho_3x3
2021-07-26[Keyboard Update] Change to L422 (#13717)Xelus22
* change to L422 * Add bootloader Co-authored-by: Ryan <fauxpark@gmail.com> * add bootloader Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" ↵Cyril
(#13456) This reverts commit e25f05224f1c06aeed13b2e99e8e755af65ac689.
2021-07-25[Keyboard] Valor Rev 2 (#13551)Xelus22
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25[Bug] Include gpio.h in solenoid driver for GPIO Control functions (#13716)Drashna Jaelre
2021-07-25[Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>