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

Navigator: Move mission param into mission params

Browse Source 
This is important for the compile scope.
This commit is contained in:
Lorenz Meier 2018-01-07 22:59:31 +01:00
parent 7ae3884944
commit d8164377a8
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/vmount/vmount_params.c
View File

@ -225,17 +225,3 @@ PARAM_DEFINE_FLOAT(MNT_OFF_ROLL, 0.0f);
* @group Mount
*/
PARAM_DEFINE_FLOAT(MNT_OFF_YAW, 0.0f);
/**
* Enable yaw control of the mount. (Only affects multicopters and ROI mission items)
*
* If enabled, yaw commands will be sent to the mount and the vehicle will follow its heading mode as specified by MIS_YAWMODE.
* If disabled, the vehicle will yaw towards the ROI.
*
* @value 0 Disable
* @value 1 Enable
* @min 0
* @max 1
* @group Mount
*/
PARAM_DEFINE_INT32(MNT_YAW_CTL, 0);

3
src/modules/navigator/mission.cpp
View File

@ -64,7 +64,8 @@ Mission::Mission(Navigator *navigator, const char *name) :
_param_dist_1wp(this, "MIS_DIST_1WP", false),
_param_dist_between_wps(this, "MIS_DIST_WPS", false),
_param_altmode(this, "MIS_ALTMODE", false),
_param_yawmode(this, "MIS_YAWMODE", false)
_param_yawmode(this, "MIS_YAWMODE", false),
_param_mnt_yaw_ctl(this, "MIS_MNT_YAW_CTL", false)
{
}

14
src/modules/navigator/mission_params.c
View File

@ -134,6 +134,20 @@ PARAM_DEFINE_INT32(MIS_ALTMODE, 1);
*/
PARAM_DEFINE_INT32(MIS_YAWMODE, 1);
/**
* Enable yaw control of the mount. (Only affects multicopters and ROI mission items)
*
* If enabled, yaw commands will be sent to the mount and the vehicle will follow its heading mode as specified by MIS_YAWMODE.
* If disabled, the vehicle will yaw towards the ROI.
*
* @value 0 Disable
* @value 1 Enable
* @min 0
* @max 1
* @group Mission
*/
PARAM_DEFINE_INT32(MIS_MNT_YAW_CTL, 0);
/**
* Time in seconds we wait on reaching target heading at a waypoint if it is forced.
*