Commit Graph

15584 Commits (ce99f98bb5217ede628cfbf7e20924346b4279da)

Author SHA1 Message Date
QMK Bot 96a6214316 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:01:35 +00:00
Albert Y 29c82cfb33
Add RGB Matrix suspend wake functions to BM40 (#12246)
* 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-25 23:01:03 +11:00
QMK Bot d2b405066d Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:55:36 +00:00
Matt W 2cd684f8e0
add massdrop/alt/hlmtre keymap, add .exe to gitignore (#12191)
* 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-25 22:55:01 +11:00
QMK Bot ea1ed13bc8 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:53:33 +00:00
Blake c4d05010cb
Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md (#12221)
* Daisy first commit buggy

* buggy still underglow crash

* Daisy V1

* ReadMe Updates
2021-03-25 22:53:30 +11:00
Albert Y 6276f54752
Add suspend wake functions for The Mark:65's RGB Matrix (#12245)
* Add suspend wake functions for RGB Matrix

* Add USB suspend definition to config.h

Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-25 22:52:53 +11:00
QMK Bot 6ad0b004fa Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:52:32 +00:00
jakobkg 8e820cde13
Fix handling multiples of the same MIDI note (fixes bug brought up in issue #10199) (#11639)
* Fix handling multiples of the same MIDI note

* Extend MIDI note status to fix note releases
2021-03-25 22:51:57 +11:00
QMK Bot c3483458fe Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:51:33 +00:00
TerryMathews 572395ac20
TKC GodSpeed75: add RGB LED support (#12278)
* GodSpeed75: add RGB support

* GodSpeed75: minor updates

* GodSpeed75: minor updates

* GodSpeed75: restore chconf.h

* GodSpeed75: restore chconf.h

* GodSpeed75: restore chconf.h
2021-03-25 22:51:02 +11:00
QMK Bot ba5aacbb95 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:50:49 +00:00
peepeetee 95c74ae4ae
add via support for bm68rgb (#12275)
* add via support for bm68rgb

* add newline to keymap.c
2021-03-25 22:50:17 +11:00
QMK Bot a2165b38a0 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:49:40 +00:00
kopibeng 3fc710e0b1
Add XT65 keyboard (#11998)
* 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-25 22:49:37 +11:00
kb-elmo dd0a35273c
added twelvekey (#12281)
* added twelvekey

* rename layout
2021-03-25 22:48:59 +11:00
QMK Bot e86b7d0c13 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:47:36 +00:00
Matteo Montemarani cf7404630e
ISO Layouts fix (#12319) 2021-03-25 22:47:03 +11:00
QMK Bot 5bc5921af4 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:46:26 +00:00
André Silva ef872595ae
update shell.nix (#12295) 2021-03-25 22:45:55 +11:00
QMK Bot 76db2bb39b Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:44:56 +00:00
Purdea Andrei eac9ee8d3f
Improve upon the 'Caveats' section of the Layers and Mod-Tap documentation (#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-25 22:44:28 +11:00
QMK Bot a3760c0891 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:39:24 +00:00
James Young 1d706bd77c
handwired/bolek: correct key object order (#12356) 2021-03-25 22:38:52 +11:00
QMK Bot a747ef966b Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:38:44 +00:00
Zach White 3e60997edb
Add a `qmk format-json` command that will format JSON files (#12372)
* 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-25 22:38:10 +11:00
QMK Bot 87f6df0655 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:36:57 +00:00
Wilba a74846a0db
Added wilba.tech WT60-H2 (#12348)
* Added wilba.tech WT60-H2

* fix typo

* Fix error in keymap
2021-03-25 22:36:52 +11:00
QMK Bot 25b7a5d531 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:36:29 +00:00
Wilba 038d9118b6
Added wilba.tech WT65-G2 (#12360) 2021-03-25 22:36:24 +11:00
Wilba be771e5fd2
Added wilba.tech WT60-H3 (#12354)
* Added wilba.tech WT60-H2

* fix typo
2021-03-25 22:35:54 +11:00
QMK Bot c7436e667d Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:35:49 +00:00
Andrew-Fahmy 1fbee7c316
(Re)Fixing K-type RGB lighting (#12084)
* 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-25 22:35:18 +11:00
QMK Bot 183dde75de Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:35:06 +00:00
Brandon Claveria 8b39ae13c7
add equator (#12369)
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-03-25 22:34:29 +11:00
QMK Bot 8086837f69 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:34:28 +00:00
Joel Challis 1bb6d8de6f
Fix USER_PRINT on avr/atsam (#12269)
* 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-25 22:33:53 +11:00
XScorpion2 ff41c22fdc
Adding keyboard level weak function for slave matrix scan (#12317) 2021-03-25 22:33:18 +11:00
QMK Bot 2f6236d1ea Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:31:17 +00:00
Ryan Roden-Corrent a888057453
Fix a small typo in cli_commands.md (#12379) 2021-03-25 22:31:05 +11:00
Ryan eae7343741
Move `API_SYSEX_MAX_SIZE` out of `config_common.h` (#12302) 2021-03-25 22:30:42 +11:00
QMK Bot 921f1ba4cf Merge remote-tracking branch 'origin/master' into develop 2021-03-25 07:06:41 +00:00
Armando Magalhães c59fb1b477
feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update (#12252)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 18:06:30 +11:00
James Young e7cb7bc737
Roses Lite layout macro touch-up (#12357) 2021-03-25 18:05:59 +11:00
QMK Bot 1bb04ea598 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 05:29:33 +00:00
Xelus22 1ed48c774e
add valor_frl_tkl info.json (#12359)
* add info.json

* remove macro keys to correct layout
2021-03-24 22:28:54 -07:00
QMK Bot 600fc8be2b Merge remote-tracking branch 'origin/master' into develop 2021-03-25 03:34:00 +00:00
github-actions[bot] 54b80ecf9f
[CI] Format code according to conventions (#12363)
* 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-24 20:33:25 -07:00
QMK Bot c823160d94 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 01:33:46 +00:00
sbuller 97a73637e0
[Keyboard] Preserve signedness from opt_encoder_handler for scroll data on ploopy devices (#12223) 2021-03-24 18:33:06 -07:00