summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-29191-10220/+11500
|\
| * Merge pull request #697 from fredizzimo/fix_gh_token_problemJack Humbert2016-08-271-3/+3
| |\ | | | | | | Fix the .travis.yml so that GH_TOKEN works properly
| | * Fix the .travis.yml so that GH_TOKEN works properlyFred Sundvik2016-08-281-3/+3
| | |
| * | Merge pull request #696 from fredizzimo/community_boardsJack Humbert2016-08-271-19/+28
| |\ \ | | |/ | |/| Update list of community keyboards
| | * Update list of community keyboardsFred Sundvik2016-08-281-19/+28
| | |
| * | Merge pull request #689 from jeebak/tv44-jeebakJack Humbert2016-08-274-0/+596
| |\ \ | | | | | | | | Port jeebak's Planck/JD45 keymap to TV44
| | * | [tv44] Port jeebak's planck keymap to tv44JeeBak Kim2016-08-263-69/+538
| | | |
| | * | [tv44] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-08-264-0/+127
| | | |
| * | | Merge pull request #684 from tomb0y/kc60_workman_deadJack Humbert2016-08-272-4/+4
| |\ \ \ | | | | | | | | | | Correct typo in kc60 workman-dead keymap
| | * | | Correct typo in kc60 workman-dead keymapzs2016-08-262-4/+4
| | | | | | | | | | | | | | | | | | | | and rename README.md to readme.md
| * | | | Merge pull request #695 from fredizzimo/dfu-util_instructionsJack Humbert2016-08-271-5/+10
| |\ \ \ \ | | | | | | | | | | | | Add dfu-util to the instructions
| | * | | | Add dfu-util to the instructionsFred Sundvik2016-08-271-5/+10
| | | |_|/ | | |/| |
| * | | | Merge pull request #693 from fredizzimo/infinity60Jack Humbert2016-08-2716-9/+37
| |\ \ \ \ | | | | | | | | | | | | Rename infinity_chibios to infinity60, and add readme
| | * | | | Rename infinity_chibios to infinity60, and add readmeFred Sundvik2016-08-2716-9/+37
| | |/ / /
| * | | | Merge pull request #694 from fredizzimo/keyboard_templateJack Humbert2016-08-271-5/+5
| |\ \ \ \ | | | | | | | | | | | | Fix the keyboard template with new make syntax
| | * | | | Fix the keyboard template with new make syntaxFred Sundvik2016-08-271-5/+5
| | |/ / / | | | | | | | | | | | | | | | Also add proper link to the parent
| * | | | Merge pull request #690 from fredizzimo/unit_testJack Humbert2016-08-2726-724/+1007
| |\ \ \ \ | | |/ / / | |/| | | Add Unit Testing support
| | * | | Add unit test documentationFred Sundvik2016-08-271-0/+51
| | | | |
| | * | | Another attempt to make keyboards and tests in parallelFred Sundvik2016-08-271-3/+8
| | | | |
| | * | | Make tests and keyboards in two different jobsFred Sundvik2016-08-271-1/+2
| | | | |
| | * | | Add -p parameter to mkdirFred Sundvik2016-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | So that it's created even when there's a deeper structure
| | * | | Travis builds the default all targetFred Sundvik2016-08-271-1/+1
| | | | |
| | * | | The all target makes all keyboards and all testsFred Sundvik2016-08-272-4/+5
| | | | |
| | * | | Support for running and cleaning all testsFred Sundvik2016-08-271-11/+22
| | | | |
| | * | | Disable map file creation when building testsFred Sundvik2016-08-272-1/+6
| | | | | | | | | | | | | | | | | | | | It causes strange linker warnings on cygwin.
| | * | | Detect failures when running multiple testsFred Sundvik2016-08-272-2/+12
| | | | | | | | | | | | | | | | | | | | Also add better output.
| | * | | Convert tirple_buffered_object_tests to GTestFred Sundvik2016-08-273-32/+38
| | | | |
| | * | | Convert transport_tests to GTestFred Sundvik2016-08-275-172/+202
| | | | |
| | * | | Convert frame_validator_tests to GTestFred Sundvik2016-08-272-40/+58
| | | | |
| | * | | Convert frame_router_tests to GTestFred Sundvik2016-08-273-232/+236
| | | | |
| | * | | More common settings for unit tests and keyboardsFred Sundvik2016-08-274-54/+59
| | | | |
| | * | | Fix running multiple testsFred Sundvik2016-08-271-2/+4
| | | | |
| | * | | Running of unit testsFred Sundvik2016-08-271-3/+8
| | | | | | | | | | | | | | | | | | | | But only if the compilation has succeeded
| | * | | Build actual tests, convert byte_stuffer_testsFred Sundvik2016-08-277-179/+179
| | | | |
| | * | | Rules for compiling and linking google testFred Sundvik2016-08-274-12/+81
| | | | |
| | * | | The makefile actually calls build_testFred Sundvik2016-08-275-18/+42
| | | | |
| | * | | Basic framework for parsing test targetsFred Sundvik2016-08-273-1/+34
| | | | |
| | * | | Add Google Test submoduleFred Sundvik2016-08-272-0/+3
| |/ / /
| * | | Merge pull request #691 from fredizzimo/fix_line_endingsJack Humbert2016-08-2740-6251/+6252
| |\ \ \ | | | | | | | | | | Fix line endings
| | * \ \ Merge branch 'master' into fix_line_endingsFred Sundvik2016-08-27115-3306/+3664
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #666 from fredizzimo/makefile_overhaulJack Humbert2016-08-27115-3308/+3666
| |\ \ \ \ | | |_|_|/ | |/| | | Makefile overhaul
| | * | | Fix travis_compiled_pushFred Sundvik2016-08-271-2/+2
| | | | |
| | * | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-262-25/+144
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Fix bad mergeFred Sundvik2016-08-262-4/+2
| | | | | | | | | | | | | | | | | | | | Led should have been added to KC60, not GH60
| | * | | Remove google test submoduleFred Sundvik2016-08-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | It had been added for some strange reason, allthough it's supposed to be there only in another branch.
| | * | | Split vision_division into Makefile/rules.mkFred Sundvik2016-08-252-75/+72
| | | | |
| | * | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2555-336/+2855
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-249-4/+695
| | |\ \ \
| | * | | | Fix slight inconsistencyFred Sundvik2016-08-241-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running make from either a keyboard folder or a subproject it runs all keymaps for all subprojects and the selected subproject respectively. Without this fix, the same doesn't happen if your run make clean for example. As it would just provide you with an error message. Now this will work as expected.
| | * | | | Split kitten_paw into Makefile/rules.mkFred Sundvik2016-08-232-75/+73
| | | | | |