summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Format code according to conventions (#12380)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and ↵purple-rw
TAPPING_TERM_PER_KEY are defined (#12125) Co-authored-by: checyr <32964049+checyr@users.noreply.github.com>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Fix Kinetic speed condition (#12139)즈눅
2021-03-25ADNS-5050 / Ploopy Nano / Ploopy Mini Trackballs (#11994)ploopyco
* added adns5050 sensor code, as well as implementations for the Ploopy Mini and the Ploopy Nano * fixed spurious scrolling issue * recommended fixes for pr linting and cleanup
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Minor improvements to BM68RGB (#12156)Albert Y
* Minor improvements to BM68RGB * Add grave esc and LTO support * Move comments to end of line * Document the use of qmk script for compiling and flashing * Revert arrow key flags back to mod * Update keyboards/bm68rgb/bm68rgb.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/bm68rgb/bm68rgb.c Co-authored-by: Ryan <fauxpark@gmail.com> * Remove grave escape Co-authored-by: Ryan <fauxpark@gmail.com> * Update tab spacing Co-authored-by: Ryan <fauxpark@gmail.com> * Reverted make default Co-authored-by: Ryan <fauxpark@gmail.com> * Reverted make flash Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: filterpaper <filterpaper@localhost> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Removed unused RGBLED_TIMER_TOP and F_CPU macros from quantum/rgblight.[ch] ↵Takeshi ISHII
(#12233)
2021-03-25Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same (#12203)Naoto Takai
* Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same * Use NO_PIN instead of duplicate pin
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25Add Nix Studio OXALYS80 Keyboard (#12118)Sendy Aditya Suryana
* Initial commit of OXALYS80 firmware * Remove comments * Add new return in info.json * Fix pin output init for scroll lock indicator * Update keyboards/nix_studio/oxalys80/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nix_studio/oxalys80/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nix_studio/oxalys80/oxalys80.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nix_studio/oxalys80/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nix_studio/oxalys80/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nix_studio/oxalys80/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nix_studio/oxalys80/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Delete keymaps config.h * Update keyboards/nix_studio/oxalys80/config.h Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25[Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c (#12188)Takeshi ISHII
* update keyboards/helix/pico/keymaps/mtei/keymap.c Stopped using the LAYOUT_kc macro. (this is response to #12160) There is no change in the generated binary. * small update pico/keymaps/mtei/keymap.c
2021-03-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-25[Keymap] ANAVI Macro Pad 2 add git keymap (#12212)Leon Anavi
This keymap for ANAVI Macro Pad 2 contains popular git commands typed out and executed with a single key: - left key: git commit -s - right key: git push Signed-off-by: Leon Anavi <leon@anavi.org>
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