summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-034-0/+190
|\
| * [Keymap] Add ddone's iris keymap (#12055)Ddone2021-03-024-0/+190
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-031-1/+1
|\|
| * [Docs] Small spelling mistake fix in leader keys (#12087)L3af2021-03-021-1/+1
| |
* | Format code according to conventions (#12088)github-actions[bot]2021-03-033-17/+16
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Split RGB Matrix (#11055)XScorpion22021-03-038-10/+86
| | | | | | | | | | * Split RGB Matrix * Suspend State sync for rgb matrix
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-022-14/+0
|\|
| * Remove more cruft from Lily58 default keymap (#12078)Dan Carroll2021-03-022-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | * Remove more cruft from lily58 default keymap * Update keyboards/lily58/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h Remove extra newline Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-1/+1
|\|
| * Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081)Drashna Jaelre2021-03-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-0/+4
|\|
| * [Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID (#11974)Trevor Elliott2021-03-011-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-21/+21
|\|
| * [Keyboard] Update eggman info.json (#12074)qpockets2021-03-011-21/+21
| | | | | | attempting to fix qmk configurator issues
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-1/+1
|\|
| * Fix the typo in ergodone 80 layout (#12075)Mega Mind2021-03-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0214-1058/+103
|\|
| * Revert "Fixing K-type RGB lighting (#11551)" (#12065)Nick Brassel2021-03-0214-1058/+103
| | | | | | This reverts commit e6f7da403676b491ac278d5b793d18a0d114477e.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-011-9/+2
|\|
| * Fixing adjust layer issue with the lily58 default keymap (#12052)Dan Carroll2021-03-011-9/+2
| | | | | | | | | | | | | | * Fix triggering of adjust layer in default lily58 keymap * Remove unused extern * Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist
* | Format code according to conventions (#12076)github-actions[bot]2021-03-011-2/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Add ability to toggle One Shot functionality (#4198)Drashna Jaelre2021-03-017-9/+81
| | | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0120-6/+551
|\|
| * Bastardkb added keyboard and renaming (#11887)Quentin2021-03-0120-6/+551
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-286-16/+88
|\|
| * Migrate make_dfu_header to CLI (#12061)Joel Challis2021-02-286-16/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate make_dfu_header to CLI * lint fixes * Update lib/python/qmk/cli/generate/dfu_header.py Co-authored-by: Ryan <fauxpark@gmail.com> * Rename object Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-286-9/+9
|\|
| * Fix generated file output while target exists (#12062)Joel Challis2021-02-286-9/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-285-258/+301
|\|
| * Extract sendstring into its own compilation unit (#12060)Ryan2021-03-015-258/+301
| | | | | | | | | | | | | | * Extract sendstring into its own compilation unit * License headers? * Put this include in the header
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-285-10/+0
|\|
| * Remove unused keymap_config from ctrl keymaps (#12058)Joel Challis2021-02-285-10/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-0/+5
|\|
| * Modified tmk_core/rules.mk to avoid linking errors (#10728)Fabián González Martín2021-02-281-0/+5
| | | | | | | | | | | | | | * Modified tmk_core/rules.mk to avoid linking errors Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made * Comment updated
* | Format code according to conventions (#12056)github-actions[bot]2021-02-281-16/+8
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Refactor of USB code within split_common (#11890)Joel Challis2021-02-2811-46/+160
| | | | | | | | | | | | | | | | | | | | | | * Initial refactor of usb code within split_common * Add headers * Correct disable condition * Format * Align func name
* | ARM - Refactor SLEEP_LED to support more platforms (#8403)Joel Challis2021-02-2825-71/+96
| | | | | | | | | | | | | | | | | | | | | | * Initial refactor of ARM SLEEP_LED to enable more platforms * fix build issues * Disable SLEEP_LED for boards with no caps lock code * Enable GPT14 for boards with caps lock code and SLEEP_LED enabled * Enable GPT for boards with caps lock code and SLEEP_LED enabled
* | Overhaul bootmagic logic to have single entrypoint (#8532)Joel Challis2021-02-2815-153/+227
| | | | | | | | | | * Relocate bootmagic logic to have single entrypoint * Align init of layer state
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-284-1/+34
|\|
| * Implement PLOOPY_DRAGSCROLL_INVERT option, which inverts the ploopy ↵Anomalocaridid2021-02-281-0/+5
| | | | | | | | trackball's DRAG_SCROLL's vertical scroll direction. (#12032)
| * Add RGB Matrix support for Preonic rev3 (#12008)Albert Y2021-02-283-1/+29
| | | | | | | | | | | | | | | | | | * Add g_led_config for RGB Matrix support * Corrected indentation * Undo indentation on existing rev3.c code Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-3/+103
|\|
| * Kiko's Lab KL-90: Configurator bugfix (#11993)James Young2021-02-281-3/+103
| | | | | | | | | | | | | | * human-friendly formatting * correct key order * correct layout macro name
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-243/+65
|\|
| * Keycapsss Kimiko rev1: Configurator bugfix (#11992)James Young2021-02-281-243/+65
| | | | | | | | | | * human-friendly formatting * fix key positioning and order
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-284-3/+18
|\|
| * [Keyboard] Update spiderisland/split78 (#11990)unrelentingtech2021-02-284-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] spiderisland/split78: add MCP23018 reset code Now, communication with the right side gets re-established after unplugging it and plugging it back in. * [Keyboard] spiderisland/split78: configure debouncing I've been experiencing particularly bad bounce on the 'A' key. Also, update maintainer github username
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-283-10/+56
|\|
| * Update lazydesigners/the40 (#11989)jackytrabbit2021-02-283-10/+56
| | | | | | | | | | | | | | | | | | | | | | * Update the40.h Update the40.h to fix keymap * Add VIA support for lazydesigners/the40 Add VIA support for lazydesigners/the40 * Update keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-287-60/+51
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 22:45:58 +0000