[iris] Flight plan fixes

This commit is contained in:
Michal Podhradsky
2017-02-23 17:18:55 -08:00
parent 6d1aa6b662
commit e0b37d8cd2
@@ -23,7 +23,7 @@
<exception cond="((radio_control.status == RC_REALLY_LOST) &&
!(IndexOfBlock('Takeoff') > nav_block) &&
!(nav_block >= IndexOfBlock('land')) &&
(autopilot_in_flight == true) )" deroute="ComeBackAndLand"/>
(autopilot_in_flight() == true) )" deroute="ComeBackAndLand"/>
<!-- GPS loss -->
<!-- Not done from flight plan, main.c goes to AP_MODE_FAILSAFE hardcoded -->
@@ -36,17 +36,17 @@
!(datalink_time > 120) &&
!(IndexOfBlock('Takeoff') > nav_block) &&
!(nav_block >= IndexOfBlock('land')) &&
(autopilot_in_flight == true) )" deroute="DatalinkLoss"/>
(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"/>
(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"/>
(autopilot_in_flight() == true) )" deroute="land here"/>
</exceptions>
<blocks>