Skip to content

Commit 4e9b2da

Browse files
committed
AC_AttitudeControl: Add const where possible
1 parent 9e6a2f8 commit 4e9b2da

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

libraries/AC_AttitudeControl/AC_AttitudeControl.cpp

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ void AC_AttitudeControl::input_euler_angle_roll_pitch_euler_rate_yaw_cd(float eu
346346
{
347347
// Convert from centidegrees on public interface to radians
348348
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);
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

352352
// update attitude target
353353
update_attitude_target();
@@ -400,8 +400,8 @@ void AC_AttitudeControl::input_euler_angle_roll_pitch_yaw_cd(float euler_roll_an
400400
{
401401
// Convert from centidegrees on public interface to radians
402402
float euler_roll_angle_rad = euler_roll_angle_cd * radians(0.01f);
403-
float euler_pitch_angle_rad = euler_pitch_angle_cd * radians(0.01f);
404-
float euler_yaw_angle_rad = euler_yaw_angle_cd * radians(0.01f);
403+
const float euler_pitch_angle_rad = euler_pitch_angle_cd * radians(0.01f);
404+
const float euler_yaw_angle_rad = euler_yaw_angle_cd * radians(0.01f);
405405

406406
// update attitude target
407407
update_attitude_target();
@@ -461,9 +461,9 @@ void AC_AttitudeControl::input_euler_angle_roll_pitch_yaw_cd(float euler_roll_an
461461
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)
462462
{
463463
// Convert from centidegrees on public interface to radians
464-
float euler_roll_rate_rads = euler_roll_rate_cds * radians(0.01f);
465-
float euler_pitch_rate_rads = euler_pitch_rate_cds * radians(0.01f);
466-
float euler_yaw_rate_rads = euler_yaw_rate_cds * radians(0.01f);
464+
const float euler_roll_rate_rads = euler_roll_rate_cds * radians(0.01f);
465+
const float euler_pitch_rate_rads = euler_pitch_rate_cds * radians(0.01f);
466+
const float euler_yaw_rate_rads = euler_yaw_rate_cds * radians(0.01f);
467467

468468
// update attitude target
469469
update_attitude_target();
@@ -507,9 +507,9 @@ void AC_AttitudeControl::input_euler_rate_roll_pitch_yaw_cds(float euler_roll_ra
507507
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)
508508
{
509509
// Convert from centidegrees on public interface to radians
510-
float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
511-
float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
512-
float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
510+
const float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
511+
const float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
512+
const float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
513513

514514
// update attitude target
515515
update_attitude_target();
@@ -548,9 +548,9 @@ void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_cds(float roll_rate_bf_cds
548548
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)
549549
{
550550
// Convert from centidegrees on public interface to radians
551-
float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
552-
float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
553-
float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
551+
const float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
552+
const float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
553+
const float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
554554

555555
// Compute acceleration-limited body frame rates
556556
// When acceleration limiting is enabled, the input shaper constrains angular acceleration about the axis, slewing
@@ -574,9 +574,9 @@ void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_2_cds(float roll_rate_bf_c
574574
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)
575575
{
576576
// Convert from centidegrees on public interface to radians
577-
float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
578-
float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
579-
float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
577+
const float roll_rate_bf_rads = roll_rate_bf_cds * radians(0.01f);
578+
const float pitch_rate_bf_rads = pitch_rate_bf_cds * radians(0.01f);
579+
const float yaw_rate_bf_rads = yaw_rate_bf_cds * radians(0.01f);
580580

581581
// Update attitude error
582582
Vector3f attitude_error;
@@ -657,9 +657,9 @@ void AC_AttitudeControl::input_rate_bf_roll_pitch_yaw_no_shaping_cds(float roll_
657657
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)
658658
{
659659
// Convert from centidegrees on public interface to radians
660-
float roll_angle_step_bf_rad = roll_angle_step_bf_cd * radians(0.01f);
661-
float pitch_angle_step_bf_rad = pitch_angle_step_bf_cd * radians(0.01f);
662-
float yaw_angle_step_bf_rad = yaw_angle_step_bf_cd * radians(0.01f);
660+
const float roll_angle_step_bf_rad = roll_angle_step_bf_cd * radians(0.01f);
661+
const float pitch_angle_step_bf_rad = pitch_angle_step_bf_cd * radians(0.01f);
662+
const float yaw_angle_step_bf_rad = yaw_angle_step_bf_cd * radians(0.01f);
663663

664664
// rotate attitude target by desired step
665665
Quaternion attitude_target_update;
@@ -937,10 +937,10 @@ void AC_AttitudeControl::thrust_vector_rotation_angles(const Quaternion& attitud
937937
// attitude_target and attitude_body are passive rotations from target / body frames to the NED frame
938938

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

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

945945
// the dot product is used to calculate the current lean angle for use of external functions
946946
thrust_angle_rad = acosf(constrain_float(thrust_vector_up * att_body_thrust_vec,-1.0f,1.0f));
@@ -1044,7 +1044,7 @@ void AC_AttitudeControl::ang_vel_limit(Vector3f& euler_rad, float ang_vel_roll_m
10441044
euler_rad.y = constrain_float(euler_rad.y, -ang_vel_pitch_max_rads, ang_vel_pitch_max_rads);
10451045
}
10461046
} else {
1047-
Vector2f thrust_vector_ang_vel(euler_rad.x / ang_vel_roll_max_rads, euler_rad.y / ang_vel_pitch_max_rads);
1047+
const Vector2f thrust_vector_ang_vel(euler_rad.x / ang_vel_roll_max_rads, euler_rad.y / ang_vel_pitch_max_rads);
10481048
float thrust_vector_length = thrust_vector_ang_vel.length();
10491049
if (thrust_vector_length > 1.0f) {
10501050
euler_rad.x = thrust_vector_ang_vel.x * ang_vel_roll_max_rads / thrust_vector_length;
@@ -1246,11 +1246,11 @@ float AC_AttitudeControl::max_rate_step_bf_roll()
12461246
// Return pitch rate step size in centidegrees/s that results in maximum output after 4 time steps
12471247
float AC_AttitudeControl::max_rate_step_bf_pitch()
12481248
{
1249-
float dt_average = AP::scheduler().get_filtered_loop_time();
1250-
float alpha = MIN(get_rate_pitch_pid().get_filt_E_alpha(dt_average), get_rate_pitch_pid().get_filt_D_alpha(dt_average));
1251-
float alpha_remaining = 1 - alpha;
1249+
const float dt_average = AP::scheduler().get_filtered_loop_time();
1250+
const float alpha = MIN(get_rate_pitch_pid().get_filt_E_alpha(dt_average), get_rate_pitch_pid().get_filt_D_alpha(dt_average));
1251+
const float alpha_remaining = 1 - alpha;
12521252
// todo: When a thrust_max is available we should replace 0.5f with 0.5f * _motors.thrust_max
1253-
float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
1253+
const float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
12541254
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());
12551255
if (is_positive(_ang_vel_pitch_max_degs)) {
12561256
rate_max = MIN(rate_max, get_ang_vel_pitch_max_rads());
@@ -1261,11 +1261,11 @@ float AC_AttitudeControl::max_rate_step_bf_pitch()
12611261
// Return yaw rate step size in centidegrees/s that results in maximum output after 4 time steps
12621262
float AC_AttitudeControl::max_rate_step_bf_yaw()
12631263
{
1264-
float dt_average = AP::scheduler().get_filtered_loop_time();
1265-
float alpha = MIN(get_rate_yaw_pid().get_filt_E_alpha(dt_average), get_rate_yaw_pid().get_filt_D_alpha(dt_average));
1266-
float alpha_remaining = 1 - alpha;
1264+
const float dt_average = AP::scheduler().get_filtered_loop_time();
1265+
const float alpha = MIN(get_rate_yaw_pid().get_filt_E_alpha(dt_average), get_rate_yaw_pid().get_filt_D_alpha(dt_average));
1266+
const float alpha_remaining = 1 - alpha;
12671267
// todo: When a thrust_max is available we should replace 0.5f with 0.5f * _motors.thrust_max
1268-
float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
1268+
const float throttle_hover = constrain_float(_motors.get_throttle_hover(), 0.1f, 0.5f);
12691269
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());
12701270
if (is_positive(_ang_vel_yaw_max_degs)) {
12711271
rate_max = MIN(rate_max, get_ang_vel_yaw_max_rads());

0 commit comments

Comments
 (0)