Skip to content

Commit

Permalink
Sub: Separate landing and terrain following.
Browse files Browse the repository at this point in the history
  • Loading branch information
lthall authored and rmackay9 committed Sep 6, 2021
1 parent 5fea74d commit c2f7702
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ArduSub/control_auto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ArduSub/control_circle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
2 changes: 1 addition & 1 deletion ArduSub/control_guided.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion ArduSub/control_surface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c2f7702

Please sign in to comment.