diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-15 09:04:55 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-15 09:04:55 +0200 |
| commit | 874846969cd8b6365c39f125dea70416b5611eb6 (patch) | |
| tree | 47a812e5acafa05294e39c16426d07a38c69364b /src/modules/mavlink/mavlink_main.cpp | |
| parent | e634c9fa99916f795773b60b8884f479fb4e3d36 (diff) | |
| parent | e9b0ee75015cf3544a3dab2015d7af77f53bd23e (diff) | |
| download | px4-firmware-874846969cd8b6365c39f125dea70416b5611eb6.tar.gz px4-firmware-874846969cd8b6365c39f125dea70416b5611eb6.tar.bz2 px4-firmware-874846969cd8b6365c39f125dea70416b5611eb6.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index e2931ce6d..d63b08040 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -1396,8 +1396,8 @@ Mavlink::task_main(int argc, char *argv[]) configure_stream("GLOBAL_POSITION_INT", 3.0f); configure_stream("LOCAL_POSITION_NED", 3.0f); configure_stream("RC_CHANNELS_RAW", 1.0f); - configure_stream("GLOBAL_POSITION_SETPOINT_INT", 3.0f); - configure_stream("ROLL_PITCH_YAW_THRUST_SETPOINT", 3.0f); + configure_stream("POSITION_TARGET_GLOBAL_INT", 3.0f); + configure_stream("ATTITUDE_TARGET", 3.0f); configure_stream("DISTANCE_SENSOR", 0.5f); break; |