summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow larger SPLIT_USB_TIMEOUT with default SPLIT_USB_TIMEOUT_POLL (#17272)Dasky2022-06-011-1/+2
| | | | | * Switch SPLIT_USB_DETECT loop to uint16_t * Add assertion
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-312-2/+2
|\
| * move RESET to QK_BOOT (#17278)Carlo Sala2022-05-312-2/+2
| | | | | | | | | | * move RESET to QK_BOOT * fix tapping_term
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-311-1/+1
|\|
| * Add trailing parens to `get_oneshot_mods` in feature_advanced_keycodes.md ↵Forrest Cahoon2022-05-311-1/+1
| | | | | | | | (#17211)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-311-1/+2
|\|
| * [Keyboard] fix dz64rgb rgb sleep (#17209)moyi46812022-05-311-1/+2
| |
* | Make bootloader_jump for dualbank STM32 respect ↵Thomas Preisner2022-05-302-3/+3
| | | | | | | | STM32_BOOTLOADER_DUAL_BANK_DELAY (#17178)
* | Improve PS/2 mouse performance (#17111)Andrew Dunai2022-05-304-6/+22
| |
* | Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK (#17099)precondition2022-05-301-1/+1
| |
* | Removes terminal from QMK. (#17258)Nick Brassel2022-05-3044-663/+38
| |
* | Make SPI Mode configurable and change default mode to 3 (#17263)trwnh2022-05-312-1/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-3159-768/+671
|\|
| * [Keymap] Drashna update for post Q2 merge (#17241)Drashna Jaelre2022-05-3059-768/+671
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-311-1/+1
|\|
| * Change AW20216 SPI Mode from 0 to 3, to fix RGB LEDs on GMMK Pro (#17262)trwnh2022-05-311-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-314-136/+223
|\|
| * Nix shell updates (#17243)Sergey Vlasov2022-05-314-136/+223
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-3112-789/+653
|\|
| * Convert ergodone to use core mcp23018 driver (#17005)Joel Challis2022-05-3112-789/+653
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-305-20/+33
|\|
| * Fix various lint errors (#17255)Joel Challis2022-05-305-20/+33
| | | | | | | | | | * Fix various lint errors * reduce complexity
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-302-2/+2
|\|
| * Fix docs typo (#17254)Dasky2022-05-302-2/+2
| |
* | Add uf2-split-* make targets. (#17257)Dasky2022-05-314-2/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-3013-0/+983
|\|
| * [Keyboard] Add str.merro60 pcb (#17097)chalex2022-05-3013-0/+983
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local> Co-authored-by: chalex <chlxbsmt@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-303-13/+27
|\|
| * [Keymap] Updates to layouts/community/ortho_4x12/junonum (#17249)Juno Nguyen2022-05-303-13/+27
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-308-6/+56
|\|
| * [Keymap] Update sethbarberee code to QK_BOOT and try out DVVORAK (#17230)Seth Barberee2022-05-308-6/+56
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-304-4/+30
|\|
| * Fix API errors (#17239)Joel Challis2022-05-304-4/+30
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-291-1/+1
|\|
| * Use correct container for unit test workflow (#17242)Joel Challis2022-05-291-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-291-0/+1
|\|
| * Fix quark_lp via firmware size (#17233)Joel Challis2022-05-291-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-294-22/+45
|\|
| * Fixup iron165r2 (#17119)jack2022-05-294-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | * initial * revert some defines * formatting * apply changes * update readme * suggestion
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-281-23/+37
|\|
| * Fixup command sequencing for master/develop. (#17227)Nick Brassel2022-05-291-23/+37
| |
* | Branch point after 2022-05-28 Breaking Change.Nick Brassel2022-05-291-0/+4
| |
* | Merge branch 'master' into developNick Brassel2022-05-290-0/+0
|\|
| * Merge branch 'develop' -- breaking changes 2022-05-28.Nick Brassel2022-05-292860-9639/+19576
| |\ | |/ |/|
* | Merge point for 2022-05-28 Breaking ChangeNick Brassel2022-05-291-4/+0
| |
* | Breaking changes for 2022q2. (#17221)Nick Brassel2022-05-293-44/+99
| |
* | Refactor legacy quantum keycodes in default-ish keymaps (#17150)Joel Challis2022-05-2711-13/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-252-1/+19
|\|
| * Small update to Symmetric70 keyboard readme (#17188)Takeshi ISHII2022-05-252-1/+19
| | | | | | Added a little description to reademe.md under `handwired/symmetric70_proto/{matrix_debug|matrix_fast}`.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-241-2/+24
|\|