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_Proximity: fix complation without fence

Browse Source
This commit is contained in:
Iampete1 2022-03-07 15:44:34 +00:00 committed by Andrew Tridgell
parent ed356d94cd
commit 1342fa4851
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Proximity/AP_Proximity_SITL.cpp
View File

@ -51,6 +51,7 @@ void AP_Proximity_SITL::update(void)
current_loc.lng = sitl->state.longitude * 1.0e7;
current_loc.alt = sitl->state.altitude * 1.0e2;
#if AC_FENCE
if (!AP::fence()->polyfence().breached()) {
// only called to prompt polyfence to reload fence if required
}
@ -72,11 +73,15 @@ void AP_Proximity_SITL::update(void)
} else {
set_status(AP_Proximity::Status::NoData);
}
#else
set_status(AP_Proximity::Status::NoData);
#endif
}
// get distance in meters to fence in a particular direction in degrees (0 is forward, angles increase in the clockwise direction)
bool AP_Proximity_SITL::get_distance_to_fence(float angle_deg, float &distance) const
{
#if AC_FENCE
if (!AP::fence()->polyfence().inclusion_boundary_available()) {
return false;
}
@ -106,6 +111,9 @@ bool AP_Proximity_SITL::get_distance_to_fence(float angle_deg, float &distance)
return false;
}
return true;
#else
return false;
#endif
}
// get maximum and minimum distances (in meters) of primary sensor