fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 19:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

navigator remove FW and MC cruise parameters

Browse Source
This commit is contained in:
Daniel Agar
2017-04-23 14:50:21 +02:00
committed by Lorenz Meier
parent 0106840b87
commit 1fd343b5cc
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/navigator_main.cpp
+3 -6
View File
@@ -99,10 +99,7 @@ Navigator::Navigator() :
_param_loiter_radius(this, "LOITER_RAD"),
_param_acceptance_radius(this, "ACC_RAD"),
_param_fw_alt_acceptance_radius(this, "FW_ALT_RAD"),
_param_mc_alt_acceptance_radius(this, "MC_ALT_RAD"),
_param_cruising_speed_hover(this, "MPC_XY_CRUISE", false),
_param_cruising_speed_plane(this, "FW_AIRSPD_TRIM", false),
_param_cruising_throttle_plane(this, "FW_THR_CRUISE", false)
_param_mc_alt_acceptance_radius(this, "MC_ALT_RAD")
{
/* Create a list of our possible navigation types */
_navigation_mode_array[0] = &_mission;
@@ -745,7 +742,7 @@ Navigator::get_cruising_speed()
return _mission_cruising_speed_mc;
} else {
return _param_cruising_speed_hover.get();
return -1.0f;
}
} else {
@@ -753,7 +750,7 @@ Navigator::get_cruising_speed()
return _mission_cruising_speed_fw;
} else {
return _param_cruising_speed_plane.get();
return -1.0f;
}
}
}