Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 09:58:23 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[flight plan] make 'until' attribute consistent (#1970)

Browse Source 
This makes the 'until' attribute of `heading`, `attitude` and `manual` consistent with the rest:
So until will always behave like:
- do something
- check if again

E.g. `<attitude ... until="some_condition"/>` will now create
```
NavAttitude(...);
if (some_condition) NextStageAndBreak();
break;
```

Fixes #1903
This commit is contained in:
Felix Ruess
2016-12-16 16:57:21 +01:00
committed by Gautier Hattenberger
parent b496bd9d23
commit 6ffcc2c89e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/tools/generators/gen_flight_plan.ml
+3 -3
View File
@@ -394,9 +394,9 @@ let rec print_stage = fun index_of_waypoints x ->
| "heading" ->
stage ();
fp_pre_call x;
stage_until x;
lprintf "NavHeading(RadOfDeg(%s));\n" (parsed_attrib x "course");
ignore (output_vmode x "" "");
stage_until x;
fp_post_call x;
lprintf "break;\n"
| "follow" ->
@@ -411,17 +411,17 @@ let rec print_stage = fun index_of_waypoints x ->
| "attitude" ->
stage ();
fp_pre_call x;
stage_until x;
lprintf "NavAttitude(RadOfDeg(%s));\n" (parsed_attrib x "roll");
ignore (output_vmode x "" "");
stage_until x;
fp_post_call x;
lprintf "break;\n"
| "manual" ->
stage ();
fp_pre_call x;
stage_until x;
lprintf "NavSetManual(%s, %s, %s);\n" (parsed_attrib x "roll") (parsed_attrib x "pitch") (parsed_attrib x "yaw");
ignore (output_vmode x "" "");
stage_until x;
fp_post_call x;
lprintf "break;\n"
| "go" ->