Merge branch 'master' of github.com:PX4/Firmware into cmake-2

This commit is contained in:
Lorenz Meier
2015-09-23 21:17:15 +02:00
10 changed files with 431 additions and 108 deletions

View File

@@ -1506,9 +1506,11 @@ Mavlink::task_main(int argc, char *argv[])
} else if (strcmp(myoptarg, "onboard") == 0) {
_mode = MAVLINK_MODE_ONBOARD;
} else if (strcmp(optarg, "osd") == 0) {
} else if (strcmp(myoptarg, "osd") == 0) {
_mode = MAVLINK_MODE_OSD;
} else if (strcmp(optarg, "config") == 0) {
} else if (strcmp(myoptarg, "config") == 0) {
_mode = MAVLINK_MODE_CONFIG;
}