From 9fff67ec89c187dc2b4772693fb93657e5635233 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 17 Aug 2014 09:07:51 +1000 Subject: [PATCH] Plane: update for APM_OBC API change --- ArduPlane/ArduPlane.pde | 2 +- ArduPlane/geofence.pde | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde index 3520ff2b46..b0dceb44f7 100644 --- a/ArduPlane/ArduPlane.pde +++ b/ArduPlane/ArduPlane.pde @@ -975,7 +975,7 @@ static void obc_fs_check(void) { #if OBC_FAILSAFE == ENABLED // perform OBC failsafe checks - obc.check(OBC_MODE(control_mode), failsafe.last_heartbeat_ms); + obc.check(OBC_MODE(control_mode), failsafe.last_heartbeat_ms, geofence_breached()); #endif } diff --git a/ArduPlane/geofence.pde b/ArduPlane/geofence.pde index 539b96067f..a71815fafa 100644 --- a/ArduPlane/geofence.pde +++ b/ArduPlane/geofence.pde @@ -424,8 +424,10 @@ static void geofence_send_status(mavlink_channel_t chan) } } -// public function for use in failsafe modules -bool geofence_breached(void) +/* + return true if geofence has been breached + */ +static bool geofence_breached(void) { return geofence_state ? geofence_state->fence_triggered : false; }