From c6eaefd1b9c1d207eb2e991951b6a5875eb69972 Mon Sep 17 00:00:00 2001 From: Bruce Luckcuck Date: Sat, 12 Oct 2019 19:13:57 -0400 Subject: [PATCH] Add support for ACC_CALIB arming disabled flag --- locales/en/messages.json | 4 ++++ src/js/tabs/setup.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/locales/en/messages.json b/locales/en/messages.json index 9c4d8852..16383807 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -922,6 +922,10 @@ "message": "Bitbanged DSHOT is not working properly and the motors can't be controlled. Likely caused by a timer conflict with other features enabled on the flight controller.", "description": "Message that pops up to describe the DSHOT_BBANG arming disable flag" }, + "initialSetupArmingDisableFlagsTooltipACC_CALIB": { + "message": "The accelerometer has not been calibrated and features are enabled that rely on it. Calibrate the accelerometer.", + "description": "Message that pops up to describe the ACC_CALIB arming disable flag" + }, "initialSetupArmingDisableFlagsTooltipARM_SWITCH": { "message": "One of the others disarm flags is active when arming", "description": "Message that pops up to describe the ARM_SWITCH arming disable flag" diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index 681273bb..bbca8661 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -239,6 +239,9 @@ TABS.setup.initialize = function (callback) { disarmFlagElements = disarmFlagElements.concat(['REBOOT_REQD', 'DSHOT_BBANG']); } + if (semver.gte(CONFIG.apiVersion, "1.43.0")) { + disarmFlagElements = disarmFlagElements.concat(['ACC_CALIB']); + } // Always the latest element disarmFlagElements = disarmFlagElements.concat(['ARM_SWITCH']);