[paparazzi-commits] [4163] add until attribute to stay stage

[Pascal Brisset]

Revision: 4163
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4163
Author:   hecto
Date:     2009-09-12 21:26:46 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
 add until attribute to stay stage

Modified Paths:
--------------
    paparazzi3/trunk/conf/flight_plans/flight_plan.dtd
    paparazzi3/trunk/sw/tools/gen_flight_plan.ml

Modified: paparazzi3/trunk/conf/flight_plans/flight_plan.dtd
===================================================================
--- paparazzi3/trunk/conf/flight_plans/flight_plan.dtd  2009-09-12 21:26:18 UTC 
(rev 4162)
+++ paparazzi3/trunk/conf/flight_plans/flight_plan.dtd  2009-09-12 21:26:46 UTC 
(rev 4163)
@@ -207,6 +207,7 @@
 throttle CDATA #IMPLIED
 climb CDATA #IMPLIED
 alt CDATA #IMPLIED
+until CDATA #IMPLIED
 height CDATA #IMPLIED>
 
 <!ATTLIST deroute

Modified: paparazzi3/trunk/sw/tools/gen_flight_plan.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_flight_plan.ml        2009-09-12 21:26:18 UTC 
(rev 4162)
+++ paparazzi3/trunk/sw/tools/gen_flight_plan.ml        2009-09-12 21:26:46 UTC 
(rev 4163)
@@ -402,6 +402,13 @@
              lprintf "NavGotoXY(last_x, last_y);\n";
                ignore(output_vmode x "" "")
        end;
+       begin
+         try
+           let c = parsed_attrib x "until" in
+           lprintf "if (%s) NextStageAndBreak();\n" c
+         with
+           ExtXml.Error _ -> ()
+       end;
        lprintf "break;\n"
     | "xyz" ->
        stage ();