Browse Source

Copter: set jerk to default for circle and guided

master
Randy Mackay 9 years ago
parent
commit
606a0e0d0b
  1. 1
      ArduCopter/control_circle.cpp
  2. 1
      ArduCopter/control_guided.cpp

1
ArduCopter/control_circle.cpp

@ -15,6 +15,7 @@ bool Copter::circle_init(bool ignore_checks) @@ -15,6 +15,7 @@ bool Copter::circle_init(bool ignore_checks)
// initialize speeds and accelerations
pos_control.set_speed_xy(wp_nav.get_speed_xy());
pos_control.set_accel_xy(wp_nav.get_wp_acceleration());
pos_control.set_jerk_xy_to_default();
pos_control.set_speed_z(-g.pilot_velocity_z_max, g.pilot_velocity_z_max);
pos_control.set_accel_z(g.pilot_accel_z);

1
ArduCopter/control_guided.cpp

@ -113,6 +113,7 @@ void Copter::guided_posvel_control_start() @@ -113,6 +113,7 @@ void Copter::guided_posvel_control_start()
// set speed and acceleration from wpnav's speed and acceleration
pos_control.set_speed_xy(wp_nav.get_speed_xy());
pos_control.set_accel_xy(wp_nav.get_wp_acceleration());
pos_control.set_jerk_xy_to_default();
const Vector3f& curr_pos = inertial_nav.get_position();
const Vector3f& curr_vel = inertial_nav.get_velocity();

Loading…
Cancel
Save