Merge remote-tracking branch 'upstream/master' into dev_ros

Conflicts:
	.gitignore
	src/lib/uavcan
This commit is contained in:
Thomas Gubler
2014-12-25 09:48:15 +01:00
65 changed files with 21014 additions and 289 deletions
+5 -1
View File
@@ -68,8 +68,12 @@ int perf_main(int argc, char *argv[])
if (strcmp(argv[1], "reset") == 0) {
perf_reset_all();
return 0;
} else if (strcmp(argv[1], "latency") == 0) {
perf_print_latency(0 /* stdout */);
fflush(stdout);
return 0;
}
printf("Usage: perf <reset>\n");
printf("Usage: perf [reset | latency]\n");
return -1;
}