Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AC_AttitudeControl: cleanup position control APIs 

use Vector2 for xy, float for z
This commit is contained in:
Andrew Tridgell 2021-06-21 17:26:39 +10:00
parent 6e99028d69
commit a4220b1584
4 changed files with 62 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
libraries/AC_AttitudeControl/AC_PosControl.cpp
View File

@ -350,10 +350,10 @@ void AC_PosControl::input_pos_vel_accel_xyz(const Vector3f& pos)
accel_z_cmss *= POSCONTROL_OVERSPEED_GAIN_Z * _vel_desired.z / _vel_max_up_cms; accel_z_cmss *= POSCONTROL_OVERSPEED_GAIN_Z * _vel_desired.z / _vel_max_up_cms;
} }
update_pos_vel_accel_xy(_pos_target, _vel_desired, _accel_desired, _dt, _limit_vector); update_pos_vel_accel_xy(_pos_target.xy(), _vel_desired.xy(), _accel_desired.xy(), _dt, _limit_vector.xy());
// adjust desired alt if motors have not hit their limits // adjust desired alt if motors have not hit their limits
update_pos_vel_accel_z(_pos_target, _vel_desired, _accel_desired, _dt, _limit_vector); update_pos_vel_accel(_pos_target.z, _vel_desired.z, _accel_desired.z, _dt, _limit_vector.z);
float vel_max_xy_cms = _vel_max_xy_cms; float vel_max_xy_cms = _vel_max_xy_cms;
float vel_max_z_cms = 0.0f; float vel_max_z_cms = 0.0f;
@ -369,10 +369,11 @@ void AC_PosControl::input_pos_vel_accel_xyz(const Vector3f& pos)
Vector3f vel; Vector3f vel;
Vector3f accel; Vector3f accel;
shape_pos_vel_accel_xy(pos, vel, accel, _pos_target, _vel_desired, _accel_desired, shape_pos_vel_accel_xy(pos.xy(), vel.xy(), accel.xy(), _pos_target.xy(), _vel_desired.xy(), _accel_desired.xy(),
vel_max_xy_cms, _vel_max_xy_cms, _accel_max_xy_cmss, _tc_xy_s, _dt); vel_max_xy_cms, _vel_max_xy_cms, _accel_max_xy_cmss, _tc_xy_s, _dt);
shape_pos_vel_accel_z(pos, vel, accel, float posz = pos.z;
_pos_target, _vel_desired, _accel_desired, shape_pos_vel_accel(posz, vel.z, accel.z,
_pos_target.z, _vel_desired.z, _accel_desired.z,
vel_max_z_cms, _vel_max_down_cms, _vel_max_up_cms, vel_max_z_cms, _vel_max_down_cms, _vel_max_up_cms,
-constrain_float(accel_z_cmss, 0.0f, 750.0f), accel_z_cmss, -constrain_float(accel_z_cmss, 0.0f, 750.0f), accel_z_cmss,
_tc_z_s, _dt); _tc_z_s, _dt);
@ -424,13 +425,9 @@ void AC_PosControl::init_xy_controller_stopping_point()
{ {
init_xy(); init_xy();
// set desired velocity to zero before calculating the stopping point _vel_desired.xy().zero();
_vel_desired.x = 0.0f; get_stopping_point_xy_cm(_pos_target.xy());
_vel_desired.y = 0.0f; _accel_desired.xy().zero();
get_stopping_point_xy_cm(_pos_target);
_accel_desired.x = 0.0f;
_accel_desired.y = 0.0f;
_pid_vel_xy.set_integrator(_accel_target); _pid_vel_xy.set_integrator(_accel_target);
} }
@ -494,17 +491,17 @@ void AC_PosControl::init_xy()
/// The kinematic path is constrained by the maximum acceleration and time constant set using the function set_max_speed_accel_xy and time constant. /// The kinematic path is constrained by the maximum acceleration and time constant set using the function set_max_speed_accel_xy and time constant.
/// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration. /// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration.
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
void AC_PosControl::input_vel_accel_xy(Vector3f& vel, const Vector3f& accel) void AC_PosControl::input_vel_accel_xy(Vector2f& vel, const Vector2f& accel)
{ {
// check for ekf xy position reset // check for ekf xy position reset
handle_ekf_xy_reset(); handle_ekf_xy_reset();
update_pos_vel_accel_xy(_pos_target, _vel_desired, _accel_desired, _dt, _limit_vector); update_pos_vel_accel_xy(_pos_target.xy(), _vel_desired.xy(), _accel_desired.xy(), _dt, _limit_vector.xy());
shape_vel_accel_xy(vel, accel, _vel_desired, _accel_desired, shape_vel_accel_xy(vel, accel, _vel_desired.xy(), _accel_desired.xy(),
_vel_max_xy_cms, _accel_max_xy_cmss, _tc_xy_s, _dt); _vel_max_xy_cms, _accel_max_xy_cmss, _tc_xy_s, _dt);
update_vel_accel_xy(vel, accel, _dt, Vector3f()); update_vel_accel_xy(vel, accel, _dt, Vector2f());
} }
/// input_pos_vel_accel_xy - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration. /// input_pos_vel_accel_xy - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration.
@ -513,17 +510,17 @@ void AC_PosControl::input_vel_accel_xy(Vector3f& vel, const Vector3f& accel)
/// The kinematic path is constrained by the maximum acceleration and time constant set using the function set_max_speed_accel_xy and time constant. /// The kinematic path is constrained by the maximum acceleration and time constant set using the function set_max_speed_accel_xy and time constant.
/// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration. /// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration.
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
void AC_PosControl::input_pos_vel_accel_xy(Vector3f& pos, Vector3f& vel, const Vector3f& accel) void AC_PosControl::input_pos_vel_accel_xy(Vector2f& pos, Vector2f& vel, const Vector2f& accel)
{ {
// check for ekf xy position reset // check for ekf xy position reset
handle_ekf_xy_reset(); handle_ekf_xy_reset();
update_pos_vel_accel_xy(_pos_target, _vel_desired, _accel_desired, _dt, _limit_vector); update_pos_vel_accel_xy(_pos_target.xy(), _vel_desired.xy(), _accel_desired.xy(), _dt, _limit_vector.xy());
shape_pos_vel_accel_xy(pos, vel, accel, _pos_target, _vel_desired, _accel_desired, shape_pos_vel_accel_xy(pos, vel, accel, _pos_target.xy(), _vel_desired.xy(), _accel_desired.xy(),
_vel_max_xy_cms, _vel_max_xy_cms, _accel_max_xy_cmss, _tc_xy_s, _dt); _vel_max_xy_cms, _vel_max_xy_cms, _accel_max_xy_cmss, _tc_xy_s, _dt);
update_pos_vel_accel_xy(pos, vel, accel, _dt, Vector3f()); update_pos_vel_accel_xy(pos, vel, accel, _dt, Vector2f());
} }
/// stop_pos_xy_stabilisation - sets the target to the current position to remove any position corrections from the system /// stop_pos_xy_stabilisation - sets the target to the current position to remove any position corrections from the system
@ -702,7 +699,7 @@ void AC_PosControl::init_z_controller_stopping_point()
// Initialise the position controller to the current throttle, position, velocity and acceleration. // Initialise the position controller to the current throttle, position, velocity and acceleration.
init_z_controller(); init_z_controller();
get_stopping_point_z_cm(_pos_target); get_stopping_point_z_cm(_pos_target.z);
_vel_target.z = 0.0f; _vel_target.z = 0.0f;
// Set accel PID I term based on the current throttle // Set accel PID I term based on the current throttle
@ -757,7 +754,7 @@ void AC_PosControl::init_z()
/// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration. /// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration.
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
/// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing. /// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing.
void AC_PosControl::input_vel_accel_z(Vector3f& vel, const Vector3f& accel, bool ignore_descent_limit) void AC_PosControl::input_vel_accel_z(float &vel, const float accel, bool ignore_descent_limit)
{ {
// check for ekf z position reset // check for ekf z position reset
handle_ekf_z_reset(); handle_ekf_z_reset();
@ -777,15 +774,15 @@ void AC_PosControl::input_vel_accel_z(Vector3f& vel, const Vector3f& accel, bool
} }
// adjust desired alt if motors have not hit their limits // adjust desired alt if motors have not hit their limits
update_pos_vel_accel_z(_pos_target, _vel_desired, _accel_desired, _dt, _limit_vector); update_pos_vel_accel(_pos_target.z, _vel_desired.z, _accel_desired.z, _dt, _limit_vector.z);
shape_vel_accel_z(vel, accel, shape_vel_accel(vel, accel,
_vel_desired, _accel_desired, _vel_desired.z, _accel_desired.z,
_vel_max_down_cms, _vel_max_up_cms, _vel_max_down_cms, _vel_max_up_cms,
-constrain_float(accel_z_cmss, 0.0f, 750.0f), accel_z_cmss, -constrain_float(accel_z_cmss, 0.0f, 750.0f), accel_z_cmss,
_tc_z_s, _dt); _tc_z_s, _dt);
update_vel_accel_z(vel, accel, _dt, Vector3f()); update_vel_accel(vel, accel, _dt, 0);
} }
/// set_pos_target_z_from_climb_rate_cm - adjusts target up or down using a commanded climb rate in cm/s /// set_pos_target_z_from_climb_rate_cm - adjusts target up or down using a commanded climb rate in cm/s
@ -793,8 +790,8 @@ void AC_PosControl::input_vel_accel_z(Vector3f& vel, const Vector3f& accel, bool
/// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing. /// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing.
void AC_PosControl::set_pos_target_z_from_climb_rate_cm(const float vel, bool ignore_descent_limit) void AC_PosControl::set_pos_target_z_from_climb_rate_cm(const float vel, bool ignore_descent_limit)
{ {
Vector3f vel_3f = Vector3f{0.0f, 0.0f, vel}; float vel2 = vel;
input_vel_accel_z(vel_3f, Vector3f{0.0f, 0.0f, 0.0f}, ignore_descent_limit); input_vel_accel_z(vel2, 0, ignore_descent_limit);
} }
/// input_pos_vel_accel_z - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration. /// input_pos_vel_accel_z - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration.
@ -803,7 +800,7 @@ void AC_PosControl::set_pos_target_z_from_climb_rate_cm(const float vel, bool ig
/// The kinematic path is constrained by the maximum acceleration and time constant set using the function set_max_speed_accel_z and time constant. /// The kinematic path is constrained by the maximum acceleration and time constant set using the function set_max_speed_accel_z and time constant.
/// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration. /// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration.
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
void AC_PosControl::input_pos_vel_accel_z(Vector3f& pos, Vector3f& vel, const Vector3f& accel) void AC_PosControl::input_pos_vel_accel_z(float &pos, float &vel, const float accel)
{ {
// check for ekf z position reset // check for ekf z position reset
handle_ekf_z_reset(); handle_ekf_z_reset();
@ -818,24 +815,24 @@ void AC_PosControl::input_pos_vel_accel_z(Vector3f& pos, Vector3f& vel, const Ve
} }
// adjust desired alt if motors have not hit their limits // adjust desired alt if motors have not hit their limits
update_pos_vel_accel_z(_pos_target, _vel_desired, _accel_desired, _dt, _limit_vector); update_pos_vel_accel(_pos_target.z, _vel_desired.z, _accel_desired.z, _dt, _limit_vector.z);
shape_pos_vel_accel_z(pos, vel, accel, shape_pos_vel_accel(pos, vel, accel,
_pos_target, _vel_desired, _accel_desired, _pos_target.z, _vel_desired.z, _accel_desired.z,
0.0f, _vel_max_down_cms, _vel_max_up_cms, 0.0f, _vel_max_down_cms, _vel_max_up_cms,
-constrain_float(accel_z_cmss, 0.0f, 750.0f), accel_z_cmss, -constrain_float(accel_z_cmss, 0.0f, 750.0f), accel_z_cmss,
_tc_z_s, _dt); _tc_z_s, _dt);
update_pos_vel_accel_z(pos, vel, accel, _dt, Vector3f()); update_pos_vel_accel(pos, vel, accel, _dt, 0);
} }
/// set_alt_target_with_slew - adjusts target up or down using a commanded altitude in cm /// set_alt_target_with_slew - adjusts target up or down using a commanded altitude in cm
/// using the default position control kinimatic path. /// using the default position control kinimatic path.
void AC_PosControl::set_alt_target_with_slew(const float& pos) void AC_PosControl::set_alt_target_with_slew(const float& pos)
{ {
Vector3f pos_3f = Vector3f{0.0f, 0.0f, pos}; float posf = pos;
Vector3f zero; float zero = 0;
input_pos_vel_accel_z(pos_3f, zero, zero); input_pos_vel_accel_z(posf, zero, 0);
} }
// is_active_z - returns true if the z position controller has been run in the previous 5 loop times // is_active_z - returns true if the z position controller has been run in the previous 5 loop times
@ -920,7 +917,7 @@ void AC_PosControl::update_z_controller()
/// ///
/// get_stopping_point_z_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration /// get_stopping_point_z_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration
void AC_PosControl::get_stopping_point_z_cm(Vector3f& stopping_point) const void AC_PosControl::get_stopping_point_z_cm(float &stopping_point) const
{ {
const float curr_pos_z = _inav.get_position().z; const float curr_pos_z = _inav.get_position().z;
float curr_vel_z = _inav.get_velocity().z; float curr_vel_z = _inav.get_velocity().z;
@ -932,11 +929,11 @@ void AC_PosControl::get_stopping_point_z_cm(Vector3f& stopping_point) const
// avoid divide by zero by using current position if kP is very low or acceleration is zero // avoid divide by zero by using current position if kP is very low or acceleration is zero
if (!is_positive(_p_pos_z.kP()) || !is_positive(_accel_max_z_cmss)) { if (!is_positive(_p_pos_z.kP()) || !is_positive(_accel_max_z_cmss)) {
stopping_point.z = curr_pos_z; stopping_point = curr_pos_z;
return; return;
} }
stopping_point.z = curr_pos_z + constrain_float(stopping_distance(curr_vel_z, _p_pos_z.kP(), _accel_max_z_cmss), - POSCONTROL_STOPPING_DIST_DOWN_MAX, POSCONTROL_STOPPING_DIST_UP_MAX); stopping_point = curr_pos_z + constrain_float(stopping_distance(curr_vel_z, _p_pos_z.kP(), _accel_max_z_cmss), - POSCONTROL_STOPPING_DIST_DOWN_MAX, POSCONTROL_STOPPING_DIST_UP_MAX);
} }
/// get_lean_angle_max_cd - returns the maximum lean angle the autopilot may request /// get_lean_angle_max_cd - returns the maximum lean angle the autopilot may request
@ -995,11 +992,10 @@ Vector3f AC_PosControl::get_thrust_vector() const
/// get_stopping_point_xy_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration /// get_stopping_point_xy_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration
/// function does not change the z axis /// function does not change the z axis
void AC_PosControl::get_stopping_point_xy_cm(Vector3f &stopping_point) const void AC_PosControl::get_stopping_point_xy_cm(Vector2f &stopping_point) const
{ {
const Vector3f curr_pos = _inav.get_position(); const Vector3f curr_pos = _inav.get_position();
stopping_point.x = curr_pos.x; stopping_point = curr_pos.xy();
stopping_point.y = curr_pos.y;
float kP = _p_pos_xy.kP(); float kP = _p_pos_xy.kP();
Vector3f curr_vel = _inav.get_velocity(); Vector3f curr_vel = _inav.get_velocity();

18
libraries/AC_AttitudeControl/AC_PosControl.h
View File

@ -95,7 +95,7 @@ public:
/// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration. /// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration.
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
/// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time. /// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time.
void input_vel_accel_xy(Vector3f& vel, const Vector3f& accel); void input_vel_accel_xy(Vector2f& vel, const Vector2f& accel);
/// input_pos_vel_accel_xy - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration. /// input_pos_vel_accel_xy - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration.
/// The function takes the current position, velocity, and acceleration and calculates the required jerk limited adjustment to the acceleration for the next time dt. /// The function takes the current position, velocity, and acceleration and calculates the required jerk limited adjustment to the acceleration for the next time dt.
@ -103,7 +103,7 @@ public:
/// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration. /// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration.
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
/// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time. /// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time.
void input_pos_vel_accel_xy(Vector3f& pos, Vector3f& vel, const Vector3f& accel); void input_pos_vel_accel_xy(Vector2f& pos, Vector2f& vel, const Vector2f& accel);
// is_active_xy - returns true if the xy position controller has been run in the previous 5 loop times // is_active_xy - returns true if the xy position controller has been run in the previous 5 loop times
bool is_active_xy() const; bool is_active_xy() const;
@ -168,12 +168,12 @@ public:
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
/// The function alters the input velocitiy to be the velocity that the system could reach zero acceleration in the minimum time. /// The function alters the input velocitiy to be the velocity that the system could reach zero acceleration in the minimum time.
/// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing. /// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing.
virtual void input_vel_accel_z(Vector3f& vel, const Vector3f& accel, bool force_descend); virtual void input_vel_accel_z(float &vel, const float accel, bool ignore_descent_limit);
/// set_pos_target_z_from_climb_rate_cm - adjusts target up or down using a climb rate in cm/s /// set_pos_target_z_from_climb_rate_cm - adjusts target up or down using a climb rate in cm/s
/// using the default position control kinimatic path. /// using the default position control kinimatic path.
/// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing. /// ignore_descent_limit turns off output saturation handling to aid in landing detection. ignore_descent_limit should be true unless landing.
void set_pos_target_z_from_climb_rate_cm(const float vel, bool force_descend); void set_pos_target_z_from_climb_rate_cm(const float vel, bool ignore_descent_limit);
/// input_pos_vel_accel_z - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration. /// input_pos_vel_accel_z - calculate a jerk limited path from the current position, velocity and acceleration to an input position velocity and acceleration.
/// The function takes the current position, velocity, and acceleration and calculates the required jerk limited adjustment to the acceleration for the next time dt. /// The function takes the current position, velocity, and acceleration and calculates the required jerk limited adjustment to the acceleration for the next time dt.
@ -181,7 +181,7 @@ public:
/// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration. /// The time constant defines the acceleration error decay in the kinematic path as the system approaches constant acceleration.
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
/// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time. /// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time.
void input_pos_vel_accel_z(Vector3f& pos, Vector3f& vel, const Vector3f& accel); void input_pos_vel_accel_z(float &pos, float &vel, float accel);
/// set_alt_target_with_slew - adjusts target up or down using a commanded altitude in cm /// set_alt_target_with_slew - adjusts target up or down using a commanded altitude in cm
/// using the default position control kinimatic path. /// using the default position control kinimatic path.
@ -222,10 +222,10 @@ public:
float get_pos_target_z_cm() const { return _pos_target.z; } float get_pos_target_z_cm() const { return _pos_target.z; }
/// get_stopping_point_xy_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration /// get_stopping_point_xy_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration
void get_stopping_point_xy_cm(Vector3f &stopping_point) const; void get_stopping_point_xy_cm(Vector2f &stopping_point) const;
/// get_stopping_point_z_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration /// get_stopping_point_z_cm - calculates stopping point in NEU cm based on current position, velocity, vehicle acceleration
void get_stopping_point_z_cm(Vector3f& stopping_point) const; void get_stopping_point_z_cm(float &stopping_point) const;
/// get_pos_error_cm - get position error vector between the current and target position /// get_pos_error_cm - get position error vector between the current and target position
const Vector3f get_pos_error_cm() const { return _pos_target - _inav.get_position(); } const Vector3f get_pos_error_cm() const { return _pos_target - _inav.get_position(); }
@ -243,7 +243,7 @@ public:
void set_vel_desired_cms(const Vector3f &des_vel) { _vel_desired = des_vel; } void set_vel_desired_cms(const Vector3f &des_vel) { _vel_desired = des_vel; }
/// set_vel_desired_xy_cms - sets horizontal desired velocity in NEU cm/s /// set_vel_desired_xy_cms - sets horizontal desired velocity in NEU cm/s
void set_vel_desired_xy_cms(const Vector2f &vel) {_vel_desired.x = vel.x; _vel_desired.y = vel.y; } void set_vel_desired_xy_cms(const Vector2f &vel) {_vel_desired.xy() = vel; }
/// get_vel_desired_cms - returns desired velocity (i.e. feed forward) in cm/s in NEU /// get_vel_desired_cms - returns desired velocity (i.e. feed forward) in cm/s in NEU
const Vector3f& get_vel_desired_cms() { return _vel_desired; } const Vector3f& get_vel_desired_cms() { return _vel_desired; }
@ -261,7 +261,7 @@ public:
/// Acceleration /// Acceleration
// set_accel_desired_xy_cmss set desired acceleration in cm/s in xy axis // set_accel_desired_xy_cmss set desired acceleration in cm/s in xy axis
void set_accel_desired_xy_cmss(const Vector2f &accel_cms) { _accel_desired.x = accel_cms.x; _accel_desired.y = accel_cms.y; } void set_accel_desired_xy_cmss(const Vector2f &accel_cms) { _accel_desired.xy() = accel_cms; }
// get_accel_target_cmss - returns the target acceleration in NEU cm/s/s // get_accel_target_cmss - returns the target acceleration in NEU cm/s/s
const Vector3f& get_accel_target_cmss() const { return _accel_target; } const Vector3f& get_accel_target_cmss() const { return _accel_target; }

10
libraries/AC_AttitudeControl/AC_PosControl_Sub.cpp
View File

@ -17,14 +17,14 @@ AC_PosControl_Sub::AC_PosControl_Sub(AP_AHRS_View& ahrs, const AP_InertialNav& i
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
/// The time constant must be positive. /// The time constant must be positive.
/// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time. /// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time.
void AC_PosControl_Sub::input_vel_accel_z(Vector3f& vel, const Vector3f& accel, bool force_descend) void AC_PosControl_Sub::input_vel_accel_z(float &vel, const float accel, bool force_descend)
{ {
// check for ekf z position reset // check for ekf z position reset
handle_ekf_z_reset(); handle_ekf_z_reset();
// limit desired velocity to prevent breeching altitude limits // limit desired velocity to prevent breeching altitude limits
if (_alt_min < 0 && _alt_min < _alt_max && _alt_max < 100 && _pos_target.z < _alt_min) { if (_alt_min < 0 && _alt_min < _alt_max && _alt_max < 100 && _pos_target.z < _alt_min) {
vel.z = constrain_float(vel.z, vel = constrain_float(vel,
sqrt_controller(_alt_min-_pos_target.z, 0.0f, _accel_max_z_cmss, 0.0f), sqrt_controller(_alt_min-_pos_target.z, 0.0f, _accel_max_z_cmss, 0.0f),
sqrt_controller(_alt_max-_pos_target.z, 0.0f, _accel_max_z_cmss, 0.0f)); sqrt_controller(_alt_max-_pos_target.z, 0.0f, _accel_max_z_cmss, 0.0f));
} }
@ -39,18 +39,18 @@ void AC_PosControl_Sub::input_vel_accel_z(Vector3f& vel, const Vector3f& accel,
} }
// adjust desired alt if motors have not hit their limits // adjust desired alt if motors have not hit their limits
update_pos_vel_accel_z(_pos_target, _vel_desired, _accel_desired, _dt, _limit_vector); update_pos_vel_accel(_pos_target.z, _vel_desired.z, _accel_desired.z, _dt, _limit_vector.z);
// prevent altitude target from breeching altitude limits // prevent altitude target from breeching altitude limits
if (is_negative(_alt_min) && _alt_min < _alt_max && _alt_max < 100 && _pos_target.z < _alt_min) { if (is_negative(_alt_min) && _alt_min < _alt_max && _alt_max < 100 && _pos_target.z < _alt_min) {
_pos_target.z = constrain_float(_pos_target.z, _alt_min, _alt_max); _pos_target.z = constrain_float(_pos_target.z, _alt_min, _alt_max);
} }
shape_vel_accel(vel.z, accel.z, shape_vel_accel(vel, accel,
_vel_desired.z, _accel_desired.z, _vel_desired.z, _accel_desired.z,
_vel_max_down_cms, _vel_max_up_cms, _vel_max_down_cms, _vel_max_up_cms,
-accel_z_cms, accel_z_cms, -accel_z_cms, accel_z_cms,
_tc_z_s, _dt); _tc_z_s, _dt);
update_vel_accel_z(vel, accel, _dt, _limit_vector); update_vel_accel(vel, accel, _dt, _limit_vector.z);
} }

2
libraries/AC_AttitudeControl/AC_PosControl_Sub.h
View File

@ -29,7 +29,7 @@ public:
/// The time constant also defines the time taken to achieve the maximum acceleration. /// The time constant also defines the time taken to achieve the maximum acceleration.
/// The time constant must be positive. /// The time constant must be positive.
/// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time. /// The function alters the input velocity to be the velocity that the system could reach zero acceleration in the minimum time.
void input_vel_accel_z(Vector3f& vel, const Vector3f& accel, bool force_descend) override; void input_vel_accel_z(float &vel, float accel, bool force_descend) override;
private: private:
float _alt_max; // max altitude - should be updated from the main code with altitude limit from fence float _alt_max; // max altitude - should be updated from the main code with altitude limit from fence