Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 10:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

return to prev climb rate calc

Browse Source
This commit is contained in:
Jason Short 2011-11-19 13:58:41 -08:00
parent 35524f6da7
commit 579096cd2e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ArduCopter/ArduCopter.pde
View File

@ -1244,13 +1244,20 @@ static void update_altitude()
#else #else
// This is real life // This is real life
// read in Actual Baro Altitude
baro_alt = (baro_alt + read_barometer()) >> 1;
// calc the vertical accel rate // calc the vertical accel rate
#if CLIMB_RATE_BARO = 1
int temp_baro_alt = (barometer._offset_press - barometer.RawPress) << 1; // invert and scale int temp_baro_alt = (barometer._offset_press - barometer.RawPress) << 1; // invert and scale
baro_rate = (temp_baro_alt - old_baro_alt) * 10; baro_rate = (temp_baro_alt - old_baro_alt) * 10;
old_baro_alt = temp_baro_alt; old_baro_alt = temp_baro_alt;
// read in Actual Baro Altitude #else
baro_alt = (baro_alt + read_barometer()) >> 1; baro_rate = (baro_alt - old_baro_alt) * 10;
old_baro_alt = baro_alt;
#endif
// sonar_alt is calculaed in a faster loop and filtered with a mode filter // sonar_alt is calculaed in a faster loop and filtered with a mode filter
#endif #endif