[paparazzi-commits] [4176] add calls to macros to get coordinates (compatibility with booz)

[Pascal Brisset]

Revision: 4176
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4176
Author:   hecto
Date:     2009-09-18 13:43:22 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
 add calls to macros to get coordinates (compatibility with booz)

Modified Paths:
--------------
    paparazzi3/trunk/conf/flight_plans/EMAV2009_safety.xml

Modified: paparazzi3/trunk/conf/flight_plans/EMAV2009_safety.xml
===================================================================
--- paparazzi3/trunk/conf/flight_plans/EMAV2009_safety.xml      2009-09-18 
13:40:15 UTC (rev 4175)
+++ paparazzi3/trunk/conf/flight_plans/EMAV2009_safety.xml      2009-09-18 
13:43:22 UTC (rev 4176)
@@ -2,11 +2,11 @@
 
 <procedure>
   <exceptions>
-    <exception cond="Or(! InsideGreen(estimator_x, estimator_y), estimator_z > 
ground_alt + 150)" deroute="Center"/>
+    <exception cond="Or(! InsideGreen(GetPosX(), GetPosY()), GetPosAlt() > 
ground_alt + 150)" deroute="Center"/>
   </exceptions>
 
   <blocks>
-    <block name="Center" pre_call="if (And(!kill_throttle, 
!InsideRed(estimator_x, estimator_y))) kill_throttle=TRUE;">
+    <block name="Center" pre_call="if (!InsideRed(GetPosX(), GetPosY())) 
NavKillThrottle();">
       <circle wp="_CENTER" radius="DEFAULT_CIRCLE_RADIUS"/>
     </block>
   </blocks>