Remove the OSD_MENU arming disabled flag, as it is redundant to the CMS_MENU flag.
This commit is contained in:
parent
c39ea81b6a
commit
b1d989ac41
|
@ -48,7 +48,6 @@ const char *armingDisableFlagNames[]= {
|
|||
"CALIB",
|
||||
"CLI",
|
||||
"CMS",
|
||||
"OSD",
|
||||
"BST",
|
||||
"MSP",
|
||||
"PARALYZE",
|
||||
|
|
|
@ -52,13 +52,12 @@ typedef enum {
|
|||
ARMING_DISABLED_CALIBRATING = (1 << 11),
|
||||
ARMING_DISABLED_CLI = (1 << 12),
|
||||
ARMING_DISABLED_CMS_MENU = (1 << 13),
|
||||
ARMING_DISABLED_OSD_MENU = (1 << 14),
|
||||
ARMING_DISABLED_BST = (1 << 15),
|
||||
ARMING_DISABLED_MSP = (1 << 16),
|
||||
ARMING_DISABLED_PARALYZE = (1 << 17),
|
||||
ARMING_DISABLED_GPS = (1 << 18),
|
||||
ARMING_DISABLED_RESC = (1 << 19),
|
||||
ARMING_DISABLED_ARM_SWITCH = (1 << 20), // Needs to be the last element, since it's always activated if one of the others is active when arming
|
||||
ARMING_DISABLED_BST = (1 << 14),
|
||||
ARMING_DISABLED_MSP = (1 << 15),
|
||||
ARMING_DISABLED_PARALYZE = (1 << 16),
|
||||
ARMING_DISABLED_GPS = (1 << 17),
|
||||
ARMING_DISABLED_RESC = (1 << 18),
|
||||
ARMING_DISABLED_ARM_SWITCH = (1 << 19), // Needs to be the last element, since it's always activated if one of the others is active when arming
|
||||
} armingDisableFlags_e;
|
||||
|
||||
#define ARMING_DISABLE_FLAGS_COUNT 21
|
||||
|
|
|
@ -2042,15 +2042,6 @@ void osdUpdate(timeUs_t currentTimeUs)
|
|||
displayDrawScreen(osdDisplayPort);
|
||||
}
|
||||
++counter;
|
||||
|
||||
#ifdef USE_CMS
|
||||
// do not allow ARM if we are in menu
|
||||
if (displayIsGrabbed(osdDisplayPort)) {
|
||||
setArmingDisabled(ARMING_DISABLED_OSD_MENU);
|
||||
} else {
|
||||
unsetArmingDisabled(ARMING_DISABLED_OSD_MENU);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void osdSuppressStats(bool flag)
|
||||
|
|
Loading…
Reference in New Issue