Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Merge pull request #4474 from mikeller/fix_arming_disable_display

Browse source 
Changed arming disabled reason display in OSD to show real reason.
This commit is contained in:
Michael Keller 2017-11-02 18:55:44 +13:00 • committed by GitHub
commit 69d6c45291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,8 +32,8 @@ static uint32_t enabledSensors = 0;
#if defined(OSD) || !defined(MINIMAL_CLI)
const char *armingDisableFlagNames[]= {
"NOGYRO", "FAILSAFE", "RXLOSS", "BADRX", "BOXFAILSAFE",
"THROTTLE", "ANGLE", "BOOTGRACE", "NOPREARM", "ARMSWITCH",
"LOAD", "CALIB", "CLI", "CMS", "OSD", "BST", "MSP"
"THROTTLE", "ANGLE", "BOOTGRACE", "NOPREARM", "LOAD",
"CALIB", "CLI", "CMS", "OSD", "BST", "MSP", "ARMSWITCH"
};
#endif

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

@ -44,14 +44,14 @@ typedef enum {
ARMING_DISABLED_ANGLE = (1 << 6),
ARMING_DISABLED_BOOT_GRACE_TIME = (1 << 7),
ARMING_DISABLED_NOPREARM = (1 << 8),
ARMING_DISABLED_ARM_SWITCH = (1 << 9),
ARMING_DISABLED_LOAD = (1 << 10),
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_LOAD = (1 << 9),
ARMING_DISABLED_CALIBRATING = (1 << 10),
ARMING_DISABLED_CLI = (1 << 11),
ARMING_DISABLED_CMS_MENU = (1 << 12),
ARMING_DISABLED_OSD_MENU = (1 << 13),
ARMING_DISABLED_BST = (1 << 14),
ARMING_DISABLED_MSP = (1 << 15),
ARMING_DISABLED_ARM_SWITCH = (1 << 16), // Needs to be the last element, since it's always activated if one of the others is active when arming
} armingDisableFlags_e;
#define NUM_ARMING_DISABLE_FLAGS 17