Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

Remove the OSD_MENU arming disabled flag, as it is redundant to the CMS_MENU flag.

Browse source
This commit is contained in:
mikeller 2019-01-22 18:21:31 +13:00
parent c39ea81b6a
commit b1d989ac41
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/fc/runtime_config.c
View file

@ -48,7 +48,6 @@ const char *armingDisableFlagNames[]= {
"CALIB", "CALIB",
"CLI", "CLI",
"CMS", "CMS",
"OSD",
"BST", "BST",
"MSP", "MSP",
"PARALYZE", "PARALYZE",

13
src/main/fc/runtime_config.h
View file

@ -52,13 +52,12 @@ typedef enum {
ARMING_DISABLED_CALIBRATING = (1 << 11), ARMING_DISABLED_CALIBRATING = (1 << 11),
ARMING_DISABLED_CLI = (1 << 12), ARMING_DISABLED_CLI = (1 << 12),
ARMING_DISABLED_CMS_MENU = (1 << 13), ARMING_DISABLED_CMS_MENU = (1 << 13),
ARMING_DISABLED_OSD_MENU = (1 << 14), ARMING_DISABLED_BST = (1 << 14),
ARMING_DISABLED_BST = (1 << 15), ARMING_DISABLED_MSP = (1 << 15),
ARMING_DISABLED_MSP = (1 << 16), ARMING_DISABLED_PARALYZE = (1 << 16),
ARMING_DISABLED_PARALYZE = (1 << 17), ARMING_DISABLED_GPS = (1 << 17),
ARMING_DISABLED_GPS = (1 << 18), ARMING_DISABLED_RESC = (1 << 18),
ARMING_DISABLED_RESC = (1 << 19), 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
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
} armingDisableFlags_e; } armingDisableFlags_e;
#define ARMING_DISABLE_FLAGS_COUNT 21 #define ARMING_DISABLE_FLAGS_COUNT 21

9
src/main/io/osd.c
View file

@ -2042,15 +2042,6 @@ void osdUpdate(timeUs_t currentTimeUs)
displayDrawScreen(osdDisplayPort); displayDrawScreen(osdDisplayPort);
} }
++counter; ++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) void osdSuppressStats(bool flag)