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

Merge branch 'inflight-adjustments'

This commit is contained in:
Dominic Clifton 2014-10-24 23:12:45 +01:00
commit 8aeee0b5fd
13 changed files with 686 additions and 80 deletions

View file

@ -332,9 +332,9 @@ void handleInflightCalibrationStickPosition(void)
} else {
AccInflightCalibrationArmed = !AccInflightCalibrationArmed;
if (AccInflightCalibrationArmed) {
queueConfirmationBeep(2);
queueConfirmationBeep(4);
} else {
queueConfirmationBeep(3);
queueConfirmationBeep(6);
}
}
}
@ -495,6 +495,9 @@ void processRx(void)
updateActivatedModes(currentProfile->modeActivationConditions);
updateAdjustmentStates(currentProfile->adjustmentRanges);
processRcAdjustments(&currentProfile->controlRateConfig, &masterConfig.rxConfig);
bool canUseHorizonMode = true;
if ((IS_RC_MODE_ACTIVE(BOXANGLE) || (feature(FEATURE_FAILSAFE) && failsafe->vTable->hasTimerElapsed())) && (sensors(SENSOR_ACC))) {