|
|
|
@ -129,7 +129,7 @@ float Plane::relative_ground_altitude(bool use_rangefinder_if_available)
@@ -129,7 +129,7 @@ float Plane::relative_ground_altitude(bool use_rangefinder_if_available)
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (use_rangefinder_if_available && quadplane.in_vtol_land_final() && |
|
|
|
|
rangefinder.status_orient(ROTATION_PITCH_270) == RangeFinder::RangeFinder_OutOfRangeLow) { |
|
|
|
|
rangefinder.status_orient(ROTATION_PITCH_270) == RangeFinder::Status::OutOfRangeLow) { |
|
|
|
|
// a special case for quadplane landing when rangefinder goes
|
|
|
|
|
// below minimum. Consider our height above ground to be zero
|
|
|
|
|
return 0; |
|
|
|
@ -613,7 +613,7 @@ void Plane::rangefinder_height_update(void)
@@ -613,7 +613,7 @@ void Plane::rangefinder_height_update(void)
|
|
|
|
|
{ |
|
|
|
|
float distance = rangefinder.distance_cm_orient(ROTATION_PITCH_270)*0.01f; |
|
|
|
|
|
|
|
|
|
if ((rangefinder.status_orient(ROTATION_PITCH_270) == RangeFinder::RangeFinder_Good) && ahrs.home_is_set()) { |
|
|
|
|
if ((rangefinder.status_orient(ROTATION_PITCH_270) == RangeFinder::Status::Good) && ahrs.home_is_set()) { |
|
|
|
|
if (!rangefinder_state.have_initial_reading) { |
|
|
|
|
rangefinder_state.have_initial_reading = true; |
|
|
|
|
rangefinder_state.initial_range = distance; |
|
|
|
|