aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Supress warnings from ps2_mouse.hPriyadi Iman Nurcahyo2017-02-121-2/+3
* Merge pull request #1062 from luizribeiro/fix-winJack Humbert2017-02-071-2/+2
|\
| * Fix V-USB bug on Windows 10Luiz Ribeiro2017-02-011-2/+2
* | 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 #1057 from priyadi/selectable_outputJack Humbert2017-02-074-70/+146
|\ \
| * | Fix wrong includePriyadi Iman Nurcahyo2017-02-011-1/+1
| * | Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo2017-02-013-2/+2
| * | Move outputselect to parent dir to satisfy non LUFA keyboardsPriyadi Iman Nurcahyo2017-02-012-0/+0
| * | Implement runtime selectable output (USB or BT)Priyadi Iman Nurcahyo2017-02-014-69/+145
| |/
* | 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-214-6/+7
* | Got ps2avrGB to work with the V-USB protocolLuiz Ribeiro2017-01-218-17/+73
|/
* Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-301-1/+1
|\
| * Keycode refactorWilba65822016-12-291-1/+1
* | API Sysex fixesFred Sundvik2016-12-292-11/+25
|/
* Fixes issue #900Wilba65822016-12-202-4/+4
* Allow power consumption to be set per-keyboard.Kyle Smith2016-12-141-1/+4
* Merge pull request #944 from priyadi/negmousefixJack Humbert2016-12-121-1/+1
|\
| * Allow negative values for mouse movementsPriyadi Iman Nurcahyo2016-12-101-1/+1
* | The adafruit BLE C++ code requires -std=c++11Priyadi Iman Nurcahyo2016-12-101-1/+1
|/
* Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-055-8/+220
|\
| * Initial version of Raw HID interfaceWilba65822016-12-015-8/+220
* | syntax error fixPriyadi Iman Nurcahyo2016-12-051-1/+1
* | Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-052-47/+56
* | Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert2016-12-032-164/+289
|\ \
| * | Forgot to use define in delay instead of hardcoded numberOfer Plesser2016-12-031-1/+1
| * | Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser2016-12-032-1/+4
| * | Refactored and improved ps2 mouse featureofples2016-12-032-164/+286
* | | Connect the adafruit ble code to the lufa main loopWez Furlong2016-12-021-11/+71
|/ /
* | Merge pull request #915 from wez/ble_3Jack Humbert2016-12-025-1/+940
|\ \
| * | Add support for Adafruit BLE modulesWez Furlong2016-11-275-1/+940
* | | Merge pull request #913 from wez/ble_1Jack Humbert2016-12-022-34/+28
|\| | | |/ |/|
| * Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2016-11-272-34/+28
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-283-8/+12
|\|
| * Merge pull request #903 from priyadi/ps2_init_delayJack Humbert2016-11-261-1/+4
| |\
| | * Make PS2 init delay configurable. Some devices are not fully powered upPriyadi Iman Nurcahyo2016-11-261-1/+4