Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 16:55:29 +03:00
Code Issues Wiki Activity

Fix bug in acc and mag calibration flag logic

Browse source
This commit is contained in:
Konstantin Sharlaimov (DigitalEntity) 2016-12-14 19:31:00 +10:00
parent a92fef2678
commit 9b5acb70a9
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/sensors/acceleration.c
View file

@ -389,12 +389,12 @@ void setAccelerationCalibrationValues(flightDynamicsTrims_t * accZeroToUse, flig
accZero = accZeroToUse;
accGain = accGainToUse;
if ((accZero->raw[X] != 0) && (accZero->raw[Y] != 0) && (accZero->raw[Z] != 0) &&
(accGain->raw[X] != 4096) && (accGain->raw[Y] != 4096) &&(accGain->raw[Z] != 4096)) {
ENABLE_STATE(ACCELEROMETER_CALIBRATED);
if ((accZero->raw[X] == 0) && (accZero->raw[Y] == 0) && (accZero->raw[Z] == 0) &&
(accGain->raw[X] == 4096) && (accGain->raw[Y] == 4096) &&(accGain->raw[Z] == 4096)) {
DISABLE_STATE(ACCELEROMETER_CALIBRATED);
}
else {
DISABLE_STATE(ACCELEROMETER_CALIBRATED);
ENABLE_STATE(ACCELEROMETER_CALIBRATED);
}
}

6
src/main/sensors/compass.c
View file

@ -205,11 +205,11 @@ void compassUpdate(timeUs_t currentTimeUs, flightDynamicsTrims_t *magZero)
static int16_t magPrev[XYZ_AXIS_COUNT];
// Check magZero
if ((magZero->raw[X] != 0) && (magZero->raw[Y] != 0) && (magZero->raw[Z] != 0)) {
ENABLE_STATE(COMPASS_CALIBRATED);
if ((magZero->raw[X] == 0) && (magZero->raw[Y] == 0) && (magZero->raw[Z] == 0)) {
DISABLE_STATE(COMPASS_CALIBRATED);
}
else {
DISABLE_STATE(COMPASS_CALIBRATED);
ENABLE_STATE(COMPASS_CALIBRATED);
}
if (!mag.dev.read(magADCRaw)) {