summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2511-0/+1673
|\|
| * Add Nix Studio OXALYS80 Keyboard (#12118)Sendy Aditya Suryana2021-03-2511-0/+1673
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-105/+136
|\|
| * [Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c (#12188)Takeshi ISHII2021-03-251-105/+136
| | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+48
|\|
| * [Keymap] ANAVI Macro Pad 2 add git keymap (#12212)Leon Anavi2021-03-251-0/+48
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-0/+14
|\|
| * Add RGB Matrix suspend wake functions to BM40 (#12246)Albert Y2021-03-252-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+131
|\|
| * add massdrop/alt/hlmtre keymap, add .exe to gitignore (#12191)Matt W2021-03-251-0/+131
| | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2510-2/+297
|\|
| * Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md ↵Blake2021-03-258-2/+285
| | | | | | | | | | | | | | | | | | | | | | (#12221) * Daisy first commit buggy * buggy still underglow crash * Daisy V1 * ReadMe Updates
| * Add suspend wake functions for The Mark:65's RGB Matrix (#12245)Albert Y2021-03-252-0/+12
| | | | | | | | | | | | | | * Add suspend wake functions for RGB Matrix * Add USB suspend definition to config.h Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-10/+13
|\|
| * Fix handling multiples of the same MIDI note (fixes bug brought up in issue ↵jakobkg2021-03-251-10/+13
| | | | | | | | | | | | | | #10199) (#11639) * Fix handling multiples of the same MIDI note * Extend MIDI note status to fix note releases
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-255-13/+6
|\|
| * TKC GodSpeed75: add RGB LED support (#12278)TerryMathews2021-03-255-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | * GodSpeed75: add RGB support * GodSpeed75: minor updates * GodSpeed75: minor updates * GodSpeed75: restore chconf.h * GodSpeed75: restore chconf.h * GodSpeed75: restore chconf.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-253-0/+57
|\|
| * add via support for bm68rgb (#12275)peepeetee2021-03-253-0/+57
| | | | | | | | | | * add via support for bm68rgb * add newline to keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2518-0/+647
|\|
| * Add XT65 keyboard (#11998)kopibeng2021-03-259-0/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * added twelvekey (#12281)kb-elmo2021-03-259-0/+232
| | | | | | | | | | * added twelvekey * rename layout
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-253-15/+15
|\|
| * ISO Layouts fix (#12319)Matteo Montemarani2021-03-253-15/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-32/+4
|\|
| * update shell.nix (#12295)André Silva2021-03-251-32/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-6/+6
|\|
| * Improve upon the 'Caveats' section of the Layers and Mod-Tap documentation ↵Purdea Andrei2021-03-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-15/+15
|\|
| * handwired/bolek: correct key object order (#12356)James Young2021-03-251-15/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2515-107/+319
|\|
| * Add a `qmk format-json` command that will format JSON files (#12372)Zach White2021-03-2515-107/+319
| | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-259-0/+212
|\|
| * Added wilba.tech WT60-H2 (#12348)Wilba2021-03-259-0/+212
| | | | | | | | | | | | | | * Added wilba.tech WT60-H2 * fix typo * Fix error in keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2518-0/+425
|\|
| * Added wilba.tech WT65-G2 (#12360)Wilba2021-03-259-0/+213
| |
| * Added wilba.tech WT60-H3 (#12354)Wilba2021-03-259-0/+212
| | | | | | | | | | * Added wilba.tech WT60-H2 * fix typo
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2514-103/+1077
|\|
| * (Re)Fixing K-type RGB lighting (#12084)Andrew-Fahmy2021-03-2514-103/+1077
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-259-0/+245
|\|
| * add equator (#12369)Brandon Claveria2021-03-259-0/+245
| | | | | | Co-authored-by: Swiftrax <swiftrax@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-8/+8
|\|
| * Fix USER_PRINT on avr/atsam (#12269)Joel Challis2021-03-252-8/+8
| | | | | | | | | | | | | | | | | | * 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>
* | Adding keyboard level weak function for slave matrix scan (#12317)XScorpion22021-03-252-1/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-254-4/+4
|\|
| * Fix a small typo in cli_commands.md (#12379)Ryan Roden-Corrent2021-03-251-1/+1
| |
| * Move `API_SYSEX_MAX_SIZE` out of `config_common.h` (#12302)Ryan2021-03-253-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-256-70/+112
|\|
| * feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update ↵Armando Magalhães2021-03-253-30/+72
| | | | | | | | | | (#12252) Co-authored-by: Ryan <fauxpark@gmail.com>
| * Roses Lite layout macro touch-up (#12357)James Young2021-03-253-40/+40
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 16:57:14 +0000