diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-22 13:37:19 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-22 13:37:19 +0200 |
| commit | ccd468be6070ecb0062c2c4fe551d57d89b7f5b6 (patch) | |
| tree | a934f52b3f1e86693926b21e216c418befe6abe0 /src/modules/mavlink/mavlink_main.cpp | |
| parent | 1e7dee439111f58fa9c0f737b93132a57dbf644d (diff) | |
| parent | edffb2eede777f3c316bc8a144984d9d12cbd680 (diff) | |
| download | px4-firmware-ccd468be6070ecb0062c2c4fe551d57d89b7f5b6.tar.gz px4-firmware-ccd468be6070ecb0062c2c4fe551d57d89b7f5b6.tar.bz2 px4-firmware-ccd468be6070ecb0062c2c4fe551d57d89b7f5b6.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
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 1e5bd661f..4b97aa4fc 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -1236,7 +1236,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; @@ -1296,8 +1299,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: @@ -1400,9 +1403,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); |