[flightplan] bugfix

This commit is contained in:
Christophe De Wagter
2017-11-08 15:31:39 +01:00
parent 0196480449
commit 52535cc6e9
@@ -42,17 +42,17 @@
<exception cond="((radio_control.status == RC_REALLY_LOST) &&
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('Land here')) &&
(autopilot_in_flight == true) )" deroute="Standby"/>
(autopilot_in_flight() == true) )" deroute="Standby"/>
<!-- Datalink lost (constant RPM descent) -->
<exception cond="((datalink_time > 2) &&
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('Land here')) &&
(autopilot_in_flight == true) )" deroute="Land here"/>
(autopilot_in_flight() == true) )" deroute="Land here"/>
<!-- Geofencing XY -->
<exception cond="(!InsideCyberZoo(GetPosX(), GetPosY()) &&
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('Land here')) &&
(autopilot_in_flight == true) )" deroute="Land here"/>
(autopilot_in_flight() == true) )" deroute="Land here"/>
<!-- Geofencing Z 2.5 -->
<exception cond="((GetPosAlt() > 3.5) &&
!(IndexOfBlock('Holding point') > nav_block) &&
@@ -61,17 +61,17 @@
<!-- Geofencing Z 4.5 (constant RPM descent)-->
<exception cond="((GetPosAlt() > 4.5) &&
!(IndexOfBlock('Holding point') > nav_block) &&
(autopilot_in_flight == true) )" deroute="Landed"/>
(autopilot_in_flight() == true) )" deroute="Landed"/>
<!-- Bat low -->
<exception cond="(electrical.bat_low &&
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('Land here')) &&
(autopilot_in_flight == true) )" deroute="Land here"/>
(autopilot_in_flight() == true) )" deroute="Land here"/>
<!-- Bat critical (constant RPM no stabilization)-->
<exception cond="(electrical.bat_critical &&
!(IndexOfBlock('Holding point') > nav_block) &&
!(nav_block >= IndexOfBlock('Land here')) &&
(autopilot_in_flight == true) )" deroute="Land here"/>
(autopilot_in_flight() == true) )" deroute="Land here"/>
</exceptions>
<blocks>
<block name="Wait GPS">