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

AP_Common: Location.cpp: force handling of all alt frames

Browse Source 
By removing the default case we will generate a compiler error a new alt
frame is not handled
This commit is contained in:
Peter Barker 2018-07-26 11:40:05 +10:00 committed by Andrew Tridgell
parent 61aff344d3
commit 7f63720257
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_Common/Location.cpp
View File

@ -127,7 +127,7 @@ bool Location::get_alt_cm(ALT_FRAME desired_frame, int32_t &ret_alt_cm) const
}
// convert alt to absolute
int32_t alt_abs;
int32_t alt_abs = 0;
switch (frame) {
case ALT_FRAME_ABSOLUTE:
alt_abs = alt;
@ -151,9 +151,6 @@ bool Location::get_alt_cm(ALT_FRAME desired_frame, int32_t &ret_alt_cm) const
case ALT_FRAME_ABOVE_TERRAIN:
alt_abs = alt + alt_terr_cm;
break;
default:
// unknown conversion to absolute alt, this should never happen
return false;
}
// convert absolute to desired frame
@ -180,10 +177,8 @@ bool Location::get_alt_cm(ALT_FRAME desired_frame, int32_t &ret_alt_cm) const
case ALT_FRAME_ABOVE_TERRAIN:
ret_alt_cm = alt_abs - alt_terr_cm;
return true;
default:
// should never happen
return false;
}
return false;
}
bool Location::get_vector_xy_from_origin_NE(Vector2f &vec_ne) const