Browse Source

APM: check for geofence fence total of 0

mission-4.1.18
Andrew Tridgell 13 years ago
parent
commit
ded64fd9ea
  1. 4
      ArduPlane/geofence.pde

4
ArduPlane/geofence.pde

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

Loading…
Cancel
Save