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

Copter: Guided: make aircraft stop on accel time out

This commit is contained in:
Leonard Hall 2021-07-09 14:55:35 +09:30 committed by Randy Mackay
parent 0132b30d27
commit 991cc19f85
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduCopter/mode_guided.cpp
View File

@ -615,12 +615,14 @@ void ModeGuided::accel_control_run()
// set velocity to zero and stop rotating if no updates received for 3 seconds // set velocity to zero and stop rotating if no updates received for 3 seconds
uint32_t tnow = millis(); uint32_t tnow = millis();
if (tnow - update_time_ms > GUIDED_POSVEL_TIMEOUT_MS) { if (tnow - update_time_ms > GUIDED_POSVEL_TIMEOUT_MS) {
guided_vel_target_cms.zero();
guided_accel_target_cmss.zero(); guided_accel_target_cmss.zero();
if (auto_yaw.mode() == AUTO_YAW_RATE) { if (auto_yaw.mode() == AUTO_YAW_RATE) {
auto_yaw.set_rate(0.0f); auto_yaw.set_rate(0.0f);
} }
} pos_control->input_vel_accel_xy(guided_vel_target_cms.xy(), guided_accel_target_cmss.xy());
pos_control->input_vel_accel_z(guided_vel_target_cms.z, guided_accel_target_cmss.z, false);
} else {
// update position controller with new target // update position controller with new target
pos_control->input_accel_xy(guided_accel_target_cmss); pos_control->input_accel_xy(guided_accel_target_cmss);
if (!stabilizing_vel_xy()) { if (!stabilizing_vel_xy()) {
@ -630,7 +632,8 @@ void ModeGuided::accel_control_run()
// set position errors to zero // set position errors to zero
pos_control->stop_pos_xy_stabilisation(); pos_control->stop_pos_xy_stabilisation();
} }
pos_control->input_vel_accel_z(guided_vel_target_cms.z, guided_accel_target_cmss.z, false); pos_control->input_accel_z(guided_accel_target_cmss.z);
}
// call velocity controller which includes z axis controller // call velocity controller which includes z axis controller
pos_control->update_xy_controller(); pos_control->update_xy_controller();