Jason Janse van Rensburg
fc2ca62a3b
Merge branch 'master'
...
Conflicts:
keyboards/planck/keymaps/bone2planck/keymap.c
2016-08-30 14:54:00 +02:00
Jack Humbert
8e00c464e6
Merge pull request #703 from jhenahan/feature/jhenahan-keymap
...
jhenahan Planck layout
2016-08-29 20:16:20 -04:00
Jack Humbert
3301e2219f
Merge pull request #700 from algernon/h/ucis/enable-fix
...
build_keyboard.mk: Restore UCIS_ENABLE support
2016-08-29 20:15:46 -04:00
cbbrowne
fba509780e
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-08-29 12:32:03 -04:00
Jack Henahan
6d7637ae3e
Update README
2016-08-29 11:43:06 -04:00
Jack Henahan
42f1ce08dc
jhenahan layout
2016-08-29 11:35:07 -04:00
Gergely Nagy
2f0395ce72
build_keyboard.mk: Restore UCIS_ENABLE support
...
During the build system refactor, support for enabling UCIS seems to
have been lost. This little patch adds that back, so that keymaps using
UCIS can be compiled again.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-29 11:30:38 +02:00
IBNobody
6da0eb2b2b
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
2016-08-28 18:50:06 -05:00
Jack Humbert
6d1e916851
Merge pull request #697 from fredizzimo/fix_gh_token_problem
...
Fix the .travis.yml so that GH_TOKEN works properly
2016-08-27 19:00:21 -04:00
Jack Humbert
25502277e8
Merge pull request #696 from fredizzimo/community_boards
...
Update list of community keyboards
2016-08-27 18:56:42 -04:00
Fred Sundvik
83eb9e4eed
Fix the .travis.yml so that GH_TOKEN works properly
2016-08-28 01:10:14 +03:00
Fred Sundvik
3bdebd2270
Update list of community keyboards
2016-08-28 00:54:26 +03:00
Jack Humbert
326de65439
Merge pull request #689 from jeebak/tv44-jeebak
...
Port jeebak's Planck/JD45 keymap to TV44
2016-08-27 17:30:39 -04:00
Jack Humbert
2ac90ed704
Merge pull request #684 from tomb0y/kc60_workman_dead
...
Correct typo in kc60 workman-dead keymap
2016-08-27 17:30:05 -04:00
Jack Humbert
bade8be66c
Merge pull request #695 from fredizzimo/dfu-util_instructions
...
Add dfu-util to the instructions
2016-08-27 17:29:35 -04:00
Jack Humbert
98bedbeb75
Merge pull request #693 from fredizzimo/infinity60
...
Rename infinity_chibios to infinity60, and add readme
2016-08-27 17:29:12 -04:00
Jack Humbert
a1b289c99a
Merge pull request #694 from fredizzimo/keyboard_template
...
Fix the keyboard template with new make syntax
2016-08-27 17:07:49 -04:00
Jack Humbert
4fd5ac8326
Merge pull request #690 from fredizzimo/unit_test
...
Add Unit Testing support
2016-08-27 17:06:45 -04:00
Fred Sundvik
8ab9c5c55a
Rename infinity_chibios to infinity60, and add readme
2016-08-27 23:55:33 +03:00
Fred Sundvik
53302328d0
Add dfu-util to the instructions
2016-08-27 23:43:49 +03:00
Fred Sundvik
1f5838a286
Fix the keyboard template with new make syntax
...
Also add proper link to the parent
2016-08-27 23:31:15 +03:00
Fred Sundvik
922c4ea3bc
Add unit test documentation
2016-08-27 21:57:49 +03:00
Fred Sundvik
ca51457327
Another attempt to make keyboards and tests in parallel
2016-08-27 21:57:49 +03:00
Fred Sundvik
fd93a9bb29
Make tests and keyboards in two different jobs
2016-08-27 21:57:49 +03:00
Fred Sundvik
03b1d142f2
Add -p parameter to mkdir
...
So that it's created even when there's a deeper structure
2016-08-27 21:57:49 +03:00
Fred Sundvik
6b92b62802
Travis builds the default all target
2016-08-27 21:57:49 +03:00
Fred Sundvik
6410f0c021
The all target makes all keyboards and all tests
2016-08-27 21:57:49 +03:00
Fred Sundvik
1b963117fe
Support for running and cleaning all tests
2016-08-27 21:57:49 +03:00
Fred Sundvik
42baa6cf43
Disable map file creation when building tests
...
It causes strange linker warnings on cygwin.
2016-08-27 21:57:49 +03:00
Fred Sundvik
7eefb34e7c
Detect failures when running multiple tests
...
Also add better output.
2016-08-27 21:57:49 +03:00
Fred Sundvik
ffb0a126f5
Convert tirple_buffered_object_tests to GTest
2016-08-27 21:57:49 +03:00
Fred Sundvik
bcdf9ab76b
Convert transport_tests to GTest
2016-08-27 21:57:49 +03:00
Fred Sundvik
b3eba797af
Convert frame_validator_tests to GTest
2016-08-27 21:57:49 +03:00
Fred Sundvik
cdd0913bcc
Convert frame_router_tests to GTest
2016-08-27 21:57:49 +03:00
Fred Sundvik
c692fd1d55
More common settings for unit tests and keyboards
2016-08-27 21:57:49 +03:00
Fred Sundvik
fc855cb30e
Fix running multiple tests
2016-08-27 21:57:49 +03:00
Fred Sundvik
f4429ba48c
Running of unit tests
...
But only if the compilation has succeeded
2016-08-27 21:57:49 +03:00
Fred Sundvik
0a11460175
Build actual tests, convert byte_stuffer_tests
2016-08-27 21:57:49 +03:00
Fred Sundvik
8a9aac6e32
Rules for compiling and linking google test
2016-08-27 21:57:49 +03:00
Fred Sundvik
27a673f5cf
The makefile actually calls build_test
2016-08-27 21:57:49 +03:00
Fred Sundvik
6d7cd639a5
Basic framework for parsing test targets
2016-08-27 21:57:49 +03:00
Fred Sundvik
cfddec17d5
Add Google Test submodule
2016-08-27 21:57:49 +03:00
Jack Humbert
f815b4871e
Merge pull request #691 from fredizzimo/fix_line_endings
...
Fix line endings
2016-08-27 14:54:55 -04:00
Fred Sundvik
cff26bc484
Merge branch 'master' into fix_line_endings
2016-08-27 21:01:46 +03:00
Jack Humbert
36b6a96596
Merge pull request #666 from fredizzimo/makefile_overhaul
...
Makefile overhaul
2016-08-27 13:49:42 -04:00
Fred Sundvik
265df7d5da
Fix travis_compiled_push
2016-08-27 20:18:26 +03:00
Fred Sundvik
a5b1af4999
Normalize line endings
2016-08-27 18:40:50 +03:00
Fred Sundvik
de58ec9738
Set eep files to binary mode
2016-08-27 18:37:28 +03:00
JeeBak Kim
5fe883e74b
[tv44] Port jeebak's planck keymap to tv44
2016-08-26 22:18:40 -07:00
JeeBak Kim
ff0e0ee459
[tv44] Add "jeebak" keymap folder as a copy of the "default" folder
2016-08-26 14:48:03 -07:00