Merge pull request #846 from mikeller/improve_arming_disabled_flag_display

Made display of arming disabled reasons match number of beeps.
10.3.x-maintenance
Michael Keller 2018-01-14 23:38:44 +13:00 committed by GitHub
commit 7aa40226e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -526,7 +526,7 @@
"message": "Arming Allowed"
},
"initialSetupArmingDisableFlagsTooltip": {
"message": "List of flags indicating why arming is currently not allowed. Please refer to the Wiki for a description of what these flags mean."
"message": "List of flags indicating why arming is currently not allowed. The first and most important value corresponds to the number of warning beeps that sound when arming is attempted. Please refer to the Wiki ('Arming Sequence & Safety' page) for a description of what these flags mean."
},
"initialSetupGPSHead": {
"message": "GPS"

View File

@ -192,7 +192,7 @@ TABS.setup.initialize = function (callback) {
var flagIndicies = [];
for (var i = 0; i < 32; i++) {
if (CONFIG.armingDisableFlags & (1 << i)) {
flagIndicies.push(i);
flagIndicies.push(i + 1);
}
}
armingString = flagIndicies;