summaryrefslogtreecommitdiffstats
path: root/tmk_core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix_line_endingsFred Sundvik2016-08-274-221/+53
|\
| * Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-245-4/+272
| |\
| * \ Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2330-2170/+2300
| |\ \
| * | | Fix the clean targetFred Sundvik2016-08-201-2/+1
| * | | Move bootloader_defs include to build_keyboardFred Sundvik2016-08-201-8/+0
| * | | Add output specific config fileFred Sundvik2016-08-201-14/+6
| * | | Output specific include pathsFred Sundvik2016-08-201-13/+5
| * | | More general system for generating several outputsFred Sundvik2016-08-202-87/+42
| * | | Don't add VERSION as a defineFred Sundvik2016-08-202-4/+2
| * | | Move git submodule check and version generation to main MakefileFred Sundvik2016-08-201-11/+2
| * | | Remove unneded code from tmk_core/rules.mkFred Sundvik2016-08-201-89/+2
* | | | Normalize line endingsFred Sundvik2016-08-2718-3118/+3118
| |_|/ |/| |
* | | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-235-4/+272
|\ \ \ | |_|/ |/| |
| * | move to ergodox-ez onlyJason Green2016-08-231-1/+1
| * | Added USB Virtual Serial supportJason Green2016-08-235-4/+272
* | | Merge pull request #671 from Talljoe/one-handJack Humbert2016-08-234-1/+131
|\ \ \ | |/ / |/| |
| * | Improve one-hand support by adding more actions and tap keys.Joe Wasson2016-08-202-8/+77
| * | Add one-hand support.Joe Wasson2016-08-204-1/+62
| |/
* / Normalize line endingsFred Sundvik2016-08-2026-2169/+2169
|/
* Convert hex to bindi0ib2016-08-071-0/+5
* Remove the quick commands and add proper cleanFred Sundvik2016-07-311-26/+5
* Also depend on the gcc versionFred Sundvik2016-07-311-3/+5
* Force compilation and linking when options changesFred Sundvik2016-07-311-9/+28
* More reliable .d file generationFred Sundvik2016-07-311-8/+16
* Enable vpath seraching for source files onlyFred Sundvik2016-07-311-1/+11
* Speed up ChibiOS keymap compilationFred Sundvik2016-07-291-17/+33
* Most ergodox keymaps compiles on InfinityFred Sundvik2016-07-291-1/+3
* Merge pull request #573 from algernon/f/make-all-stop-on-errorJack Humbert2016-07-281-2/+2
|\
| * tmk_core/rules.mk: Make PRINT_ERROR* stop on errorGergely Nagy2016-07-271-2/+2
* | Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.Joe Wasson2016-07-241-1/+1
|/
* Merge pull request #522 from exiva/extrakey-macfixJack Humbert2016-07-211-2/+2
|\
| * Fix OS X Recognizing keyboard as Mouse/TabletTravis La Marr2016-07-151-2/+2
* | Make DFU wait for bootloaderTravis La Marr2016-07-151-0/+4
|/
* Use order only prerequisites to avoid re-linkingFred Sundvik2016-07-081-9/+11
* Fix name of makefile dep filesFred Sundvik2016-07-081-1/+1
* Fix the link targetFred Sundvik2016-07-081-1/+1
* Don't run git describe for ever file that is builtFred Sundvik2016-07-081-1/+1
* Speed up compilation by not using recusive makeFred Sundvik2016-07-081-38/+21
* Fix IS_CONSUMER macroFred Sundvik2016-07-071-1/+1
* Remove unhandled KC_BTLD, RESET should be used insteadFred Sundvik2016-07-071-5/+0
* Merge pull request #490 from fredizzimo/integrate_visualizerJack Humbert2016-07-072-0/+23
|\
| * Add suspend support to the ChibiOS visualizerFred Sundvik2016-07-071-0/+7
| * Fix visualizer crash at startupFred Sundvik2016-07-071-3/+4
| * Makefile fixes and update of VisualizerFred Sundvik2016-07-072-0/+15
* | default keymap, reset sorted out for now, added serial to makefileJack Humbert2016-07-061-17/+37
* | Merge branch 'master' into lets-split-supportJack Humbert2016-07-063-5/+45
|\|
| * Add setting of the master side to the makefileFred Sundvik2016-07-061-0/+9
| * Enable serial_link support for ChibiOSFred Sundvik2016-07-062-5/+36
* | Merge branch 'master' into lets-split-supportJack Humbert2016-07-053-1/+12
|\|
| * Add dfu-util command for programmingFred Sundvik2016-07-053-1/+12