1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 09:16:07 +03:00

Added calibration menu to CMS.

This commit is contained in:
mikeller 2019-11-16 12:24:49 +13:00 committed by Michael Keller
parent c6e5882dd9
commit cedcf2d7e2
41 changed files with 387 additions and 143 deletions

View file

@ -177,15 +177,15 @@ PG_RESET_TEMPLATE(throttleCorrectionConfig_t, throttleCorrectionConfig,
static bool isCalibrating(void)
{
return !isGyroCalibrationComplete()
return (sensors(SENSOR_GYRO) && !gyroIsCalibrationComplete())
#ifdef USE_ACC
|| (sensors(SENSOR_ACC) && !accIsCalibrationComplete())
#endif
#ifdef USE_BARO
|| (sensors(SENSOR_BARO) && !isBaroCalibrationComplete())
|| (sensors(SENSOR_BARO) && !baroIsCalibrationComplete())
#endif
#ifdef USE_MAG
|| (sensors(SENSOR_MAG) && !isCompassCalibrationComplete())
|| (sensors(SENSOR_MAG) && !compassIsCalibrationComplete())
#endif
;
}
@ -216,11 +216,7 @@ static bool accNeedsCalibration(void)
if (sensors(SENSOR_ACC)) {
// Check to see if the ACC has already been calibrated
if (accelerometerConfig()->accZero.values.calibrationCompleted ||
accelerometerConfig()->accZero.values.roll != 0 ||
accelerometerConfig()->accZero.values.pitch != 0 ||
accelerometerConfig()->accZero.values.yaw != 0) {
if (accHasBeenCalibrated()) {
return false;
}