Skip to content

Commit 312bf8d

Browse files
committed
AC_AttitudeControl: Add const where possible
1 parent 099de6c commit 312bf8d

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

libraries/AC_AttitudeControl/AC_AttitudeControl.cpp

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ void AC_AttitudeControl::input_quaternion(Quaternion& attitude_desired_quat, Vec
345345
void AC_AttitudeControl::input_euler_angle_roll_pitch_euler_rate_yaw_cd(float euler_roll_angle_cd, float euler_pitch_angle_cd, float euler_yaw_rate_cds)
346346
{
347347
// Convert from centidegrees on public interface to radians
348-
float euler_roll_angle_rad = euler_roll_angle_cd * radians(0.01f);
349-
float euler_pitch_angle_rad = euler_pitch_angle_cd * radians(0.01f);
350-
float euler_yaw_rate_rads = euler_yaw_rate_cds * radians(0.01f);
348+
const float euler_roll_angle_rad = euler_roll_angle_cd * radians(0.01f);
349+
const float euler_pitch_angle_rad = euler_pitch_angle_cd * radians(0.01f);
350+
const float euler_yaw_rate_rads = euler_yaw_rate_cds * radians(0.01f);
351351
input_euler_angle_roll_pitch_euler_rate_yaw_rad(euler_roll_angle_rad, euler_pitch_angle_rad, euler_yaw_rate_rads);
352352
}
353353

@@ -403,9 +403,9 @@ void AC_AttitudeControl::input_euler_angle_roll_pitch_euler_rate_yaw_rad(float e
403403
void AC_AttitudeControl::input_euler_angle_roll_pitch_yaw_cd(float euler_roll_angle_cd, float euler_pitch_angle_cd, float euler_yaw_angle_cd, bool slew_yaw)
404404
{
405405
// Convert from centidegrees on public interface to radians
406-
float euler_roll_angle_rad = euler_roll_angle_cd * radians(0.01f);
407-
float euler_pitch_angle_rad = euler_pitch_angle_cd * radians(0.01f);
408-
float euler_yaw_angle_rad = euler_yaw_angle_cd * radians(0.01f);
406+
const float euler_roll_angle_rad = euler_roll_angle_cd * radians(0.01f);
407+
const float euler_pitch_angle_rad = euler_pitch_angle_cd * radians(0.01f);
408+
const float euler_yaw_angle_rad = euler_yaw_angle_cd * radians(0.01f);
409409

410410
input_euler_angle_roll_pitch_yaw_rad(euler_roll_angle_rad, euler_pitch_angle_rad, euler_yaw_angle_rad, slew_yaw);
411411
}
@@ -470,9 +470,9 @@ void AC_AttitudeControl::input_euler_angle_roll_pitch_yaw_rad(float euler_roll_a
470470
void AC_AttitudeControl::input_euler_rate_roll_pitch_yaw_cds(float euler_roll_rate_cds, float euler_pitch_rate_cds, float euler_yaw_rate_cds)
471471
{
472472
// Convert from centidegrees on public interface to radians
473-
float euler_roll_rate_rads = euler_roll_rate_cds * radians(0.01f);
474-
float euler_pitch_rate_rads = euler_pitch_rate_cds * radians(0.01f);
475-
float euler_yaw_rate_rads = euler_yaw_rate_cds * radians(0.01f);
473+
const float euler_roll_rate_rads = euler_roll_rate_cds * radians(0.01f);
474+
const float euler_pitch_rate_rads = euler_pitch_rate_cds * radians(0.01f);
475+
const float euler_yaw_rate_rads = euler_yaw_rate_cds * radians(0.01f);
476476

477477
input_euler_rate_roll_pitch_yaw_rads(euler_roll_rate_rads, euler_pitch_rate_rads, euler_yaw_rate_rads);
478478
}
@@ -521,9 +521,9 @@ void AC_AttitudeControl::input_euler_rate_roll_pitch_yaw_rads(float euler_roll_r
521521
void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_cds(float roll_rate_bf_cds, float pitch_rate_bf_cds, float yaw_rate_bf_cds)
522522
{
523523
// Convert from centidegrees on public interface to radians
524-
float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
525-
float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
526-
float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
524+
const float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
525+
const float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
526+
const float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
527527

528528
input_rate_bf_roll_pitch_yaw_rads(roll_rate_bf_rads, pitch_rate_bf_rads, yaw_rate_bf_rads);
529529
}
@@ -567,9 +567,9 @@ void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_rads(float roll_rate_bf_ra
567567
void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_2_cds(float roll_rate_bf_cds, float pitch_rate_bf_cds, float yaw_rate_bf_cds)
568568
{
569569
// Convert from centidegrees on public interface to radians
570-
float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
571-
float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
572-
float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
570+
const float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
571+
const float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
572+
const float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
573573

574574
input_rate_bf_roll_pitch_yaw_2_rads(roll_rate_bf_rads, pitch_rate_bf_rads, yaw_rate_bf_rads);
575575
}
@@ -598,9 +598,9 @@ void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_2_rads(float roll_rate_bf_
598598
void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_3_cds(float roll_rate_bf_cds, float pitch_rate_bf_cds, float yaw_rate_bf_cds)
599599
{
600600
// Convert from centidegrees on public interface to radians
601-
float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
602-
float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
603-
float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
601+
const float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
602+
const float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
603+
const float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
604604

605605
input_rate_bf_roll_pitch_yaw_3_rads(roll_rate_bf_rads, pitch_rate_bf_rads, yaw_rate_bf_rads);
606606
}
@@ -692,9 +692,9 @@ void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_no_shaping_rads(float roll
692692
void AC_AttitudeControl::input_angle_step_bf_roll_pitch_yaw_cd(float roll_angle_step_bf_cd, float pitch_angle_step_bf_cd, float yaw_angle_step_bf_cd)
693693
{
694694
// Convert from centidegrees on public interface to radians
695-
float roll_angle_step_bf_rad = roll_angle_step_bf_cd * radians(0.01f);
696-
float pitch_angle_step_bf_rad = pitch_angle_step_bf_cd * radians(0.01f);
697-
float yaw_angle_step_bf_rad = yaw_angle_step_bf_cd * radians(0.01f);
695+
const float roll_angle_step_bf_rad = roll_angle_step_bf_cd * radians(0.01f);
696+
const float pitch_angle_step_bf_rad = pitch_angle_step_bf_cd * radians(0.01f);
697+
const float yaw_angle_step_bf_rad = yaw_angle_step_bf_cd * radians(0.01f);
698698

699699
input_angle_step_bf_roll_pitch_yaw_rad(roll_angle_step_bf_rad, pitch_angle_step_bf_rad, yaw_angle_step_bf_rad);
700700
}
@@ -724,9 +724,9 @@ void AC_AttitudeControl::input_angle_step_bf_roll_pitch_yaw_rad(float roll_angle
724724
void AC_AttitudeControl::input_rate_step_bf_roll_pitch_yaw_cds(float roll_rate_step_bf_cds, float pitch_rate_step_bf_cds, float yaw_rate_step_bf_cds)
725725
{
726726
// Convert from centidegrees on public interface to radians
727-
float roll_rate_step_bf_rads = roll_rate_step_bf_cds * radians(0.01f);
728-
float pitch_rate_step_bf_rads = pitch_rate_step_bf_cds * radians(0.01f);
729-
float yaw_rate_step_bf_rads = yaw_rate_step_bf_cds * radians(0.01f);
727+
const float roll_rate_step_bf_rads = roll_rate_step_bf_cds * radians(0.01f);
728+
const float pitch_rate_step_bf_rads = pitch_rate_step_bf_cds * radians(0.01f);
729+
const float yaw_rate_step_bf_rads = yaw_rate_step_bf_cds * radians(0.01f);
730730

731731
input_rate_step_bf_roll_pitch_yaw_rads(roll_rate_step_bf_rads, pitch_rate_step_bf_rads, yaw_rate_step_bf_rads);
732732
}
@@ -750,7 +750,7 @@ void AC_AttitudeControl::input_rate_step_bf_roll_pitch_yaw_rads(float roll_rate_
750750
void AC_AttitudeControl::input_thrust_vector_rate_heading_cds(const Vector3f& thrust_vector, float heading_rate_cds, bool slew_yaw)
751751
{
752752
// Convert from centidegrees on public interface to radians
753-
float heading_rate_rads = heading_rate_cds * radians(0.01f);
753+
const float heading_rate_rads = heading_rate_cds * radians(0.01f);
754754

755755
input_thrust_vector_rate_heading_rads(thrust_vector, heading_rate_rads, slew_yaw);
756756
}
@@ -812,8 +812,8 @@ void AC_AttitudeControl::input_thrust_vector_rate_heading_rads(const Vector3f& t
812812
void AC_AttitudeControl::input_thrust_vector_heading_cd(const Vector3f& thrust_vector, float heading_angle_cd, float heading_rate_cds)
813813
{
814814
// Convert from centidegrees on public interface to radians
815-
float heading_rate_rads = heading_rate_cds * radians(0.01f);
816-
float heading_angle_rad = heading_angle_cd * radians(0.01f);
815+
const float heading_rate_rads = heading_rate_cds * radians(0.01f);
816+
const float heading_angle_rad = heading_angle_cd * radians(0.01f);
817817

818818
input_thrust_vector_heading_rad(thrust_vector, heading_angle_rad, heading_rate_rads);
819819
}
@@ -1000,10 +1000,10 @@ void AC_AttitudeControl::thrust_vector_rotation_angles(const Quaternion& attitud
10001000
// attitude_target and attitude_body are passive rotations from target / body frames to the NED frame
10011001

10021002
// Rotating [0,0,-1] by attitude_target expresses (gets a view of) the target thrust vector in the inertial frame
1003-
Vector3f att_target_thrust_vec = attitude_target * thrust_vector_up; // target thrust vector
1003+
const Vector3f att_target_thrust_vec = attitude_target * thrust_vector_up; // target thrust vector
10041004

10051005
// Rotating [0,0,-1] by attitude_target expresses (gets a view of) the current thrust vector in the inertial frame
1006-
Vector3f att_body_thrust_vec = attitude_body * thrust_vector_up; // current thrust vector
1006+
const Vector3f att_body_thrust_vec = attitude_body * thrust_vector_up; // current thrust vector
10071007

10081008
// the dot product is used to calculate the current lean angle for use of external functions
10091009
thrust_angle_rad = acosf(constrain_float(thrust_vector_up * att_body_thrust_vec,-1.0f,1.0f));
@@ -1107,7 +1107,7 @@ void AC_AttitudeControl::ang_vel_limit(Vector3f& euler_rad, float ang_vel_roll_m
11071107
euler_rad.y = constrain_float(euler_rad.y, -ang_vel_pitch_max_rads, ang_vel_pitch_max_rads);
11081108
}
11091109
} else {
1110-
Vector2f thrust_vector_ang_vel(euler_rad.x / ang_vel_roll_max_rads, euler_rad.y / ang_vel_pitch_max_rads);
1110+
const Vector2f thrust_vector_ang_vel(euler_rad.x / ang_vel_roll_max_rads, euler_rad.y / ang_vel_pitch_max_rads);
11111111
float thrust_vector_length = thrust_vector_ang_vel.length();
11121112
if (thrust_vector_length > 1.0f) {
11131113
euler_rad.x = thrust_vector_ang_vel.x * ang_vel_roll_max_rads / thrust_vector_length;
@@ -1309,11 +1309,11 @@ float AC_AttitudeControl::max_rate_step_bf_roll()
13091309
// Return pitch rate step size in centidegrees/s that results in maximum output after 4 time steps
13101310
float AC_AttitudeControl::max_rate_step_bf_pitch()
13111311
{
1312-
float dt_average = AP::scheduler().get_filtered_loop_time();
1313-
float alpha = MIN(get_rate_pitch_pid().get_filt_E_alpha(dt_average), get_rate_pitch_pid().get_filt_D_alpha(dt_average));
1314-
float alpha_remaining = 1 - alpha;
1312+
const float dt_average = AP::scheduler().get_filtered_loop_time();
1313+
const float alpha = MIN(get_rate_pitch_pid().get_filt_E_alpha(dt_average), get_rate_pitch_pid().get_filt_D_alpha(dt_average));
1314+
const float alpha_remaining = 1 - alpha;
13151315
// todo: When a thrust_max is available we should replace 0.5f with 0.5f * _motors.thrust_max
1316-
float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
1316+
const float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
13171317
float rate_max = 2.0f * throttle_hover * AC_ATTITUDE_RATE_RP_CONTROLLER_OUT_MAX / ((alpha_remaining * alpha_remaining * alpha_remaining * alpha * get_rate_pitch_pid().kD()) / _dt + get_rate_pitch_pid().kP());
13181318
if (is_positive(_ang_vel_pitch_max_degs)) {
13191319
rate_max = MIN(rate_max, get_ang_vel_pitch_max_rads());
@@ -1324,11 +1324,11 @@ float AC_AttitudeControl::max_rate_step_bf_pitch()
13241324
// Return yaw rate step size in centidegrees/s that results in maximum output after 4 time steps
13251325
float AC_AttitudeControl::max_rate_step_bf_yaw()
13261326
{
1327-
float dt_average = AP::scheduler().get_filtered_loop_time();
1328-
float alpha = MIN(get_rate_yaw_pid().get_filt_E_alpha(dt_average), get_rate_yaw_pid().get_filt_D_alpha(dt_average));
1329-
float alpha_remaining = 1 - alpha;
1327+
const float dt_average = AP::scheduler().get_filtered_loop_time();
1328+
const float alpha = MIN(get_rate_yaw_pid().get_filt_E_alpha(dt_average), get_rate_yaw_pid().get_filt_D_alpha(dt_average));
1329+
const float alpha_remaining = 1 - alpha;
13301330
// todo: When a thrust_max is available we should replace 0.5f with 0.5f * _motors.thrust_max
1331-
float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
1331+
const float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
13321332
float rate_max = 2.0f * throttle_hover * AC_ATTITUDE_RATE_YAW_CONTROLLER_OUT_MAX / ((alpha_remaining * alpha_remaining * alpha_remaining * alpha * get_rate_yaw_pid().kD()) / _dt + get_rate_yaw_pid().kP());
13331333
if (is_positive(_ang_vel_yaw_max_degs)) {
13341334
rate_max = MIN(rate_max, get_ang_vel_yaw_max_rads());

0 commit comments

Comments
 (0)