[paparazzi-commits] [4921] define some defaults for OSAMnav

[Felix Ruess]

Revision: 4921
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4921
Author:   flixr
Date:     2010-06-12 19:00:55 +0000 (Sat, 12 Jun 2010)
Log Message:
-----------
define some defaults for OSAMnav

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/OSAMNav.c

Modified: paparazzi3/trunk/sw/airborne/OSAMNav.c
===================================================================
--- paparazzi3/trunk/sw/airborne/OSAMNav.c      2010-06-12 12:59:21 UTC (rev 
4920)
+++ paparazzi3/trunk/sw/airborne/OSAMNav.c      2010-06-12 19:00:55 UTC (rev 
4921)
@@ -140,9 +140,23 @@
   <define name="Height" value="30" unit="m"/>
   <define name="Speed" value="15" unit="m/s"/>
   <define name="Distance" value="10" unit="m"/>
+  <define name="MinSpeed" value="5" unit="m/s"/>
 </section>
  */
 
+#ifndef Takeoff_Distance
+#define Takeoff_Distance 10
+#endif
+#ifndef Takeoff_Height
+#define Takeoff_Height 30
+#endif
+#ifndef Takeoff_Speed
+#define Takeoff_Speed 15
+#endif
+#ifndef Takeoff_MinSpeed
+#define Takeoff_MinSpeed 5
+#endif
+
 enum TakeoffStatus { Launch, Throttle, Finished };
 static enum TakeoffStatus CTakeoffStatus;
 static float throttlePx;
@@ -829,8 +843,26 @@
 /************** SkidLanding **********************************************/
 /*
 Landing Routine
+
+
+  <section name="Landing" prefix="Landing_">
+    <define name="AFHeight" value="50" unit="m"/>
+    <define name="FinalHeight" value="5" unit="m"/>
+    <define name="FinalStageTime" value="5" unit="s"/>
+  </section>
+
  */
- 
+
+#ifndef Landing_AFHeight
+#define Landing_AFHeight 50
+#endif
+#ifndef Landing_FinalHeight
+#define Landing_FinalHeight 5
+#endif
+#ifndef Landing_FinalStageTime
+#define Landing_FinalStageTime 5
+#endif
+
 enum LandingStatus { CircleDown, LandingWait, Final, Approach };
 static enum LandingStatus CLandingStatus;
 static uint8_t AFWaypoint;