Merged master into cmake-2

This commit is contained in:
Lorenz Meier
2015-09-20 10:33:39 +02:00
45 changed files with 1858 additions and 985 deletions
@@ -303,6 +303,11 @@ int VCDevExample::main()
ret = 1;
goto fail2;
}
PX4_INFO("TEST: 100ms TIMEOUT POLL -----------");
if(do_poll(fd, 0, 30, 100)) {
ret = 1;
goto fail2;
}
PX4_INFO("TEST: 1 SEC TIMOUT POLL ------------");
if(do_poll(fd, 1000, 3, 0)) {
ret = 1;