mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-26 05:03:35 +08:00
geofence: make some functions private, correctly update params
This commit is contained in:
@@ -91,6 +91,8 @@ bool Geofence::inside(const struct vehicle_global_position_s &global_position, f
|
|||||||
|
|
||||||
bool Geofence::inside(const struct vehicle_global_position_s &global_position,
|
bool Geofence::inside(const struct vehicle_global_position_s &global_position,
|
||||||
const struct vehicle_gps_position_s &gps_position,float baro_altitude_amsl) {
|
const struct vehicle_gps_position_s &gps_position,float baro_altitude_amsl) {
|
||||||
|
updateParams();
|
||||||
|
|
||||||
if (getAltitudeMode() == Geofence::GF_ALT_MODE_WGS84) {
|
if (getAltitudeMode() == Geofence::GF_ALT_MODE_WGS84) {
|
||||||
if (getSource() == Geofence::GF_SOURCE_GLOBALPOS) {
|
if (getSource() == Geofence::GF_SOURCE_GLOBALPOS) {
|
||||||
return inside(global_position);
|
return inside(global_position);
|
||||||
|
|||||||
@@ -75,11 +75,8 @@ public:
|
|||||||
* @param craft pointer craft coordinates
|
* @param craft pointer craft coordinates
|
||||||
* @return true: system is inside fence, false: system is outside fence
|
* @return true: system is inside fence, false: system is outside fence
|
||||||
*/
|
*/
|
||||||
bool inside(const struct vehicle_global_position_s &global_position);
|
|
||||||
bool inside(const struct vehicle_global_position_s &global_position, float baro_altitude_amsl);
|
|
||||||
bool inside(const struct vehicle_global_position_s &global_position,
|
bool inside(const struct vehicle_global_position_s &global_position,
|
||||||
const struct vehicle_gps_position_s &gps_position,float baro_altitude_amsl);
|
const struct vehicle_gps_position_s &gps_position,float baro_altitude_amsl);
|
||||||
bool inside(double lat, double lon, float altitude);
|
|
||||||
bool inside_polygon(double lat, double lon, float altitude);
|
bool inside_polygon(double lat, double lon, float altitude);
|
||||||
|
|
||||||
int clearDm();
|
int clearDm();
|
||||||
@@ -116,6 +113,10 @@ private:
|
|||||||
control::BlockParamInt _param_counter_threshold;
|
control::BlockParamInt _param_counter_threshold;
|
||||||
|
|
||||||
uint8_t _outside_counter;
|
uint8_t _outside_counter;
|
||||||
|
|
||||||
|
bool inside(double lat, double lon, float altitude);
|
||||||
|
bool inside(const struct vehicle_global_position_s &global_position);
|
||||||
|
bool inside(const struct vehicle_global_position_s &global_position, float baro_altitude_amsl);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ bool MissionFeasibilityChecker::checkGeofence(dm_item_t dm_current, size_t nMiss
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!geofence.inside(missionitem.lat, missionitem.lon, missionitem.altitude)) {
|
if (!geofence.inside_polygon(missionitem.lat, missionitem.lon, missionitem.altitude)) {
|
||||||
mavlink_log_info(_mavlink_fd, "#audio: Geofence violation waypoint %d", i);
|
mavlink_log_info(_mavlink_fd, "#audio: Geofence violation waypoint %d", i);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user