summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+90
|\|
| * add valor_frl_tkl info.json (#12359)Xelus222021-03-241-0/+90
| | | | | | | | | | * add info.json * remove macro keys to correct layout
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-5/+5
|\|
| * [CI] Format code according to conventions (#12363)github-actions[bot]2021-03-241-5/+5
| | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-2/+2
|\|
| * [Keyboard] Preserve signedness from opt_encoder_handler for scroll data on ↵sbuller2021-03-242-2/+2
| | | | | | | | ploopy devices (#12223)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-78/+84
|\|
| * More Tap Dance docs improvements (#12358)Ryan2021-03-241-78/+84
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-0/+18
|\|
| * Workaround for recent changes to mouse keycodes (#12367)Joel Challis2021-03-241-0/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2418-106/+614
|\|
| * Add support for qmk_configurator style aliases (#11954)Zach White2021-03-2418-106/+614
| | | | | | | | | | | | | | | | | | * Add support for qmk_configurator style aliases * add the keyboard aliases to the api data * add support for a keyboard metadata file * make flake8 happy
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-0/+96
|\|
| * Add info.json for handwired/datahand (#12320)Ryan2021-03-241-0/+96
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-247-0/+286
|\|
| * [Keyboard] YMDK YM68 (#12352)James Young2021-03-247-0/+286
| | | | | | | | | | | | | | | | | | * [Keyboard] YMDK YM68 Converted from a KBFirmware JSON file provided via the vendor's product listing. PCB supports Backlight on B6 and RGB Underglow on E2, but the LEDs are not pre-soldered according to the PCB photos. * update VENDOR_ID and PRODUCT_ID
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-69/+70
|\|
| * Configurator bugfix for GMMK Pro (#12353)James Young2021-03-241-69/+70
| |
* | LED Matrix: Fix up eeconfig code (#12327)Ryan2021-03-242-26/+76
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-242-2/+2
|\|
| * Fix Uni660 linker errors (#12341)Ryan2021-03-242-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2410-0/+245
|\|
| * Add UC-1 keypad (#11926)duoshock2021-03-2410-0/+245
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: online <33636898+online@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-232-34/+50
|\|
| * Configurator fixes for handwired/concertina/64key (#12316)Viktor Eikman2021-03-232-34/+50
| | | | | | | | | | * Fixed bug that was hiding a key in info.json. * Improvements to presentation.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-237-11/+351
|\|
| * Add Sinc Rev. 2 (#12138)Danny2021-03-237-11/+351
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-231-1/+1
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 11:56:11 +0000