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

AC_AutoTune: allow save of completed axes 

this allows you to stop the tune by disarming part way through and
save the completed axes
This commit is contained in:
Andrew Tridgell 2018-12-14 17:00:51 +11:00 committed by Randy Mackay
parent a5e5ee73eb
commit 2277f70456
2 changed files with 98 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/AC_AutoTune/AC_AutoTune.cpp
View File

@ -189,6 +189,8 @@ bool AC_AutoTune::init_internals(bool _use_poshold,
// stop - should be called when the ch7/ch8 switch is switched OFF
void AC_AutoTune::stop()
{
axes_completed = 0;
// set gains to their original values
load_orig_gains();
@ -219,6 +221,8 @@ bool AC_AutoTune::start(void)
pos_control->set_desired_velocity_z(inertial_nav->get_velocity_z());
}
axes_completed = 0;
return true;
}
@ -803,6 +807,7 @@ void AC_AutoTune::control_attitude()
bool complete = false;
switch (axis) {
case ROLL:
axes_completed |= AUTOTUNE_AXIS_BITMASK_ROLL;
tune_roll_sp = MAX(AUTOTUNE_SP_MIN, tune_roll_sp * AUTOTUNE_SP_BACKOFF);
tune_roll_accel = MAX(AUTOTUNE_RP_ACCEL_MIN, test_accel_max * AUTOTUNE_ACCEL_RP_BACKOFF);
if (pitch_enabled()) {
@ -814,6 +819,7 @@ void AC_AutoTune::control_attitude()
}
break;
case PITCH:
axes_completed |= AUTOTUNE_AXIS_BITMASK_PITCH;
tune_pitch_sp = MAX(AUTOTUNE_SP_MIN, tune_pitch_sp * AUTOTUNE_SP_BACKOFF);
tune_pitch_accel = MAX(AUTOTUNE_RP_ACCEL_MIN, test_accel_max * AUTOTUNE_ACCEL_RP_BACKOFF);
if (yaw_enabled()) {
@ -823,6 +829,7 @@ void AC_AutoTune::control_attitude()
}
break;
case YAW:
axes_completed |= AUTOTUNE_AXIS_BITMASK_YAW;
tune_yaw_sp = MAX(AUTOTUNE_SP_MIN, tune_yaw_sp * AUTOTUNE_SP_BACKOFF);
tune_yaw_accel = MAX(AUTOTUNE_Y_ACCEL_MIN, test_accel_max * AUTOTUNE_ACCEL_Y_BACKOFF);
complete = true;
@ -1050,8 +1057,10 @@ void AC_AutoTune::load_twitch_gains()
// save discovered gains to eeprom if autotuner is enabled (i.e. switch is in the high position)
void AC_AutoTune::save_tuning_gains()
{
// if we successfully completed tuning
if (mode == SUCCESS) {
// see if we successfully completed tuning of at least one axis
if (axes_completed == 0) {
return;
}
if (!attitude_control->get_bf_feedforward()) {
attitude_control->bf_feedforward_save(true);
@ -1060,7 +1069,7 @@ void AC_AutoTune::save_tuning_gains()
}
// sanity check the rate P values
if (roll_enabled() && !is_zero(tune_roll_rp)) {
if ((axes_completed & AUTOTUNE_AXIS_BITMASK_ROLL) && roll_enabled() && !is_zero(tune_roll_rp)) {
// rate roll gains
attitude_control->get_rate_roll_pid().kP(tune_roll_rp);
attitude_control->get_rate_roll_pid().kI(tune_roll_rp*AUTOTUNE_PI_RATIO_FINAL);
@ -1082,7 +1091,7 @@ void AC_AutoTune::save_tuning_gains()
orig_roll_accel = attitude_control->get_accel_roll_max();
}
if (pitch_enabled() && !is_zero(tune_pitch_rp)) {
if ((axes_completed & AUTOTUNE_AXIS_BITMASK_PITCH) && pitch_enabled() && !is_zero(tune_pitch_rp)) {
// rate pitch gains
attitude_control->get_rate_pitch_pid().kP(tune_pitch_rp);
attitude_control->get_rate_pitch_pid().kI(tune_pitch_rp*AUTOTUNE_PI_RATIO_FINAL);
@ -1104,7 +1113,7 @@ void AC_AutoTune::save_tuning_gains()
orig_pitch_accel = attitude_control->get_accel_pitch_max();
}
if (yaw_enabled() && !is_zero(tune_yaw_rp)) {
if ((axes_completed & AUTOTUNE_AXIS_BITMASK_YAW) && yaw_enabled() && !is_zero(tune_yaw_rp)) {
// rate yaw gains
attitude_control->get_rate_yaw_pid().kP(tune_yaw_rp);
attitude_control->get_rate_yaw_pid().kI(tune_yaw_rp*AUTOTUNE_YAW_PI_RATIO_FINAL);
@ -1127,12 +1136,14 @@ void AC_AutoTune::save_tuning_gains()
orig_yaw_sp = attitude_control->get_angle_yaw_p().kP();
orig_yaw_accel = attitude_control->get_accel_pitch_max();
}
// update GCS and log save gains event
update_gcs(AUTOTUNE_MESSAGE_SAVED_GAINS);
Log_Write_Event(EVENT_AUTOTUNE_SAVEDGAINS);
// reset Autotune so that gains are not saved again and autotune can be run again.
mode = UNINITIALISED;
}
axes_completed = 0;
}
// update_gcs - send message to ground station
@ -1152,7 +1163,10 @@ void AC_AutoTune::update_gcs(uint8_t message_id)
gcs().send_text(MAV_SEVERITY_NOTICE,"AutoTune: Failed");
break;
case AUTOTUNE_MESSAGE_SAVED_GAINS:
gcs().send_text(MAV_SEVERITY_NOTICE,"AutoTune: Saved gains");
gcs().send_text(MAV_SEVERITY_NOTICE,"AutoTune: Saved gains for %s%s%s",
(axes_completed&AUTOTUNE_AXIS_BITMASK_ROLL)?"Roll ":"",
(axes_completed&AUTOTUNE_AXIS_BITMASK_PITCH)?"Pitch ":"",
(axes_completed&AUTOTUNE_AXIS_BITMASK_YAW)?"Yaw":"");
break;
}
}

1
libraries/AC_AutoTune/AC_AutoTune.h
View File

@ -164,6 +164,7 @@ private:
bool use_poshold : 1; // true = enable position hold
bool have_position : 1; // true = start_position is value
Vector3f start_position;
uint8_t axes_completed; // bitmask of completed axes
// variables
uint32_t override_time; // the last time the pilot overrode the controls