mirror of https://github.com/ArduPilot/ardupilot
Sub: Separate landing and terrain following.
This commit is contained in:
parent
67bbbcfa58
commit
1f8ad147f1
|
@ -662,7 +662,7 @@ void Sub::auto_terrain_recover_run()
|
|||
|
||||
/////////////////////
|
||||
// update z target //
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(target_climb_rate, true);
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(target_climb_rate);
|
||||
pos_control.update_z_controller();
|
||||
|
||||
////////////////////////////
|
||||
|
|
|
@ -80,6 +80,6 @@ void Sub::circle_run()
|
|||
}
|
||||
|
||||
// update altitude target and call position controller
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(target_climb_rate, false);
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(target_climb_rate);
|
||||
pos_control.update_z_controller();
|
||||
}
|
||||
|
|
|
@ -498,7 +498,7 @@ void Sub::guided_angle_control_run()
|
|||
attitude_control.input_euler_angle_roll_pitch_yaw(roll_in, pitch_in, yaw_in, true);
|
||||
|
||||
// call position controller
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(climb_rate_cms, false);
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(climb_rate_cms);
|
||||
pos_control.update_z_controller();
|
||||
}
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ void Sub::surface_run()
|
|||
desired_climb_rate = cmb_rate;
|
||||
|
||||
// update altitude target and call position controller
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(cmb_rate, true);
|
||||
pos_control.set_pos_target_z_from_climb_rate_cm(cmb_rate);
|
||||
pos_control.update_z_controller();
|
||||
|
||||
// pilot has control for repositioning
|
||||
|
|
Loading…
Reference in New Issue