summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Remove more cruft from Lily58 default keymap (#12078)Dan Carroll
* Remove more cruft from lily58 default keymap * Update keyboards/lily58/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h Remove extra newline Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081)Drashna Jaelre
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01[Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID (#11974)Trevor Elliott
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01[Keyboard] Update eggman info.json (#12074)qpockets
attempting to fix qmk configurator issues
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Fix the typo in ergodone 80 layout (#12075)Mega Mind
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Revert "Fixing K-type RGB lighting (#11551)" (#12065)Nick Brassel
This reverts commit e6f7da403676b491ac278d5b793d18a0d114477e.
2021-03-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01Fixing adjust layer issue with the lily58 default keymap (#12052)Dan Carroll
* Fix triggering of adjust layer in default lily58 keymap * Remove unused extern * Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist
2021-03-01Format code according to conventions (#12076)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-01Add ability to toggle One Shot functionality (#4198)Drashna Jaelre
Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01Bastardkb added keyboard and renaming (#11887)Quentin
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Migrate make_dfu_header to CLI (#12061)Joel Challis
* Migrate make_dfu_header to CLI * lint fixes * Update lib/python/qmk/cli/generate/dfu_header.py Co-authored-by: Ryan <fauxpark@gmail.com> * Rename object Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Fix generated file output while target exists (#12062)Joel Challis
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01Extract sendstring into its own compilation unit (#12060)Ryan
* Extract sendstring into its own compilation unit * License headers? * Put this include in the header
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Remove unused keymap_config from ctrl keymaps (#12058)Joel Challis
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Modified tmk_core/rules.mk to avoid linking errors (#10728)Fabián González Martín
* Modified tmk_core/rules.mk to avoid linking errors Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made * Comment updated
2021-02-28Format code according to conventions (#12056)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-28Refactor of USB code within split_common (#11890)Joel Challis
* Initial refactor of usb code within split_common * Add headers * Correct disable condition * Format * Align func name
2021-02-28ARM - Refactor SLEEP_LED to support more platforms (#8403)Joel Challis
* Initial refactor of ARM SLEEP_LED to enable more platforms * fix build issues * Disable SLEEP_LED for boards with no caps lock code * Enable GPT14 for boards with caps lock code and SLEEP_LED enabled * Enable GPT for boards with caps lock code and SLEEP_LED enabled
2021-02-28Overhaul bootmagic logic to have single entrypoint (#8532)Joel Challis
* Relocate bootmagic logic to have single entrypoint * Align init of layer state
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Implement PLOOPY_DRAGSCROLL_INVERT option, which inverts the ploopy ↵Anomalocaridid
trackball's DRAG_SCROLL's vertical scroll direction. (#12032)
2021-02-28Add RGB Matrix support for Preonic rev3 (#12008)Albert Y
* Add g_led_config for RGB Matrix support * Corrected indentation * Undo indentation on existing rev3.c code Co-authored-by: filterpaper <filterpaper@localhost>
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Kiko's Lab KL-90: Configurator bugfix (#11993)James Young
* human-friendly formatting * correct key order * correct layout macro name
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Keycapsss Kimiko rev1: Configurator bugfix (#11992)James Young
* human-friendly formatting * fix key positioning and order
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28[Keyboard] Update spiderisland/split78 (#11990)unrelentingtech
* [Keyboard] spiderisland/split78: add MCP23018 reset code Now, communication with the right side gets re-established after unplugging it and plugging it back in. * [Keyboard] spiderisland/split78: configure debouncing I've been experiencing particularly bad bounce on the 'A' key. Also, update maintainer github username
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Update lazydesigners/the40 (#11989)jackytrabbit
* Update the40.h Update the40.h to fix keymap * Add VIA support for lazydesigners/the40 Add VIA support for lazydesigners/the40 * Update keymap.c
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Compilation fixes for handwired/concertina/64key (#11987)James Young
* concatenate config.h to 64key directory * move rules.mk to 64key directory This commit makes the firmware actually compile. * insert complete rules.mk contents Conforms the file to QMK's template. * move info.json to 64key directory * remove concertina.h This file no longer serves a purpose now that everything is in the 64key directory. * complete 64key readme.md Conforms the file more to QMK's template.
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28New Variants of Console Keyboard (#11973)gazeddy
* initial push of console keyboard variants * update readme * fixed compilation issue * update Readme * added 18 and 27 key variants * missed commas * update info.json * added readme * correct info.json * correct info.json * info.json again * fixed keymap.c
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28[Keymap] Initial commit for keyboardio/atreus/dshields keymap. (#11946)Daniel Shields
Incorporating changes suggested during pull request review. Co-authored-by: Daniel Shields <dshields@cboe.com>
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot