Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 05:42:49 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[nav] trying to harmonize nav modules

Browse Source
This commit is contained in:
Gautier Hattenberger
2013-11-04 23:40:52 +01:00
committed by Felix Ruess
parent f1f1a1a4bb
commit 0446598931
21 changed files with 103 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/flight_plans/nav_modules.xml
+13 -13
View File
@@ -74,16 +74,16 @@
</block>
<!--===================== Nav modules example blocks =================================-->
<block name="Bungee take-off">
<call fun="bungee_takeoff_start(WP_HOME)"/>
<call fun="bungee_takeoff_run()"/>
<call fun="nav_bungee_takeoff_start(WP_HOME)"/>
<call fun="nav_bungee_takeoff_run()"/>
</block>
<block name="Poly Survey S1-S2" strip_button="Poly Survey">
<call fun="poly_survey_adv_start(WP_S1,5,180,30,10,50,100)"/>
<call fun="poly_survey_adv_run()"/>
<call fun="nav_survey_poly_adv_start(WP_S1,5,180,30,10,50,100)"/>
<call fun="nav_survey_poly_adv_run()"/>
</block>
<block name="Border line 1-2" strip_button="Border Line (wp 1-2)">
<call fun="border_line_start()"/>
<call fun="border_line_run(WP_1, WP_2, nav_radius)"/>
<call fun="nav_line_border_start()"/>
<call fun="nav_line_border_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Smooth nav" strip_button="Smooth nav (wp 1-2)">
<set var="snav_desired_tow" value="gps.tow / 1000. + 200."/>
@@ -96,19 +96,19 @@
<deroute block="Standby"/>
</block>
<block name="Flower" strip_button="Flower (wp 1-2)">
<call fun="flower_start(WP_1, WP_2)"/>
<call fun="flower_run()"/>
<call fun="nav_flower_start(WP_1, WP_2)"/>
<call fun="nav_flower_run()"/>
</block>
<block name="Poly survey">
<call fun="osam_poly_survey_start(WP_S1, 5, 50, 45)"/>
<call fun="osam_poly_survey_run()"/>
<call fun="nav_survey_poly_osam_start(WP_S1, 5, 50, 45)"/>
<call fun="nav_survey_poly_osam_run()"/>
</block>
<block name="Flight Line block">
<call fun="osam_flight_line_block_run(WP_S1, WP_S5, nav_radius, 30, 10)"/>
<call fun="nav_line_osam_block_run(WP_S1, WP_S5, nav_radius, 30, 10)"/>
</block>
<block name="Vertical Raster">
<call fun="vertical_raster_start()"/>
<call fun="vertical_raster_run(WP_S1, WP_S2, nav_radius, 50)"/>
<call fun="nav_vertical_raster_start()"/>
<call fun="nav_vertical_raster_run(WP_S1, WP_S2, nav_radius, 50)"/>
</block>
<!--====================================================================================-->