zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Attitude.pde: Turned off boost_p for nav_throttle based on Testing feedback from Marco.

master
Jason Short 13 years ago
parent
c76ac4543b
commit
eeab4c5363
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ArduCopter/Attitude.pde

4
ArduCopter/Attitude.pde
Unescape View File

@ -278,7 +278,7 @@ get_nav_throttle(int32_t z_error)
int16_t z_rate_error, z_target_speed, output; int16_t z_rate_error, z_target_speed, output;
// a small boost for alt control to improve takeoff // a small boost for alt control to improve takeoff
int16_t boost_p = constrain(z_error >> 1, -10, 50); //int16_t boost_p = constrain(z_error >> 1, -10, 50);
// convert to desired Rate: // convert to desired Rate:
z_target_speed = g.pi_alt_hold.get_p(z_error); z_target_speed = g.pi_alt_hold.get_p(z_error);
@ -301,7 +301,7 @@ get_nav_throttle(int32_t z_error)
output = constrain(g.pid_throttle.get_pid(z_rate_error, .02), -80, 120); output = constrain(g.pid_throttle.get_pid(z_rate_error, .02), -80, 120);
// output control: // output control:
return output + i_hold + boost_p; return output + i_hold; //+ boost_p;
} }
// Keeps old data out of our calculation / logs // Keeps old data out of our calculation / logs

Write Preview
Loading…
Cancel
Save