rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7589 from etracer65/arming_disabled_count 

Fix arming disabled flags count
This commit is contained in:
Michael Keller 2019-02-20 06:51:02 +13:00 committed by GitHub
parent 26558ae91e b96ed557a9
commit 7f3a9e4c8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/fc/runtime_config.h
View File

@ -20,6 +20,8 @@
#pragma once #pragma once
#include "common/utils.h"
// FIXME some of these are flight modes, some of these are general status indicators // FIXME some of these are flight modes, some of these are general status indicators
typedef enum { typedef enum {
ARMED = (1 << 0), ARMED = (1 << 0),
@ -60,7 +62,7 @@ typedef enum {
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 << 19), // 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 (LOG2(ARMING_DISABLED_ARM_SWITCH) + 1)
extern const char *armingDisableFlagNames[ARMING_DISABLE_FLAGS_COUNT]; extern const char *armingDisableFlagNames[ARMING_DISABLE_FLAGS_COUNT];