Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 13:27:32 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

[modules] rename nav_x_start to nav_x_setup

Browse Source 
find conf sw/airborne/modules \( -name "*.xml" -o -name "*.[ch]" \) -exec sed -i 's/nav_\([a-z_]*\)start(/nav_\1setup(/g' {} \;
This commit is contained in:
Felix Ruess
2014-04-05 22:08:30 +02:00
parent 97cdc37830
commit d7babaa6b3
41 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/flight_plans/EMAV2008.xml
+1 -1
View File
@@ -67,7 +67,7 @@
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<exception cond="datalink_time > 22" deroute="Standby"/>
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Survey S1-S2" strip_button="Survey (wp S1-S2)" strip_icon="survey.png">
conf/flight_plans/IS.xml
+2 -2
View File
@@ -46,7 +46,7 @@
</block>
<block name="Line">
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
@@ -80,7 +80,7 @@
<block name="Disc survey" strip_button="DS">
<exception cond="chemo_sensor > 0" deroute="ChemotaxisHere"/>
<call fun="nav_survey_disc_start(150)"/>
<call fun="nav_survey_disc_setup(150)"/>
<call fun="nav_survey_disc_run(WP_HOME, 350)"/>
</block>
conf/flight_plans/basic.xml
+1 -1
View File
@@ -55,7 +55,7 @@
<circle radius="nav_radius" wp="MOB"/>
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png" group="extra_pattern">
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Survey S1-S2" strip_button="Survey (wp S1-S2)" strip_icon="survey.png" group="extra_pattern">
conf/flight_plans/creidlitz.xml
+1 -1
View File
@@ -55,7 +55,7 @@
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<exception cond="datalink_time > 22" deroute="Standby"/>
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Oval 1-2" strip_button="Oval (wp 1-2)" strip_icon="oval.png">
conf/flight_plans/grosslobke_demo.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<survey_rectangle grid="150" wp1="S1" wp2="S2"/>
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Oval 1-2" strip_button="Oval (wp 1-2)" strip_icon="oval.png">
conf/flight_plans/joystick.xml
+1 -1
View File
@@ -54,7 +54,7 @@
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<exception cond="datalink_time > 22" deroute="Standby"/>
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Survey S1-S2" strip_button="Survey (wp S1-S2)" strip_icon="survey.png" pre_call="{}">
conf/flight_plans/kv_svalbard.xml
+1 -1
View File
@@ -57,7 +57,7 @@
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<exception cond="datalink_time > 22" deroute="Standby"/>
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Survey S1-S2 NS" strip_button="Survey (wp S1-S2) NS" strip_icon="survey.png">
conf/flight_plans/mav06.xml
+1 -1
View File
@@ -97,7 +97,7 @@
</block>-->
<block name="Line" strip_button="Line">
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_11, WP_22, 100)"/>
</block>
</blocks>
conf/flight_plans/mav08.xml
+1 -1
View File
@@ -80,7 +80,7 @@
<circle radius="nav_radius" wp="MOB"/>
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Survey S1-S2" strip_button="Survey (wp S1-S2)" strip_icon="survey.png">
conf/flight_plans/nav_modules.xml
+7 -7
View File
@@ -70,7 +70,7 @@
<circle radius="nav_radius" wp="MOB"/>
</block>
<block group="extra_pattern" name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block group="extra_pattern" name="Survey S1-S2" strip_button="Survey (wp S1-S2)" strip_icon="survey.png">
@@ -78,15 +78,15 @@
</block>
<!--===================== Nav modules example blocks =================================-->
<block name="Bungee take-off">
<call fun="nav_bungee_takeoff_start(WP_HOME)"/>
<call fun="nav_bungee_takeoff_setup(WP_HOME)"/>
<call fun="nav_bungee_takeoff_run()"/>
</block>
<block name="Poly Survey S1-S2" strip_button="Poly Survey">
<call fun="nav_survey_polygon_start(WP_S1,5,180,30,10,50,100)"/>
<call fun="nav_survey_polygon_setup(WP_S1,5,180,30,10,50,100)"/>
<call fun="nav_survey_polygon_run()"/>
</block>
<block name="Border line 1-2" strip_button="Border Line (wp 1-2)">
<call fun="nav_line_border_start()"/>
<call fun="nav_line_border_setup()"/>
<call fun="nav_line_border_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Smooth nav" strip_button="Smooth nav (wp 1-2)">
@@ -100,18 +100,18 @@
<deroute block="Standby"/>
</block>
<block name="Flower" strip_button="Flower (wp 1-2)">
<call fun="nav_flower_start(WP_1, WP_2)"/>
<call fun="nav_flower_setup(WP_1, WP_2)"/>
<call fun="nav_flower_run()"/>
</block>
<block name="Poly survey">
<call fun="nav_survey_poly_osam_start(WP_S1, 5, 50, 45)"/>
<call fun="nav_survey_poly_osam_setup(WP_S1, 5, 50, 45)"/>
<call fun="nav_survey_poly_osam_run()"/>
</block>
<block name="Flight Line block">
<call fun="nav_line_osam_block_run(WP_S1, WP_S5, nav_radius, 30, 10)"/>
</block>
<block name="Vertical Raster">
<call fun="nav_vertical_raster_start()"/>
<call fun="nav_vertical_raster_setup()"/>
<call fun="nav_vertical_raster_run(WP_S1, WP_S2, nav_radius, 50)"/>
</block>
<!--====================================================================================-->
conf/flight_plans/nordlys.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<deroute block="wait"/>
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Oval 1-2" strip_button="Oval (wp 1-2)" strip_icon="oval.png">
conf/flight_plans/tcas.xml
+1 -1
View File
@@ -54,7 +54,7 @@
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<exception cond="datalink_time > 22" deroute="Standby"/>
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Survey S1-S2" strip_button="Survey (wp S1-S2)" strip_icon="survey.png">
conf/flight_plans/xsens_cachejunction.xml
+2 -2
View File
@@ -44,7 +44,7 @@
</block>
<block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
<exception cond="datalink_time > 22" deroute="Standby"/>
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_1, WP_2, nav_radius)"/>
</block>
<block name="Survey S1-S2" strip_button="Survey (wp S1-S2)" strip_icon="survey.png">
@@ -52,7 +52,7 @@
</block>
<block name="Line S4-5" strip_button="Line (S 4-5)">
<exception cond="datalink_time > 22" deroute="Standby"/>
<call fun="nav_line_start()"/>
<call fun="nav_line_setup()"/>
<call fun="nav_line_run(WP_S4, WP_S5, nav_radius)"/>
</block>
<block name="Steps roll -10, +10">
conf/modules/nav_catapult.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<header>
<file name="nav_catapult.h"/>
</header>
<init fun="nav_catapult_start()"/>
<init fun="nav_catapult_setup()"/>
<!-- Run High Rate Lauch Detector -->
<periodic fun="nav_catapult_highrate_module()" autorun="TRUE"/>
<makefile target="ap|sim|jsbsim|nps">
conf/modules/nav_line_border.xml
+1 -1
View File
@@ -10,7 +10,7 @@
take care youre navigation radius is not to small in strong wind conditions!
In the flight plan:
<!--
<call fun="nav_line_border_start()"/>
<call fun="nav_line_border_setup()"/>
<call fun="nav_line_border_run(WP_waypoint1_name, WP_waypoint1_name, nav_radius)"/>
-->
conf/modules/nav_survey_polygon.xml
+2 -2
View File
@@ -6,7 +6,7 @@
Survey a polygon with a fixedwing.
From Uni Stuttgart.
In the flight plan, the survey blocks call init and run functions:
1. Initialize the variables needed for the survey to start, with nav_survey_polygon_start(first_wp, size, angle, sweep_width, shot_dist, min_rad, altitude):
1. Initialize the variables needed for the survey to start, with nav_survey_polygon_setup(first_wp, size, angle, sweep_width, shot_dist, min_rad, altitude):
- first_wp the first Waypoint of the polygon (WP_waypoint_name)
- size the number of points that make up the polygon
- angle angle in which to do the flyovers
@@ -19,7 +19,7 @@ In the flight plan, the survey blocks call init and run functions:
Block example:
@verbatim
<block name="Poly Survey" strip_button="Poly Survey">
<call fun="nav_survey_polygon_start(first_wp, size, angle, sweep_width, shot_dist, min_rad, altitude)"/>
<call fun="nav_survey_polygon_setup(first_wp, size, angle, sweep_width, shot_dist, min_rad, altitude)"/>
<call fun="nav_survey_polygon_run()"/>
</block>
@endverbatim
sw/airborne/modules/cartography/photogrammetry_calculator.h
+2 -2
View File
@@ -140,11 +140,11 @@ void photogrammetry_calculator_update_flightplan2camera(void);
WaypointAlt(_WP) = photogrammetry_height + GROUND_ALT; \
int _ang = 90 - DegOfRad(photogrammetry_sweep_angle); \
while (_ang > 90) _ang -= 180; while (_ang < -90) _ang += 180; \
nav_survey_poly_osam_start((_WP), (_COUNT), 2*photogrammetry_sidestep, _ang); \
nav_survey_poly_osam_setup((_WP), (_COUNT), 2*photogrammetry_sidestep, _ang); \
}
#define PhotogrammetryCalculatorPolygonSurvey(_WP, _COUNT) { \
nav_survey_polygon_start((_WP), (_COUNT), DegOfRad(photogrammetry_sweep_angle), \
nav_survey_polygon_setup((_WP), (_COUNT), DegOfRad(photogrammetry_sweep_angle), \
photogrammetry_sidestep, photogrammetry_triggerstep, \
photogrammetry_radius_min, photogrammetry_height + GROUND_ALT); \
}
sw/airborne/modules/nav/nav_bungee_takeoff.c
+1 -1
View File
@@ -76,7 +76,7 @@ static float BungeeAlt;
static float TDistance;
static uint8_t BungeeWaypoint;
bool_t nav_bungee_takeoff_start(uint8_t BungeeWP)
bool_t nav_bungee_takeoff_setup(uint8_t BungeeWP)
{
float ThrottleB;
sw/airborne/modules/nav/nav_bungee_takeoff.h
+1 -1
View File
@@ -31,7 +31,7 @@
#include "std.h"
extern bool_t nav_bungee_takeoff_start(uint8_t BungeeWP);
extern bool_t nav_bungee_takeoff_setup(uint8_t BungeeWP);
extern bool_t nav_bungee_takeoff_run(void);
#endif
sw/airborne/modules/nav/nav_catapult.c
+1 -1
View File
@@ -135,7 +135,7 @@ void nav_catapult_highrate_module(void)
//###############################################################################################
// Code that runs in 4Hz Nav
bool_t nav_catapult_start(void)
bool_t nav_catapult_setup(void)
{
nav_catapult_armed = TRUE;
sw/airborne/modules/nav/nav_catapult.h
+1 -1
View File
@@ -42,7 +42,7 @@ extern float nav_catapult_initial_throttle;
void nav_catapult_highrate_module(void);
// Flightplan Code
extern bool_t nav_catapult_start(void);
extern bool_t nav_catapult_setup(void);
extern bool_t nav_catapult_arm(void);
extern bool_t nav_catapult_run(uint8_t _to, uint8_t _climb);
sw/airborne/modules/nav/nav_cube.c
+1 -1
View File
@@ -36,7 +36,7 @@
struct NavCube nav_cube;
bool_t nav_cube_start(uint8_t center, uint8_t tb, uint8_t te) {
bool_t nav_cube_setup(uint8_t center, uint8_t tb, uint8_t te) {
int32_t j, start_bx, start_by, start_bz, start_ex, start_ey, start_ez;
int32_t bx, by, ex, ey;
sw/airborne/modules/nav/nav_cube.h
+1 -1
View File
@@ -122,7 +122,7 @@ struct NavCube {
extern struct NavCube nav_cube;
extern bool_t nav_cube_start(uint8_t turb, uint8_t tb, uint8_t te);
extern bool_t nav_cube_setup(uint8_t turb, uint8_t tb, uint8_t te);
bool_t nav_cube_run(int8_t j, int8_t i,
uint8_t dest_b, uint8_t dest_e,
uint8_t src_b, uint8_t src_e);
sw/airborne/modules/nav/nav_flower.c
+1 -1
View File
@@ -57,7 +57,7 @@ static float Flowerradius;
static uint8_t Center;
static uint8_t Edge;
bool_t nav_flower_start(uint8_t CenterWP, uint8_t EdgeWP)
bool_t nav_flower_setup(uint8_t CenterWP, uint8_t EdgeWP)
{
Center = CenterWP;
Edge = EdgeWP;
sw/airborne/modules/nav/nav_flower.h
+1 -1
View File
@@ -30,6 +30,6 @@
#include "std.h"
extern bool_t nav_flower_run(void);
extern bool_t nav_flower_start(uint8_t CenterWP, uint8_t EdgeWP);
extern bool_t nav_flower_setup(uint8_t CenterWP, uint8_t EdgeWP);
#endif
sw/airborne/modules/nav/nav_line.c
+1 -1
View File
@@ -33,7 +33,7 @@
enum line_status { LR12, LQC21, LTC2, LQC22, LR21, LQC12, LTC1, LQC11 };
static enum line_status line_status;
bool_t nav_line_start( void ) {
bool_t nav_line_setup( void ) {
line_status = LR12;
return FALSE;
}
sw/airborne/modules/nav/nav_line.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include "std.h"
extern bool_t nav_line_start( void );
extern bool_t nav_line_setup( void );
extern bool_t nav_line_run(uint8_t wp1, uint8_t wp2, float radius);
#endif /* NAV_LINE_H */
sw/airborne/modules/nav/nav_line_border.c
+1 -1
View File
@@ -37,7 +37,7 @@
enum line_border_status { LR12, LQC21, LTC2, LQC22, LR21, LQC12, LTC1, LQC11 };
static enum line_border_status line_border_status;
bool_t nav_line_border_start( void ) {
bool_t nav_line_border_setup( void ) {
line_border_status = LR12;
return FALSE;
}
sw/airborne/modules/nav/nav_line_border.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include "std.h"
extern bool_t nav_line_border_start( void );
extern bool_t nav_line_border_setup( void );
extern bool_t nav_line_border_run(uint8_t wp1, uint8_t wp2, float radius);
#endif /* NAV_LINE_BORDER_H */
sw/airborne/modules/nav/nav_spiral.c
+1 -1
View File
@@ -47,7 +47,7 @@
struct NavSpiral nav_spiral;
bool_t nav_spiral_start(uint8_t center_wp, uint8_t edge_wp, float radius_start, float radius_inc, float segments)
bool_t nav_spiral_setup(uint8_t center_wp, uint8_t edge_wp, float radius_start, float radius_inc, float segments)
{
VECT2_COPY(nav_spiral.center, waypoints[center_wp]); // center of the helix
nav_spiral.center.z = waypoints[center_wp].a;
sw/airborne/modules/nav/nav_spiral.h
+1 -1
View File
@@ -52,7 +52,7 @@ struct NavSpiral {
extern struct NavSpiral nav_spiral;
extern bool_t nav_spiral_run(void);
extern bool_t nav_spiral_start(uint8_t center_wp, uint8_t edge_wp, float radius_start,
extern bool_t nav_spiral_setup(uint8_t center_wp, uint8_t edge_wp, float radius_start,
float radius_inc, float segments);
#endif // NAV_SPIRAL_H
sw/airborne/modules/nav/nav_survey_disc.c
+1 -1
View File
@@ -46,7 +46,7 @@ struct DiscSurvey {
static struct DiscSurvey disc_survey;
bool_t nav_survey_disc_start( float grid ) {
bool_t nav_survey_disc_setup( float grid ) {
nav_survey_shift = grid;
disc_survey.status = DOWNWIND;
disc_survey.sign = 1;
sw/airborne/modules/nav/nav_survey_disc.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include "std.h"
extern bool_t nav_survey_disc_start( float grid );
extern bool_t nav_survey_disc_setup( float grid );
extern bool_t nav_survey_disc_run(uint8_t c, float radius);
#endif /* NAV_SURVEY_DISC_H */
sw/airborne/modules/nav/nav_survey_poly_osam.c
+1 -1
View File
@@ -77,7 +77,7 @@ static float MaxY;
uint16_t PolySurveySweepNum;
uint16_t PolySurveySweepBackNum;
bool_t nav_survey_poly_osam_start(uint8_t EntryWP, uint8_t Size, float sw, float Orientation)
bool_t nav_survey_poly_osam_setup(uint8_t EntryWP, uint8_t Size, float sw, float Orientation)
{
SmallestCorner.x = 0;
SmallestCorner.y = 0;
sw/airborne/modules/nav/nav_survey_poly_osam.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include "std.h"
extern bool_t nav_survey_poly_osam_start(uint8_t FirstWP, uint8_t Size, float Sweep, float Orientation);
extern bool_t nav_survey_poly_osam_setup(uint8_t FirstWP, uint8_t Size, float Sweep, float Orientation);
extern bool_t nav_survey_poly_osam_run(void);
extern uint16_t PolySurveySweepNum;
extern uint16_t PolySurveySweepBackNum;
sw/airborne/modules/nav/nav_survey_polygon.c
+1 -1
View File
@@ -129,7 +129,7 @@ static bool_t get_two_intersects(struct FloatVect2 *x, struct FloatVect2 *y, str
* @param min_rad minimal radius when navigating
* @param altitude the altitude that must be reached before the flyover starts
**/
bool_t nav_survey_polygon_start(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude)
bool_t nav_survey_polygon_setup(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude)
{
int i;
struct FloatVect2 small, sweep;
sw/airborne/modules/nav/nav_survey_polygon.h
+1 -1
View File
@@ -82,7 +82,7 @@ struct SurveyPolyAdv {
struct FloatVect2 ret_end;
};
extern bool_t nav_survey_polygon_start(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude);
extern bool_t nav_survey_polygon_setup(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude);
extern bool_t nav_survey_polygon_run(void);
#endif
sw/airborne/modules/nav/nav_survey_zamboni.c
+1 -1
View File
@@ -54,7 +54,7 @@ struct ZamboniSurvey zs;
* @param sweep_lines number of sweep_lines to fly
* @param altitude the altitude that must be reached before the flyover starts
*/
bool_t nav_survey_zamboni_start(uint8_t center_wp, uint8_t dir_wp, float sweep_length, float sweep_spacing, int sweep_lines, float altitude)
bool_t nav_survey_zamboni_setup(uint8_t center_wp, uint8_t dir_wp, float sweep_length, float sweep_spacing, int sweep_lines, float altitude)
{
zs.current_laps = 0;
zs.pre_leave_angle = 2;
sw/airborne/modules/nav/nav_survey_zamboni.h
+1 -1
View File
@@ -70,7 +70,7 @@ struct ZamboniSurvey {
};
extern bool_t nav_survey_zamboni_start(uint8_t center_wp, uint8_t dir_wp, float sweep_length, float sweep_spacing, int sweep_lines, float altitude);
extern bool_t nav_survey_zamboni_setup(uint8_t center_wp, uint8_t dir_wp, float sweep_length, float sweep_spacing, int sweep_lines, float altitude);
extern bool_t nav_survey_zamboni_run(void);
#endif //ZAMBONI_SURVEY_H
sw/airborne/modules/nav/nav_vertical_raster.c
+1 -1
View File
@@ -40,7 +40,7 @@
enum line_status { LR12, LQC21, LTC2, LQC22, LR21, LQC12, LTC1, LQC11 };
static enum line_status line_status;
bool_t nav_vertical_raster_start( void ) {
bool_t nav_vertical_raster_setup( void ) {
line_status = LR12;
return FALSE;
}
sw/airborne/modules/nav/nav_vertical_raster.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include "std.h"
extern bool_t nav_vertical_raster_start( void );
extern bool_t nav_vertical_raster_setup( void );
extern bool_t nav_vertical_raster_run(uint8_t wp1, uint8_t wp2, float radius, float AltSweep);
#endif