1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 23:35:34 +03:00

Merge pull request #2760 from mikeller/reworked_altitude_estimation

Reworked altitude estimation. Made it work when ACC is disabled.
This commit is contained in:
Michael Keller 2017-04-10 13:00:16 +12:00 committed by GitHub
commit ce8c5fbd79
21 changed files with 127 additions and 136 deletions

View file

@ -62,7 +62,7 @@
#include "fc/rc_adjustments.h"
#include "fc/runtime_config.h"
#include "flight/altitudehold.h"
#include "flight/altitude.h"
#include "flight/failsafe.h"
#include "flight/imu.h"
#include "flight/mixer.h"
@ -693,11 +693,11 @@ static bool mspFcProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProcessFn
case MSP_ALTITUDE:
#if defined(BARO) || defined(SONAR)
sbufWriteU32(dst, altitudeHoldGetEstimatedAltitude());
sbufWriteU32(dst, getEstimatedAltitude());
#else
sbufWriteU32(dst, 0);
#endif
sbufWriteU16(dst, vario);
sbufWriteU16(dst, getEstimatedVario());
break;
case MSP_SONAR_ALTITUDE: