[paparazzi-commits] [4861] change booz FP name to basic_booz.xml

[Gautier Hattenberger]

Revision: 4861
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4861
Author:   gautier
Date:     2010-04-22 14:35:36 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
change booz FP name to basic_booz.xml

Added Paths:
-----------
    paparazzi3/trunk/conf/flight_plans/basic_booz.xml

Removed Paths:
-------------
    paparazzi3/trunk/conf/flight_plans/booz_test_2.xml

Copied: paparazzi3/trunk/conf/flight_plans/basic_booz.xml (from rev 4860, 
paparazzi3/trunk/conf/flight_plans/booz_test_2.xml)
===================================================================
--- paparazzi3/trunk/conf/flight_plans/basic_booz.xml                           
(rev 0)
+++ paparazzi3/trunk/conf/flight_plans/basic_booz.xml   2010-04-22 14:35:36 UTC 
(rev 4861)
@@ -0,0 +1,83 @@
+<!DOCTYPE flight_plan SYSTEM "flight_plan.dtd">
+
+<flight_plan alt="152" ground_alt="147" lat0="43 33 50.83" lon0="1 28 52.61" 
max_dist_from_home="400" name="Booz Test Enac" security_height="2">
+  <header>
+    #include "booz_fms.h"
+  </header>
+  <waypoints>
+    <waypoint name="HOME" x="0.0" y="0.0"/>
+    <waypoint name="CLIMB" x="0.0" y="5.0"/>
+    <waypoint name="STDBY" x="-2.0" y="-5.0"/>
+    <waypoint name="p1" x="3.6" y="-13.9"/>
+    <waypoint name="p2" x="27.5" y="-48.2"/>
+    <waypoint name="p3" x="16.7" y="-19.6"/>
+    <waypoint name="p4" x="13.7" y="-40.7"/>
+    <waypoint name="CAM" x="-20" y="-50" height="2."/>
+    <waypoint name="TD" x="5.6" y="-10.9"/>
+  </waypoints>
+  <blocks>
+    <block name="Wait GPS">
+      <call fun="NavKillThrottle()"/>
+      <while cond="!GpsFixValid()"/>
+    </block>
+    <block name="Geo init">
+      <while cond="LessThan(NavBlockTime(), 10)"/>
+      <call fun="NavSetGroundReferenceHere()"/>
+      <!--<call fun="NavSetAltitudeReferenceHere()"/>-->
+    </block>
+    <block name="Holding point">
+      <call fun="NavKillThrottle()"/>
+      <attitude pitch="0" roll="0" throttle="0" vmode="throttle" 
until="FALSE"/>
+    </block>
+    <block name="Start Engine">
+      <call fun="NavResurrect()"/>
+      <attitude pitch="0" roll="0" throttle="0" vmode="throttle" 
until="FALSE"/>
+    </block>
+    <block name="Takeoff" strip_button="Takeoff" strip_icon="takeoff.png">
+      <exception cond="booz_ins_enu_pos.z > POS_BFP_OF_REAL(2.)" 
deroute="Standby"/>
+      <call fun="NavSetWaypointHere(WP_CLIMB)"/>
+      <stay vmode="climb" climb="0.5" wp="CLIMB"/>
+    </block>
+    <block name="Standby" strip_button="Standby" strip_icon="home.png">
+      <stay wp="STDBY"/>
+    </block>
+    <block name="stay_p1">
+      <stay wp="p1"/>
+    </block>
+    <block name="go_p2">
+      <go wp="p2"/>
+      <deroute block="stay_p1"/>
+    </block>
+    <block name="line_p1_p2">
+      <go from="p1" hmode="route" wp="p2"/>
+      <stay wp="p2" until="stage_time>10"/>
+      <go from="p2" hmode="route" wp="p1"/>
+      <deroute block="stay_p1"/>
+    </block>
+    <block name="route">
+      <go from="p1" hmode="route" wp="p3"/>
+      <go from="p3" hmode="route" wp="p4"/>
+      <go from="p4" hmode="route" wp="p1"/>
+      <deroute block="stay_p1"/>
+    </block>
+    <block name="circle">
+      <circle radius="nav_radius" wp="p1"/>
+    </block>
+    <block name="Joystick" pre_call="NavUpdateWPFromFms(WP_p1)" 
strip_button="Joystick" strip_icon="joystick.png">
+      <set var="fms.enabled" value="TRUE"/>
+      <call fun="NavSetWaypointHere(WP_p1)"/>
+      <stay wp="p1"/>
+    </block>
+    <block name="land here" strip_button="Land Here" 
strip_icon="land-right.png">
+      <call fun="NavSetWaypointHere(WP_TD)"/>
+    </block>
+    <block name="land">
+      <go wp="TD"/>
+    </block>
+    <block name="flare">
+      <exception cond="NavDetectGround()" deroute="Holding point"/>
+      <call fun="NavStartDetectGround()"/>
+      <stay climb="-0.8" vmode="climb" wp="TD"/>
+    </block>
+  </blocks>
+</flight_plan>

Deleted: paparazzi3/trunk/conf/flight_plans/booz_test_2.xml
===================================================================
--- paparazzi3/trunk/conf/flight_plans/booz_test_2.xml  2010-04-22 14:33:20 UTC 
(rev 4860)
+++ paparazzi3/trunk/conf/flight_plans/booz_test_2.xml  2010-04-22 14:35:36 UTC 
(rev 4861)
@@ -1,83 +0,0 @@
-<!DOCTYPE flight_plan SYSTEM "flight_plan.dtd">
-
-<flight_plan alt="152" ground_alt="147" lat0="43 33 50.83" lon0="1 28 52.61" 
max_dist_from_home="400" name="Booz Test Enac" security_height="2">
-  <header>
-    #include "booz_fms.h"
-  </header>
-  <waypoints>
-    <waypoint name="HOME" x="0.0" y="0.0"/>
-    <waypoint name="CLIMB" x="0.0" y="5.0"/>
-    <waypoint name="STDBY" x="-2.0" y="-5.0"/>
-    <waypoint name="p1" x="3.6" y="-13.9"/>
-    <waypoint name="p2" x="27.5" y="-48.2"/>
-    <waypoint name="p3" x="16.7" y="-19.6"/>
-    <waypoint name="p4" x="13.7" y="-40.7"/>
-    <waypoint name="CAM" x="-20" y="-50" height="2."/>
-    <waypoint name="TD" x="5.6" y="-10.9"/>
-  </waypoints>
-  <blocks>
-    <block name="Wait GPS">
-      <call fun="NavKillThrottle()"/>
-      <while cond="!GpsFixValid()"/>
-    </block>
-    <block name="Geo init">
-      <while cond="LessThan(NavBlockTime(), 10)"/>
-      <call fun="NavSetGroundReferenceHere()"/>
-      <!--<call fun="NavSetAltitudeReferenceHere()"/>-->
-    </block>
-    <block name="Holding point">
-      <call fun="NavKillThrottle()"/>
-      <attitude pitch="0" roll="0" throttle="0" vmode="throttle" 
until="FALSE"/>
-    </block>
-    <block name="Start Engine">
-      <call fun="NavResurrect()"/>
-      <attitude pitch="0" roll="0" throttle="0" vmode="throttle" 
until="FALSE"/>
-    </block>
-    <block name="Takeoff" strip_button="Takeoff" strip_icon="takeoff.png">
-      <exception cond="booz_ins_enu_pos.z > POS_BFP_OF_REAL(2.)" 
deroute="Standby"/>
-      <call fun="NavSetWaypointHere(WP_CLIMB)"/>
-      <stay vmode="climb" climb="0.5" wp="CLIMB"/>
-    </block>
-    <block name="Standby" strip_button="Standby" strip_icon="home.png">
-      <stay wp="STDBY"/>
-    </block>
-    <block name="stay_p1">
-      <stay wp="p1"/>
-    </block>
-    <block name="go_p2">
-      <go wp="p2"/>
-      <deroute block="stay_p1"/>
-    </block>
-    <block name="line_p1_p2">
-      <go from="p1" hmode="route" wp="p2"/>
-      <stay wp="p2" until="stage_time>10"/>
-      <go from="p2" hmode="route" wp="p1"/>
-      <deroute block="stay_p1"/>
-    </block>
-    <block name="route">
-      <go from="p1" hmode="route" wp="p3"/>
-      <go from="p3" hmode="route" wp="p4"/>
-      <go from="p4" hmode="route" wp="p1"/>
-      <deroute block="stay_p1"/>
-    </block>
-    <block name="circle">
-      <circle radius="nav_radius" wp="p1"/>
-    </block>
-    <block name="Joystick" pre_call="NavUpdateWPFromFms(WP_p1)" 
strip_button="Joystick" strip_icon="joystick.png">
-      <set var="fms.enabled" value="TRUE"/>
-      <call fun="NavSetWaypointHere(WP_p1)"/>
-      <stay wp="p1"/>
-    </block>
-    <block name="land here" strip_button="Land Here" 
strip_icon="land-right.png">
-      <call fun="NavSetWaypointHere(WP_TD)"/>
-    </block>
-    <block name="land">
-      <go wp="TD"/>
-    </block>
-    <block name="flare">
-      <exception cond="NavDetectGround()" deroute="Holding point"/>
-      <call fun="NavStartDetectGround()"/>
-      <stay climb="-0.8" vmode="climb" wp="TD"/>
-    </block>
-  </blocks>
-</flight_plan>