Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-29 | 191 | -10220/+11500 |
|\ | |||||
| * | Merge pull request #697 from fredizzimo/fix_gh_token_problem | Jack Humbert | 2016-08-27 | 1 | -3/+3 |
| |\ | | | | | | | Fix the .travis.yml so that GH_TOKEN works properly | ||||
| | * | Fix the .travis.yml so that GH_TOKEN works properly | Fred Sundvik | 2016-08-28 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #696 from fredizzimo/community_boards | Jack Humbert | 2016-08-27 | 1 | -19/+28 |
| |\ \ | | |/ | |/| | Update list of community keyboards | ||||
| | * | Update list of community keyboards | Fred Sundvik | 2016-08-28 | 1 | -19/+28 |
| | | | |||||
| * | | Merge pull request #689 from jeebak/tv44-jeebak | Jack Humbert | 2016-08-27 | 4 | -0/+596 |
| |\ \ | | | | | | | | | Port jeebak's Planck/JD45 keymap to TV44 | ||||
| | * | | [tv44] Port jeebak's planck keymap to tv44 | JeeBak Kim | 2016-08-26 | 3 | -69/+538 |
| | | | | |||||
| | * | | [tv44] Add "jeebak" keymap folder as a copy of the "default" folder | JeeBak Kim | 2016-08-26 | 4 | -0/+127 |
| | | | | |||||
| * | | | Merge pull request #684 from tomb0y/kc60_workman_dead | Jack Humbert | 2016-08-27 | 2 | -4/+4 |
| |\ \ \ | | | | | | | | | | | Correct typo in kc60 workman-dead keymap | ||||
| | * | | | Correct typo in kc60 workman-dead keymap | zs | 2016-08-26 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | and rename README.md to readme.md | ||||
| * | | | | Merge pull request #695 from fredizzimo/dfu-util_instructions | Jack Humbert | 2016-08-27 | 1 | -5/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Add dfu-util to the instructions | ||||
| | * | | | | Add dfu-util to the instructions | Fred Sundvik | 2016-08-27 | 1 | -5/+10 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #693 from fredizzimo/infinity60 | Jack Humbert | 2016-08-27 | 16 | -9/+37 |
| |\ \ \ \ | | | | | | | | | | | | | Rename infinity_chibios to infinity60, and add readme | ||||
| | * | | | | Rename infinity_chibios to infinity60, and add readme | Fred Sundvik | 2016-08-27 | 16 | -9/+37 |
| | |/ / / | |||||
| * | | | | Merge pull request #694 from fredizzimo/keyboard_template | Jack Humbert | 2016-08-27 | 1 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Fix the keyboard template with new make syntax | ||||
| | * | | | | Fix the keyboard template with new make syntax | Fred Sundvik | 2016-08-27 | 1 | -5/+5 |
| | |/ / / | | | | | | | | | | | | | | | | Also add proper link to the parent | ||||
| * | | | | Merge pull request #690 from fredizzimo/unit_test | Jack Humbert | 2016-08-27 | 26 | -724/+1007 |
| |\ \ \ \ | | |/ / / | |/| | | | Add Unit Testing support | ||||
| | * | | | Add unit test documentation | Fred Sundvik | 2016-08-27 | 1 | -0/+51 |
| | | | | | |||||
| | * | | | Another attempt to make keyboards and tests in parallel | Fred Sundvik | 2016-08-27 | 1 | -3/+8 |
| | | | | | |||||
| | * | | | Make tests and keyboards in two different jobs | Fred Sundvik | 2016-08-27 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Add -p parameter to mkdir | Fred Sundvik | 2016-08-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | So that it's created even when there's a deeper structure | ||||
| | * | | | Travis builds the default all target | Fred Sundvik | 2016-08-27 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | The all target makes all keyboards and all tests | Fred Sundvik | 2016-08-27 | 2 | -4/+5 |
| | | | | | |||||
| | * | | | Support for running and cleaning all tests | Fred Sundvik | 2016-08-27 | 1 | -11/+22 |
| | | | | | |||||
| | * | | | Disable map file creation when building tests | Fred Sundvik | 2016-08-27 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | It causes strange linker warnings on cygwin. | ||||
| | * | | | Detect failures when running multiple tests | Fred Sundvik | 2016-08-27 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | Also add better output. | ||||
| | * | | | Convert tirple_buffered_object_tests to GTest | Fred Sundvik | 2016-08-27 | 3 | -32/+38 |
| | | | | | |||||
| | * | | | Convert transport_tests to GTest | Fred Sundvik | 2016-08-27 | 5 | -172/+202 |
| | | | | | |||||
| | * | | | Convert frame_validator_tests to GTest | Fred Sundvik | 2016-08-27 | 2 | -40/+58 |
| | | | | | |||||
| | * | | | Convert frame_router_tests to GTest | Fred Sundvik | 2016-08-27 | 3 | -232/+236 |
| | | | | | |||||
| | * | | | More common settings for unit tests and keyboards | Fred Sundvik | 2016-08-27 | 4 | -54/+59 |
| | | | | | |||||
| | * | | | Fix running multiple tests | Fred Sundvik | 2016-08-27 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Running of unit tests | Fred Sundvik | 2016-08-27 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | But only if the compilation has succeeded | ||||
| | * | | | Build actual tests, convert byte_stuffer_tests | Fred Sundvik | 2016-08-27 | 7 | -179/+179 |
| | | | | | |||||
| | * | | | Rules for compiling and linking google test | Fred Sundvik | 2016-08-27 | 4 | -12/+81 |
| | | | | | |||||
| | * | | | The makefile actually calls build_test | Fred Sundvik | 2016-08-27 | 5 | -18/+42 |
| | | | | | |||||
| | * | | | Basic framework for parsing test targets | Fred Sundvik | 2016-08-27 | 3 | -1/+34 |
| | | | | | |||||
| | * | | | Add Google Test submodule | Fred Sundvik | 2016-08-27 | 2 | -0/+3 |
| |/ / / | |||||
| * | | | Merge pull request #691 from fredizzimo/fix_line_endings | Jack Humbert | 2016-08-27 | 40 | -6251/+6252 |
| |\ \ \ | | | | | | | | | | | Fix line endings | ||||
| | * \ \ | Merge branch 'master' into fix_line_endings | Fred Sundvik | 2016-08-27 | 115 | -3306/+3664 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #666 from fredizzimo/makefile_overhaul | Jack Humbert | 2016-08-27 | 115 | -3308/+3666 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Makefile overhaul | ||||
| | * | | | Fix travis_compiled_push | Fred Sundvik | 2016-08-27 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-26 | 2 | -25/+144 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix bad merge | Fred Sundvik | 2016-08-26 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | Led should have been added to KC60, not GH60 | ||||
| | * | | | Remove google test submodule | Fred Sundvik | 2016-08-25 | 1 | -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.mk | Fred Sundvik | 2016-08-25 | 2 | -75/+72 |
| | | | | | |||||
| | * | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-25 | 55 | -336/+2855 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-24 | 9 | -4/+695 |
| | |\ \ \ | |||||
| | * | | | | Fix slight inconsistency | Fred Sundvik | 2016-08-24 | 1 | -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.mk | Fred Sundvik | 2016-08-23 | 2 | -75/+73 |
| | | | | | |