diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-21 14:40:34 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-21 14:40:34 +0200 |
| commit | aa8fcceea219c83d40354f2eeec84f738108bc0f (patch) | |
| tree | 0655b1d67096c85cda241fcd0f6b8b3e41cb78a3 /src/modules/mavlink/mavlink_main.cpp | |
| parent | 29dba8dff3110673592a202e137e079cf9d1a1a0 (diff) | |
| parent | 9c75b9562e904210389a497c8baa46374cbc9927 (diff) | |
| download | px4-firmware-aa8fcceea219c83d40354f2eeec84f738108bc0f.tar.gz px4-firmware-aa8fcceea219c83d40354f2eeec84f738108bc0f.tar.bz2 px4-firmware-aa8fcceea219c83d40354f2eeec84f738108bc0f.zip | |
Merge pull request #1297 from PX4/mission_fix
mavlink: missions manager compID cleanup
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 976b6d4d5..ed7e879d3 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -1229,7 +1229,10 @@ Mavlink::task_main(int argc, char *argv[]) _mode = MAVLINK_MODE_CUSTOM; } else if (strcmp(optarg, "camera") == 0) { - _mode = MAVLINK_MODE_CAMERA; + // left in here for compatibility + _mode = MAVLINK_MODE_ONBOARD; + } else if (strcmp(optarg, "onboard") == 0) { + _mode = MAVLINK_MODE_ONBOARD; } break; @@ -1289,8 +1292,8 @@ Mavlink::task_main(int argc, char *argv[]) warnx("mode: CUSTOM"); break; - case MAVLINK_MODE_CAMERA: - warnx("mode: CAMERA"); + case MAVLINK_MODE_ONBOARD: + warnx("mode: ONBOARD"); break; default: @@ -1393,9 +1396,10 @@ Mavlink::task_main(int argc, char *argv[]) configure_stream("POSITION_TARGET_GLOBAL_INT", 3.0f); configure_stream("ATTITUDE_TARGET", 3.0f); configure_stream("DISTANCE_SENSOR", 0.5f); + configure_stream("OPTICAL_FLOW", 0.5f); break; - case MAVLINK_MODE_CAMERA: + case MAVLINK_MODE_ONBOARD: configure_stream("SYS_STATUS", 1.0f); configure_stream("ATTITUDE", 15.0f); configure_stream("GLOBAL_POSITION_INT", 15.0f); |