Merge pull request #2330 from iNavFlight/mmosca-fix-arming-disabled-geozone

Add ARMING_DISABLED_GEOZONE

Author: mmosca

js/gui.js

@@ -224,6 +224,7 @@ GUI_control.prototype.updateStatusBar = function() {
         'ARMED':(1 << 2),
         //'WAS_EVER_ARMED':(1 << 3),
         'SIMULATOR_MODE':(1 << 4),
+        'ARMING_DISABLED_GEOZONE':(1 << 6),
         'ARMING_DISABLED_FAILSAFE_SYSTEM':(1 << 7),
         'ARMING_DISABLED_NOT_LEVEL':(1 << 8),
         'ARMING_DISABLED_SENSORS_CALIBRATING':(1 << 9),
@@ -234,7 +235,7 @@ GUI_control.prototype.updateStatusBar = function() {
         'ARMING_DISABLED_ARM_SWITCH':(1 << 14),
         'ARMING_DISABLED_HARDWARE_FAILURE':(1 << 15),
         'ARMING_DISABLED_BOXFAILSAFE':(1 << 16),
-        'ARMING_DISABLED_BOXKILLSWITCH':(1 << 17),
+        //'ARMING_DISABLED_BOXKILLSWITCH':(1 << 17),
         'ARMING_DISABLED_RC_LINK':(1 << 18),
         'ARMING_DISABLED_THROTTLE':(1 << 19),
         'ARMING_DISABLED_CLI':(1 << 20),