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

Hack to prevent fly aways 

Cleanup to remove SIMPLE mode switch note
This commit is contained in:
Jason Short 2011-12-11 12:01:06 -08:00
parent c01361a79d
commit 4efbae4a1c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/Attitude.pde
View File

@ -121,8 +121,8 @@ get_nav_throttle(int32_t z_error)
{ {
int16_t rate_error; int16_t rate_error;
float dt = (abs(z_error) < 400) ? .1 : 0.0; // XXX HACK, need a better way not to ramp this i term in large altitude changes.
//float dt = .1; float dt = (abs(z_error) < 400) ? .1 : 0.01;
// limit error to prevent I term run up // limit error to prevent I term run up
z_error = constrain(z_error, -ALT_ERROR_MAX, ALT_ERROR_MAX); z_error = constrain(z_error, -ALT_ERROR_MAX, ALT_ERROR_MAX);

3
ArduCopter/control_modes.pde
View File

@ -51,9 +51,6 @@ static void read_trim_switch()
do_flip = true; do_flip = true;
} }
#elif CH7_OPTION == CH7_SIMPLE_MODE
//Serial.println(g.rc_7.control_in, DEC);
#elif CH7_OPTION == CH7_SET_HOVER #elif CH7_OPTION == CH7_SET_HOVER
// switch is engaged // switch is engaged
if (g.rc_7.control_in > 800){ if (g.rc_7.control_in > 800){