summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-281-5/+14
|\
| * Update "make format" message (#13741)Ryan2021-07-281-5/+14
| | | | | | | | | | * Update "make format" message * Add examples for `qmk` command as well
* | Minor tidy up of key overrides (#13747)Joel Challis2021-07-285-39/+17
| | | | | | | | | | | | | | * Minor tidy up of key overrides * Update quantum/quantum.c * Update quantum/quantum.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-281-1/+1
|\|
| * fix: Fix typo in documentation for one shot keys. ON_TOGG -> OS_TOGG (#13754)Shane Celis2021-07-281-1/+1
| | | | | | `ON_TOGG` doesn't exist in the codebase.
* | matrix_scan_x -> x_task (#13748)Joel Challis2021-07-2813-31/+27
| |
* | Allow for higher USB Polling rate on ATSAM boards (#13755)Drashna Jaelre2021-07-281-3/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-281-1/+1
|\|
| * [Keyboard] fix short circuit in led_update_kb for quefrency rev3 (#13752)Jonavin2021-07-281-1/+1
| | | | | | Co-authored-by: Jonavin <=>
* | Remove some legacy files (#13715)Joel Challis2021-07-277-173/+0
| |
* | Align AW20216 driver (#13712)Joel Challis2021-07-273-90/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Fix typo in Dactyl Manuform (#13740)Ryan2021-07-271-1/+1
| |
* | Dactyl Manuform cleanup (#13686)Ryan2021-07-2754-1554/+1409
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-271-0/+2
|\|
| * [Docs] Add `default` case in Tap Dance Example 6 (#13727)ForsakenRei2021-07-261-0/+2
| | | | | | | | | | | | 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`
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-276-46/+290
|\|
| * [Keyboard] Ares refactor (#13730)James Young2021-07-266-46/+290
| |
* | [Keyboard] Add RGB matrix support for Kyria (#12789)Albert Y2021-07-263-0/+38
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: filterpaper <filterpaper@localhost>
* | Reduce firmware size in prep for #12670 (#13724)Drashna Jaelre2021-07-2712-18/+55
| | | | | | | | | | * Reduce firmware size in pre for #12670 * Also disable pixel mode, just in case
* | [Keyboard] Update kyria make path example (#13720)Albert Y2021-07-261-2/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | [Keymap] Drashna's Defaults cleanup (#13722)Drashna Jaelre2021-07-2650-1396/+993
| |
* | Remove legacy BACKLIGHT_CUSTOM_DRIVER option (#13731)Joel Challis2021-07-274-10/+2
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-2726-559/+394
|\|
| * Add bootloader size (#13729)datafx2021-07-272-0/+2
| | | | | | | | | | | | | | | | | | * 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
| * 40percentclub/nein: update info.json layout macro reference (#13726)James Young2021-07-261-1/+1
| | | | | | - change LAYOUT to LAYOUT_ortho_3x3
| * Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" ↵Cyril2021-07-252-4/+4
| | | | | | | | | | (#13456) This reverts commit e25f05224f1c06aeed13b2e99e8e755af65ac689.
| * [Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb2021-07-251-0/+2
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Update ZSA Keyboard Readmes and keymaps (#13041)Drashna Jaelre2021-07-2520-555/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Update ZSA Keyboard Readmes and keymaps * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Remove custom rgb code for RGB_M_P * Fix inevitable typo Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/planck/ez/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard Update] Change to L422 (#13717)Xelus222021-07-262-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | [Keyboard] Valor Rev 2 (#13551)Xelus222021-07-2516-0/+672
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Bug] Include gpio.h in solenoid driver for GPIO Control functions (#13716)Drashna Jaelre2021-07-251-0/+1
| |
* | Haptic: driver-> feature (#13713)Joel Challis2021-07-257-138/+177
| |
* | [Keyboard] Fix up SplitKB keyboards (#13511)Drashna Jaelre2021-07-25111-314/+1012
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-255-6/+59
|\|
| * Allow output of logging when running unit tests (#13556)Joel Challis2021-07-255-6/+59
| | | | | | | | | | | | | | | | | | | | | | * Initial pass at enabling logging for unit tests * Add to docs * Bind debug for more test types * Force everything * Tidy up slightly
* | Update LUFA (18-07-2021) and add QMK-HID Bootloader support (#13588)Drashna Jaelre2021-07-246-9/+80
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Fix compile size for the Vitamins Included via keymap (#13696)Drashna Jaelre2021-07-254-20/+24
| |
* | docs/cli_commands: fix typo (#13697)Marc Tamsky2021-07-251-1/+1
| |
* | dirty fix (#13695)Dasky2021-07-253-1/+4
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-2520-42/+307
|\|
| * [Keyboard] Fix keymaps for clueboard 66_hotswap (#13694)Drashna Jaelre2021-07-259-0/+242
| | | | | | | | | | | | | | * [Keyboard] Fix default keymap for clueboard proto * Fix keymaps, because they're not actually revision compatible * Add copyright headers
| * Refactor some platform dependent logic (#13675)Joel Challis2021-07-2411-46/+65
| |
* | [Keyboard] Fix compile size for the Lets Split Sockets via keymap (#13691)Drashna Jaelre2021-07-252-5/+2
| |
* | [Keyboard] Fix Compile size on ungodly Launch Pad (#13692)Drashna Jaelre2021-07-251-0/+8
| |
* | Fix & clean up tronguylabs/m122_3270 (#13684)Ryan2021-07-2514-347/+318
| |
* | [Keyboard] Fix compile size for the Merge UM70 via keymap (#13690)Drashna Jaelre2021-07-251-1/+4
| |
* | Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines (#13689)Drashna Jaelre2021-07-2420-125/+64
| |
* | [Keyboard] Fix Q1 change dip switch to bool (#13687)Dasky2021-07-241-12/+13
| |
* | [Docs] Fix typo in dip switch example (#13688)Dasky2021-07-241-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2412-0/+590
|\|