Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-02 22:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Camera: use location methods to convert altitudes

Browse Source
This commit is contained in:
Peter Barker 2019-04-01 16:59:18 +11:00 committed by Peter Barker
parent c590e1f1c5
commit 919dc26ff6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_Camera/AP_Camera.cpp
View File

@ -326,13 +326,17 @@ void AP_Camera::send_feedback(mavlink_channel_t chan) const
// completely ignore this failure! AHRS will provide its best guess. // completely ignore this failure! AHRS will provide its best guess.
} }
float altitude, altitude_rel; int32_t altitude = 0;
if (current_loc.relative_alt) { if (!current_loc.get_alt_cm(Location::AltFrame::ABSOLUTE, altitude)) {
altitude = current_loc.alt+ahrs.get_home().alt; // completely ignore this failure! this is a shouldn't-happen
altitude_rel = current_loc.alt; // as current_loc should never be in an altitude we can't
} else { // convert.
altitude = current_loc.alt; }
altitude_rel = current_loc.alt - ahrs.get_home().alt; int32_t altitude_rel = 0;
if (!current_loc.get_alt_cm(Location::AltFrame::ABOVE_HOME, altitude_rel)) {
// completely ignore this failure! this is a shouldn't-happen
// as current_loc should never be in an altitude we can't
// convert.
} }
mavlink_msg_camera_feedback_send( mavlink_msg_camera_feedback_send(