fd24546787
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:04:35 +00:00
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
9294c5aa0a
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:03:24 +00:00
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
712c9fc848
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:02:24 +00:00
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
96a6214316
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:01:35 +00:00
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
d2b405066d
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:55:36 +00:00
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
ea1ed13bc8
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:53:33 +00:00
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
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
6ad0b004fa
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:52:32 +00:00
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
c3483458fe
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:51:33 +00:00
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
ba5aacbb95
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:50:49 +00:00
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
a2165b38a0
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:49:40 +00:00
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
dd0a35273c
added twelvekey ( #12281 )
...
* added twelvekey
* rename layout
2021-03-25 22:48:59 +11:00
e86b7d0c13
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:47:36 +00:00
cf7404630e
ISO Layouts fix ( #12319 )
2021-03-25 22:47:03 +11:00
5bc5921af4
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:46:26 +00:00
ef872595ae
update shell.nix ( #12295 )
2021-03-25 22:45:55 +11:00
76db2bb39b
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:44:56 +00:00
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
a3760c0891
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:39:24 +00:00
1d706bd77c
handwired/bolek: correct key object order ( #12356 )
2021-03-25 22:38:52 +11:00
a747ef966b
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:38:44 +00:00
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
87f6df0655
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:57 +00:00
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
25b7a5d531
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:29 +00:00
038d9118b6
Added wilba.tech WT65-G2 ( #12360 )
2021-03-25 22:36:24 +11:00
be771e5fd2
Added wilba.tech WT60-H3 ( #12354 )
...
* Added wilba.tech WT60-H2
* fix typo
2021-03-25 22:35:54 +11:00
c7436e667d
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:49 +00:00
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
183dde75de
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:06 +00:00
8b39ae13c7
add equator ( #12369 )
...
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-03-25 22:34:29 +11:00
8086837f69
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:34:28 +00:00
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
ff41c22fdc
Adding keyboard level weak function for slave matrix scan ( #12317 )
2021-03-25 22:33:18 +11:00
2f6236d1ea
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:31:17 +00:00
a888057453
Fix a small typo in cli_commands.md ( #12379 )
2021-03-25 22:31:05 +11:00
eae7343741
Move `API_SYSEX_MAX_SIZE` out of `config_common.h` ( #12302 )
2021-03-25 22:30:42 +11:00
921f1ba4cf
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 07:06:41 +00:00
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
e7cb7bc737
Roses Lite layout macro touch-up ( #12357 )
2021-03-25 18:05:59 +11:00
QMK Bot
Sendy Aditya Suryana
Takeshi ISHII
Leon Anavi
Albert Y
Matt W
Blake
jakobkg
TerryMathews
peepeetee
kopibeng
kb-elmo
Matteo Montemarani
André Silva
Purdea Andrei
James Young
Zach White
Wilba
Andrew-Fahmy
Brandon Claveria
Joel Challis
XScorpion2
Ryan Roden-Corrent
Ryan
Armando Magalhães