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

ArduCopter: bug fix to accel based throttle controller (was using m/s instead of cm/s)

This commit is contained in:
rmackay9 2012-12-22 14:21:25 +09:00 committed by Andrew Tridgell
parent e77b54c7dc
commit e583ade62d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/Attitude.pde
View File

@ -808,10 +808,8 @@ get_throttle_accel(int16_t z_target_accel)
int16_t output;
float z_accel_meas;
Vector3f accel = ins.get_accel();
// Calculate Earth Frame Z acceleration
z_accel_meas = ahrs.get_accel_ef().z;
z_accel_meas = (ahrs.get_accel_ef().z - gravity) * 100;
// calculate accel error and Filter with fc = 2 Hz
z_accel_error = z_accel_error + 0.11164 * (constrain(z_target_accel + z_accel_meas, -32000, 32000) - z_accel_error);