varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity
15752 commits 2 branches 1545 tags 870 MiB
Commit graph

15752 commits

This branch
This branch
All branches
Author SHA1 Message Date
QMK Bot 25f1a3d759 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:20:42 +00:00
github-actions[bot] 0a056cfd81
Format code according to conventions (#12380) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-03-25 23:18:59 +11:00
QMK Bot 5a0be4c6d8 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:14:17 +00:00
purple-rw 5c1442766c
fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and TAPPING_TERM_PER_KEY are defined (#12125) 
Co-authored-by: checyr <32964049+checyr@users.noreply.github.com>
 2021-03-25 23:13:41 +11:00
QMK Bot 2df1b124a7 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:11:36 +00:00
즈눅 816f2f9cc2
Fix Kinetic speed condition (#12139) 2021-03-25 23:11:16 +11:00
ploopyco 666623d39a
ADNS-5050 / Ploopy Nano / Ploopy Mini Trackballs (#11994) 
* 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-25 23:10:55 +11:00
QMK Bot f2729e8974 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:08:38 +00:00
Albert Y 0eabb01e27
Minor improvements to BM68RGB (#12156) 
* 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-25 23:08:04 +11:00
QMK Bot aa85b5ee1e Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:05:42 +00:00
Takeshi ISHII b664db3cf3
Removed unused RGBLED_TIMER_TOP and F_CPU macros from quantum/rgblight.[ch] (#12233) 2021-03-25 23:05:38 +11:00
Naoto Takai a5ecd4eb87
Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same (#12203) 
* Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same

* Use NO_PIN instead of duplicate pin
 2021-03-25 23:05:05 +11:00
QMK Bot fd24546787 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:04:35 +00:00
Sendy Aditya Suryana f3f444c1df
Add Nix Studio OXALYS80 Keyboard (#12118) 
* 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-25 23:04:02 +11:00
QMK Bot 9294c5aa0a Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:03:24 +00:00
Takeshi ISHII 81c51ec51c
[Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c (#12188) 
* 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-25 23:02:54 +11:00
QMK Bot 712c9fc848 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:02:24 +00:00
Leon Anavi b5a12fa6d3
[Keymap] ANAVI Macro Pad 2 add git keymap (#12212) 
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-25 23:01:45 +11:00
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