Skip to content

Commit

Permalink
AC_AttitudeControl: fixed PIRO_COMP index
Browse files Browse the repository at this point in the history
this is a new conflict due to stricter checking in AP_Param
  • Loading branch information
tridge authored and rmackay9 committed Aug 14, 2017
1 parent 59a1f26 commit 1a25087
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions libraries/AC_AttitudeControl/AC_AttitudeControl_Heli.cpp
Expand Up @@ -6,13 +6,6 @@ const AP_Param::GroupInfo AC_AttitudeControl_Heli::var_info[] = {
// parameters from parent vehicle
AP_NESTEDGROUPINFO(AC_AttitudeControl, 0),

// @Param: PIRO_COMP
// @DisplayName: Piro Comp Enable
// @Description: Pirouette compensation enabled
// @Values: 0:Disabled,1:Enabled
// @User: Advanced
AP_GROUPINFO("PIRO_COMP", 0, AC_AttitudeControl_Heli, _piro_comp_enabled, 0),

// @Param: HOVR_ROL_TRM
// @DisplayName: Hover Roll Trim
// @Description: Trim the hover roll angle to counter tail rotor thrust in a hover
Expand Down Expand Up @@ -150,6 +143,13 @@ const AP_Param::GroupInfo AC_AttitudeControl_Heli::var_info[] = {
// @Increment: 1
AP_SUBGROUPINFO(_pid_rate_yaw, "RAT_YAW_", 4, AC_AttitudeControl_Heli, AC_HELI_PID),

// @Param: PIRO_COMP
// @DisplayName: Piro Comp Enable
// @Description: Pirouette compensation enabled
// @Values: 0:Disabled,1:Enabled
// @User: Advanced
AP_GROUPINFO("PIRO_COMP", 5, AC_AttitudeControl_Heli, _piro_comp_enabled, 0),

AP_GROUPEND
};

Expand Down

0 comments on commit 1a25087

Please sign in to comment.