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

change feature name from CollisionAvoidance to CollisionPrevention

Browse Source
This commit is contained in:
baumanta
2018-11-20 14:11:33 +01:00
committed by Beat Küng
parent f611eddadd
commit dd45fa6541
8 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mc_pos_control/CMakeLists.txt
+1 -1
View File
@@ -45,5 +45,5 @@ px4_add_module(
git_ecl
ecl_geo
WeatherVane
CollisionAvoidance
CollisionPrevention
)
src/modules/mc_pos_control/mc_pos_control_params.c
+2 -2
View File
@@ -744,7 +744,7 @@ PARAM_DEFINE_INT32(MPC_YAW_MODE, 0);
* @boolean
* @group Multicopter Position Control
*/
PARAM_DEFINE_INT32(MPC_COL_AVOID, 0);
PARAM_DEFINE_INT32(MPC_COL_PREV, 0);
/**
* Minimum distance the vehicle should keep to all obstacles
@@ -756,4 +756,4 @@ PARAM_DEFINE_INT32(MPC_COL_AVOID, 0);
* @unit meters
* @group Multicopter Position Control
*/
PARAM_DEFINE_FLOAT(MPC_COL_AVOID_D, 4.0f);
PARAM_DEFINE_FLOAT(MPC_COL_PREV_D, 4.0f);