Moved disabled flags text to CLI where other flag text is located

This commit is contained in:
blckmn 2017-07-02 10:06:38 +10:00
parent 5353c136d1
commit 82b73ce00e
3 changed files with 7 additions and 18 deletions

View File

@ -190,10 +190,16 @@ static const char * const gyroNames[] = {
static const char * const *sensorHardwareNames[] = {
gyroNames, lookupTableAccHardware, lookupTableBaroHardware, lookupTableMagHardware
};
#endif // USE_SENSOR_NAMES
#ifndef MINIMAL_CLI
static const char *armingDisableFlagNames[] = {
"NOGYRO", "FAILSAFE", "BOXFAILSAFE", "THROTTLE",
"ANGLE", "LOAD", "CALIB", "CLI", "CMS", "OSD", "BST"
};
#endif
static void cliPrint(const char *str)
{
while (*str) {

View File

@ -23,8 +23,6 @@
#include "fc/runtime_config.h"
#include "io/beeper.h"
const char *armingDisableFlagNames[] = { ARMING_DISBALED_FLAG_NAMES };
uint8_t armingFlags = 0;
uint8_t stateFlags = 0;
uint16_t flightModeFlags = 0;

View File

@ -47,21 +47,6 @@ typedef enum {
ARMING_DISABLED_BST = (1 << 10),
} armingDisableFlags_e;
extern const char *armingDisableFlagNames[];
#define ARMING_DISBALED_FLAG_NAMES \
"NOGYRO", \
"FAILSAFE", \
"BOXFAILSAFE", \
"THROTTLE", \
"ANGLE", \
"LOAD", \
"CALIB", \
"CLI", \
"CMS", \
"OSD", \
"BST",
void setArmingDisabled(armingDisableFlags_e flag);
void unsetArmingDisabled(armingDisableFlags_e flag);
bool isArmingDisabled(void);