Skip to content

Commit

Permalink
AC_AttitudeControl: Squash
Browse files Browse the repository at this point in the history
  • Loading branch information
lthall committed Sep 19, 2023
1 parent 517fb59 commit 756edc9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions libraries/AC_AttitudeControl/AC_AttitudeControl_Multi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ const AP_Param::GroupInfo AC_AttitudeControl_Multi::var_info[] = {
// @User: Advanced

// @Param: RAT_RLL_PDMX
// @DisplayName: PD Sum Maximum
// @Description: The maximum/minimum value that the sum of the P and D term can output
// @DisplayName: Roll axis rate controller PD sum maximum
// @Description: Roll axis rate controller PD sum maximum. The maximum/minimum value that the sum of the P and D term can output
// @Range: 0 1
// @Increment: 0.01
// @User: Standard
// @User: Advanced

AP_SUBGROUPINFO(_pid_rate_roll, "RAT_RLL_", 1, AC_AttitudeControl_Multi, AC_PID),

Expand Down Expand Up @@ -150,11 +150,11 @@ const AP_Param::GroupInfo AC_AttitudeControl_Multi::var_info[] = {
// @User: Advanced

// @Param: RAT_PIT_PDMX
// @DisplayName: PD Sum Maximum
// @Description: The maximum/minimum value that the sum of the P and D term can output
// @DisplayName: Pitch axis rate controller PD sum maximum
// @Description: Pitch axis rate controller PD sum maximum. The maximum/minimum value that the sum of the P and D term can output
// @Range: 0 1
// @Increment: 0.01
// @User: Standard
// @User: Advanced

AP_SUBGROUPINFO(_pid_rate_pitch, "RAT_PIT_", 2, AC_AttitudeControl_Multi, AC_PID),

Expand Down Expand Up @@ -225,11 +225,11 @@ const AP_Param::GroupInfo AC_AttitudeControl_Multi::var_info[] = {
// @User: Advanced

// @Param: RAT_YAW_PDMX
// @DisplayName: PD Sum Maximum
// @Description: The maximum/minimum value that the sum of the P and D term can output
// @DisplayName: Yaw axis rate controller PD sum maximum
// @Description: Yaw axis rate controller PD sum maximum. The maximum/minimum value that the sum of the P and D term can output
// @Range: 0 1
// @Increment: 0.01
// @User: Standard
// @User: Advanced

AP_SUBGROUPINFO(_pid_rate_yaw, "RAT_YAW_", 3, AC_AttitudeControl_Multi, AC_PID),

Expand Down
18 changes: 9 additions & 9 deletions libraries/AC_AttitudeControl/AC_AttitudeControl_Sub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ const AP_Param::GroupInfo AC_AttitudeControl_Sub::var_info[] = {
// @User: Advanced

// @Param: RAT_RLL_PDMX
// @DisplayName: PD Sum Maximum
// @Description: The maximum/minimum value that the sum of the P and D term can output
// @DisplayName: Roll axis rate controller PD sum maximum
// @Description: Roll axis rate controller PD sum maximum. The maximum/minimum value that the sum of the P and D term can output
// @Range: 0 1
// @Increment: 0.01
// @User: Standard
// @User: Advanced

AP_SUBGROUPINFO(_pid_rate_roll, "RAT_RLL_", 1, AC_AttitudeControl_Sub, AC_PID),

Expand Down Expand Up @@ -149,11 +149,11 @@ const AP_Param::GroupInfo AC_AttitudeControl_Sub::var_info[] = {
// @User: Advanced

// @Param: RAT_PIT_PDMX
// @DisplayName: PD Sum Maximum
// @Description: The maximum/minimum value that the sum of the P and D term can output
// @DisplayName: Pitch axis rate controller PD sum maximum
// @Description: Pitch axis rate controller PD sum maximum. The maximum/minimum value that the sum of the P and D term can output
// @Range: 0 1
// @Increment: 0.01
// @User: Standard
// @User: Advanced

AP_SUBGROUPINFO(_pid_rate_pitch, "RAT_PIT_", 2, AC_AttitudeControl_Sub, AC_PID),

Expand Down Expand Up @@ -224,11 +224,11 @@ const AP_Param::GroupInfo AC_AttitudeControl_Sub::var_info[] = {
// @User: Advanced

// @Param: RAT_YAW_PDMX
// @DisplayName: PD Sum Maximum
// @Description: The maximum/minimum value that the sum of the P and D term can output
// @DisplayName: Yaw axis rate controller PD sum maximum
// @Description: Yaw axis rate controller PD sum maximum. The maximum/minimum value that the sum of the P and D term can output
// @Range: 0 1
// @Increment: 0.01
// @User: Standard
// @User: Advanced

AP_SUBGROUPINFO(_pid_rate_yaw, "RAT_YAW_", 3, AC_AttitudeControl_Sub, AC_PID),

Expand Down
6 changes: 3 additions & 3 deletions libraries/AC_AttitudeControl/AC_PosControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,11 @@ const AP_Param::GroupInfo AC_PosControl::var_info[] = {
// @User: Advanced

// @Param: _ACCZ_PDMX
// @DisplayName: PD Sum Maximum
// @Description: The maximum/minimum value that the sum of the P and D term can output
// @DisplayName: Acceleration (vertical) controller PD sum maximum
// @Description: Acceleration (vertical) controller PD sum maximum. The maximum/minimum value that the sum of the P and D term can output
// @Range: 0 1000
// @Units: d%
// @User: Standard
// @User: Advanced

AP_SUBGROUPINFO(_pid_accel_z, "_ACCZ_", 4, AC_PosControl, AC_PID),

Expand Down

0 comments on commit 756edc9

Please sign in to comment.