fix delft_basic flight plan exceptions

This commit is contained in:
Ewoud Smeur
2017-05-10 10:53:52 +02:00
parent e30a03cc00
commit 4fa4a6effd
@@ -22,7 +22,7 @@
<!-- RC-Loss -->
<exception cond="((radio_control.status == RC_REALLY_LOST) &&
!(IndexOfBlock('Takeoff') > nav_block) &&
!(nav_block >= IndexOfBlock('land')) &&
!(nav_block >= IndexOfBlock('land here')) &&
(autopilot_in_flight() == true) )" deroute="ComeBackAndLand"/>
<!-- GPS loss -->
@@ -35,18 +35,18 @@
<exception cond="(datalink_time > 60 &&
!(datalink_time > 120) &&
!(IndexOfBlock('Takeoff') > nav_block) &&
!(nav_block >= IndexOfBlock('land')) &&
!(nav_block >= IndexOfBlock('land here')) &&
(autopilot_in_flight() == true) )" deroute="DatalinkLoss"/>
<!-- Battery loss -->
<exception cond="(electrical.bat_low &&
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('land')) &&
(autopilot_in_flight() == true) )" deroute="ComeBackAndLand"/>
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('land here')) &&
(autopilot_in_flight() == true) )" deroute="ComeBackAndLand"/>
<exception cond="(electrical.bat_critical &&
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('land')) &&
(autopilot_in_flight() == true) )" deroute="land here"/>
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('land here')) &&
(autopilot_in_flight() == true) )" deroute="land here"/>
</exceptions>
<blocks>