diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 13:53:22 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 13:53:22 +0200 |
| commit | f02de30c32acd313dcb4d9e5561634d5a3ab758c (patch) | |
| tree | 954e3dc54aa4900add3abd35c11f6d9360e8a305 /src/modules/mavlink/mavlink_messages.cpp | |
| parent | 90a40dda866b8c8db7f183f7f184d5d4edaa7620 (diff) | |
| parent | bf5061aa21872c98576d46aee894e670ce0c52a0 (diff) | |
| download | px4-firmware-f02de30c32acd313dcb4d9e5561634d5a3ab758c.tar.gz px4-firmware-f02de30c32acd313dcb4d9e5561634d5a3ab758c.tar.bz2 px4-firmware-f02de30c32acd313dcb4d9e5561634d5a3ab758c.zip | |
Merge branch 'master' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules/mavlink/mavlink_messages.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 0017b4332..b443b8af8 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -1652,7 +1652,7 @@ StreamListItem *streams_list[] = { new StreamListItem(&MavlinkStreamLocalPositionSetpoint::new_instance, &MavlinkStreamLocalPositionSetpoint::get_name_static), new StreamListItem(&MavlinkStreamRollPitchYawThrustSetpoint::new_instance, &MavlinkStreamRollPitchYawThrustSetpoint::get_name_static), new StreamListItem(&MavlinkStreamRollPitchYawRatesThrustSetpoint::new_instance, &MavlinkStreamRollPitchYawRatesThrustSetpoint::get_name_static), - new StreamListItem(&MavlinkStreamRCChannelsRaw::new_instance, &MavlinkStreamGlobalPositionInt::get_name_static), + new StreamListItem(&MavlinkStreamRCChannelsRaw::new_instance, &MavlinkStreamRCChannelsRaw::get_name_static), new StreamListItem(&MavlinkStreamManualControl::new_instance, &MavlinkStreamManualControl::get_name_static), new StreamListItem(&MavlinkStreamOpticalFlow::new_instance, &MavlinkStreamOpticalFlow::get_name_static), new StreamListItem(&MavlinkStreamAttitudeControls::new_instance, &MavlinkStreamAttitudeControls::get_name_static), |