summaryrefslogtreecommitdiffstats
path: root/tmk_core/common
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1098 from lambdalisue/tapping-force-holdJack Humbert2017-03-281-4/+5
|\
| * Add TAPPING_FORCE_HOLD to regulate behaviourlambdalisue2017-02-141-4/+5
* | Removes redundant {} which cause build failure when DEBUG_ACTION is setPhong Nguyen2017-02-251-1/+1
* | Merge pull request #1101 from priyadi/layer_state_set_kbJack Humbert2017-02-142-0/+17
|\ \ | |/ |/|
| * Fix bug fix attemptPriyadi Iman Nurcahyo2017-02-151-2/+2
| * Bug fix & added default_layer_state_set_kbPriyadi Iman Nurcahyo2017-02-152-2/+11
| * Add layer_state_set_kb hookPriyadi Iman Nurcahyo2017-02-152-0/+8
* | Implement faux-clicky featurePriyadi Iman Nurcahyo2017-02-132-0/+19
|/
* Merge pull request #1068 from adzenith/masterJack Humbert2017-02-073-8/+2
|\
| * Minor cleanupNikolaus Wittenstein2017-02-053-8/+2
* | Merge pull request #1046 from LukeSilva/masterJack Humbert2017-02-072-5/+31
|\ \
| * | Add support for various tapping macrosLuke Silva2017-01-281-2/+24
| * | Fix documentation for TMK actionsLuke Silva2017-01-261-3/+7
| |/
* | Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert2017-02-061-8/+8
|\ \ | |/ |/|
| * moved oneshot cancellation code outside of process_record.SjB2017-01-291-8/+8
| * oneshot timeout would only timeout after an event.SjB2017-01-151-7/+7
* | Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert2017-01-241-1/+1
|\ \
| * | added mods status bit to visualizer.SjB2017-01-171-1/+1
| |/
* | Simplified and polished a bit the code changes on tmk_coreLuiz Ribeiro2017-01-213-4/+5
* | Got ps2avrGB to work with the V-USB protocolLuiz Ribeiro2017-01-214-9/+38
|/
* Keycode refactorWilba65822016-12-291-1/+1
* Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-051-0/+8
|\
| * Initial version of Raw HID interfaceWilba65822016-12-011-0/+8
* | Merge pull request #913 from wez/ble_1Jack Humbert2016-12-021-20/+16
|\ \ | |/ |/|
| * Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2016-11-271-20/+16
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-282-7/+8
|\|
| * Fixed NO_SUSPEND_POWER_DOWN handlingWilba65822016-11-231-6/+1
| * Fixed NO_SUSPEND_POWER_DOWN handlingWilba65822016-11-231-1/+7
| * Merge pull request #898 from PureSpider/backlight-fixJack Humbert2016-11-221-2/+2
| |\
| | * Set backlight status to on if it's at maximum brightness already and the brig...PureSpider2016-11-221-2/+2
* | | cleaning up mididJack Humbert2016-11-211-1/+8
|/ /
* | Refactoring Matrix scanningIBNobody2016-10-281-10/+0
* | Fixing Debounce - WIPIBNobody2016-10-281-0/+10
* | Fixed some large keyboard bugsIBNobody2016-10-231-3/+3
|/
* Fix #770, Fix #779IBNobody2016-09-282-7/+4
* Fix issue #772 Meh and Hyper not workingDidier Loiseau2016-09-231-3/+4
* Fixed NO_PRINT / USER_PRINT conflict warning.IBNobody2016-09-121-2/+6
* Added User Print - A "light" console out option (#8)IBNobody2016-09-074-23/+155
* Use keyboard config for nkro (#7)IBNobody2016-09-067-24/+13
* Merge branch 'master' into fix_line_endingsFred Sundvik2016-08-271-1/+2
|\
| * Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-241-0/+10
| |\
| * \ Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-233-1/+127
| |\ \
| * | | Don't add VERSION as a defineFred Sundvik2016-08-201-1/+2
* | | | Normalize line endingsFred Sundvik2016-08-272-611/+611
| |_|/ |/| |
* | | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-231-0/+10
|\ \ \ | |_|/ |/| |
| * | Added USB Virtual Serial supportJason Green2016-08-231-0/+10
| |/
* | Improve one-hand support by adding more actions and tap keys.Joe Wasson2016-08-202-8/+77
* | Add one-hand support.Joe Wasson2016-08-203-1/+58
|/
* Most ergodox keymaps compiles on InfinityFred Sundvik2016-07-291-1/+3
* Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.Joe Wasson2016-07-241-1/+1