diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-27 22:33:32 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-27 22:33:32 +0200 |
| commit | f56efaf149807cbdc559a88df1abcf9bb13b9364 (patch) | |
| tree | 7bf56e57c71bcfedc47a7af9be4bab290beb21da /src/modules/navigator | |
| parent | 8595c734e646f22226672e0e06b6c38e0d80cb20 (diff) | |
| parent | bd1c3363df44170523c68fd87ee19f2582a5e8fc (diff) | |
| download | px4-firmware-stable.tar.gz px4-firmware-stable.tar.bz2 px4-firmware-stable.zip | |
Merge branch 'master' into stablestable
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/mission_feasibility_checker.cpp | 2 | ||||
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 2 | ||||
| -rw-r--r-- | src/modules/navigator/rtl_params.c | 12 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/modules/navigator/mission_feasibility_checker.cpp b/src/modules/navigator/mission_feasibility_checker.cpp index 904f44238..949231b15 100644 --- a/src/modules/navigator/mission_feasibility_checker.cpp +++ b/src/modules/navigator/mission_feasibility_checker.cpp @@ -134,7 +134,7 @@ bool MissionFeasibilityChecker::checkHomePositionAltitude(dm_item_t dm_current, { /* Check if all all waypoints are above the home altitude, only return false if bool throw_error = true */ for (size_t i = 0; i < nMissionItems; i++) { - static struct mission_item_s missionitem; + struct mission_item_s missionitem; const ssize_t len = sizeof(struct mission_item_s); if (dm_read(dm_current, i, &missionitem, len) != len) { diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 9691e26a8..042f926d3 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -518,7 +518,7 @@ Navigator::start() _navigator_task = task_spawn_cmd("navigator", SCHED_DEFAULT, SCHED_PRIORITY_DEFAULT + 20, - 1800, + 1700, (main_t)&Navigator::task_main_trampoline, nullptr); diff --git a/src/modules/navigator/rtl_params.c b/src/modules/navigator/rtl_params.c index 7800a6f03..3d8c78cf1 100644 --- a/src/modules/navigator/rtl_params.c +++ b/src/modules/navigator/rtl_params.c @@ -48,18 +48,6 @@ */ /** - * Loiter radius after RTL (FW only) - * - * Default value of loiter radius after RTL (fixedwing only). - * - * @unit meters - * @min 20 - * @max 200 - * @group Return To Land - */ -PARAM_DEFINE_FLOAT(RTL_LOITER_RAD, 50.0f); - -/** * RTL altitude * * Altitude to fly back in RTL in meters |