Merged beta into master

This commit is contained in:
Lorenz Meier
2015-08-08 11:33:42 +02:00
5 changed files with 44 additions and 23 deletions
+2 -2
View File
@@ -68,8 +68,8 @@ nshterm_main(int argc, char *argv[])
int armed_fd = orb_subscribe(ORB_ID(actuator_armed));
struct actuator_armed_s armed;
/* back off 800 ms to avoid running into the USB setup timing */
while (hrt_absolute_time() < 800U * 1000U) {
/* back off 1500 ms to avoid running into the USB setup timing */
while (hrt_absolute_time() < 1500U * 1000U) {
usleep(50000);
}