Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

APM: check for geofence fence total of 0

This commit is contained in:
Andrew Tridgell 2012-08-28 11:59:28 +10:00
parent 60a6fed34a
commit 4945d66c80
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduPlane/geofence.pde
View File

@ -89,8 +89,9 @@ static void geofence_load(void)
} }
} }
if (g.fence_total < 0) { if (g.fence_total <= 0) {
g.fence_total.set(0); g.fence_total.set(0);
return;
} }
for (i=0; i<g.fence_total; i++) { for (i=0; i<g.fence_total; i++) {
@ -125,6 +126,7 @@ failed:
static bool geofence_enabled(void) static bool geofence_enabled(void)
{ {
if (g.fence_action == FENCE_ACTION_NONE || if (g.fence_action == FENCE_ACTION_NONE ||
g.fence_total < 5 ||
(g.fence_action != FENCE_ACTION_REPORT && (g.fence_action != FENCE_ACTION_REPORT &&
(g.fence_channel == 0 || (g.fence_channel == 0 ||
APM_RC.InputCh(g.fence_channel-1) < FENCE_ENABLE_PWM))) { APM_RC.InputCh(g.fence_channel-1) < FENCE_ENABLE_PWM))) {