summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Add RGB Matrix suspend wake functions to BM40 (#12246)Albert Y
* Add suspend wake functions for RGB Matrix * Add suspension RGB functions to Planck/rev6 and Preonic/rev3 * Add suspend wake to Mark 65 * Revert changes to planck and preonic * Remove changes to The Mark65 Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25add massdrop/alt/hlmtre keymap, add .exe to gitignore (#12191)Matt W
* add massdrop/alt/hlmtre keymap, add .exe to gitignore * changes request in PR (license header and fix gitignore) Co-authored-by: Matt Weller <matthew.weller@nvih.org>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md ↵Blake
(#12221) * Daisy first commit buggy * buggy still underglow crash * Daisy V1 * ReadMe Updates
2021-03-25Add suspend wake functions for The Mark:65's RGB Matrix (#12245)Albert Y
* Add suspend wake functions for RGB Matrix * Add USB suspend definition to config.h Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Fix handling multiples of the same MIDI note (fixes bug brought up in issue ↵jakobkg
#10199) (#11639) * Fix handling multiples of the same MIDI note * Extend MIDI note status to fix note releases
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25TKC GodSpeed75: add RGB LED support (#12278)TerryMathews
* GodSpeed75: add RGB support * GodSpeed75: minor updates * GodSpeed75: minor updates * GodSpeed75: restore chconf.h * GodSpeed75: restore chconf.h * GodSpeed75: restore chconf.h
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25add via support for bm68rgb (#12275)peepeetee
* add via support for bm68rgb * add newline to keymap.c
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Add XT65 keyboard (#11998)kopibeng
* Add XT65 keyboard * Create readme.md * Updated readme.md and rules.mk * Updated config.h and readme.md * Update imgur link * Update keyboards/kopibeng/xt65/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/kopibeng/xt65/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/kopibeng/xt65/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kopibeng/xt65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kopibeng/xt65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kopibeng/xt65/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kopibeng/xt65/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25added twelvekey (#12281)kb-elmo
* added twelvekey * rename layout
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25ISO Layouts fix (#12319)Matteo Montemarani
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25update shell.nix (#12295)André Silva
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Improve upon the 'Caveats' section of the Layers and Mod-Tap documentation ↵Purdea Andrei
(#12306) * Improve upon the 'Caveats' section of the Layers and Mod-Tap documentation * Update docs/mod_tap.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update docs/feature_layers.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update docs/mod_tap.md Co-authored-by: Ryan <fauxpark@gmail.com> * Added a line saying that remote desktop problems may also be mitigated by defining TAP_CODE_DELAY * Update docs/mod_tap.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25handwired/bolek: correct key object order (#12356)James Young
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Add a `qmk format-json` command that will format JSON files (#12372)Zach White
* Add a command to format json files * change to work after rebase * add test for qmk format-json * add documentation for qmk format-json * Update lib/python/qmk/cli/format/json.py
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Added wilba.tech WT60-H2 (#12348)Wilba
* Added wilba.tech WT60-H2 * fix typo * Fix error in keymap
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Added wilba.tech WT65-G2 (#12360)Wilba
2021-03-25Added wilba.tech WT60-H3 (#12354)Wilba
* Added wilba.tech WT60-H2 * fix typo
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25(Re)Fixing K-type RGB lighting (#12084)Andrew-Fahmy
* initial rgb driver fix * added underglow LEDs and fixed typo in RGB locations * removed test code * added my key maps * updated rgb keymap to work with changes * refactored my code to make it more maintainable and updated keymaps. * added GPL licence * Turned off matrix scan rate debug info * added checks if RGB matrix is enabled to fix errors when building keymaps without RGB matrix enabled * Apply suggestions from code review by fauxpark Co-authored-by: Ryan <fauxpark@gmail.com> * Renamed led driver file to be less ambiguous * Renamed is31fl3733 driver files to is31fl3733-dual Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25add equator (#12369)Brandon Claveria
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Fix USER_PRINT on avr/atsam (#12269)Joel Challis
* Fix USER_PRINT on avr/atsam * Update tmk_core/common/arm_atsam/_print.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25Adding keyboard level weak function for slave matrix scan (#12317)XScorpion2
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Fix a small typo in cli_commands.md (#12379)Ryan Roden-Corrent
2021-03-25Move `API_SYSEX_MAX_SIZE` out of `config_common.h` (#12302)Ryan
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update ↵Armando Magalhães
(#12252) Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25Roses Lite layout macro touch-up (#12357)James Young
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-24add valor_frl_tkl info.json (#12359)Xelus22
* add info.json * remove macro keys to correct layout
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-24[CI] Format code according to conventions (#12363)github-actions[bot]
* Format code according to conventions * Update lib/python/qmk/cli/generate/api.py * Update lib/python/qmk/cli/generate/api.py Co-authored-by: QMK Bot <hello@qmk.fm> Co-authored-by: Zach White <skullydazed@gmail.com>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-24[Keyboard] Preserve signedness from opt_encoder_handler for scroll data on ↵sbuller
ploopy devices (#12223)