diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-10-30 15:36:16 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-10-30 15:36:16 +0100 |
commit | 2f715b74dd4866945e7ebe6aab735cd1e58fe01d (patch) | |
tree | 3320b69c2dd2272dd32133337231ddd0f163e416 /src/modules | |
parent | 54a5f7a138863e05935765b74369e42f69bb9495 (diff) | |
download | px4-firmware-2f715b74dd4866945e7ebe6aab735cd1e58fe01d.tar.gz px4-firmware-2f715b74dd4866945e7ebe6aab735cd1e58fe01d.tar.bz2 px4-firmware-2f715b74dd4866945e7ebe6aab735cd1e58fe01d.zip |
Fix build breakage on mavlink update
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index e8d783847..9247f999a 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -391,11 +391,9 @@ MavlinkReceiver::handle_message_hil_optical_flow(mavlink_message_t *msg) f.timestamp = hrt_absolute_time(); f.flow_timestamp = flow.time_usec; - f.flow_raw_x = flow.flow_x; - f.flow_raw_y = flow.flow_y; - f.flow_comp_x_m = flow.flow_comp_m_x; - f.flow_comp_y_m = flow.flow_comp_m_y; - f.ground_distance_m = flow.ground_distance; + f.flow_raw_x = flow.integrated_x; + f.flow_raw_y = flow.integrated_y; + f.ground_distance_m = flow.distance; f.quality = flow.quality; f.sensor_id = flow.sensor_id; @@ -413,7 +411,7 @@ MavlinkReceiver::handle_message_hil_optical_flow(mavlink_message_t *msg) r.timestamp = hrt_absolute_time(); r.error_count = 0; r.type = RANGE_FINDER_TYPE_LASER; - r.distance = flow.ground_distance; + r.distance = flow.distance; r.minimum_distance = 0.0f; r.maximum_distance = 40.0f; // this is set to match the typical range of real sensors, could be made configurable r.valid = (r.distance > r.minimum_distance) && (r.distance < r.maximum_distance); |