Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 11:59:58 +03:00
Code Issues Wiki Activity

Added shadow copies for CLI and MSP.

Browse source
This commit is contained in:
mikeller 2018-07-10 00:49:17 +12:00
parent 985a9208d5
commit 6de1c32d9d
56 changed files with 277 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/main/interface/cli.c
View file

@ -179,6 +179,9 @@ static bool configIsInCopy = false;
static int8_t pidProfileIndexToUse = CURRENT_PROFILE_INDEX;
static int8_t rateProfileIndexToUse = CURRENT_PROFILE_INDEX;
static bool featureMaskIsCopied = false;
static uint32_t featureMaskCopy;
#if defined(USE_BOARD_INFO)
static bool boardInformationUpdated = false;
#if defined(USE_SIGNATURE)
@ -2345,9 +2348,18 @@ static void cliMcuId(char *cmdline)
cliPrintLinef("mcu_id %08x%08x%08x", U_ID_0, U_ID_1, U_ID_2);
}
static uint32_t getFeatureMask(const uint32_t featureMask)
{
if (featureMaskIsCopied) {
return featureMaskCopy;
} else {
return featureMask;
}
}
static void printFeature(uint8_t dumpMask, const featureConfig_t *featureConfig, const featureConfig_t *featureConfigDefault)
{
const uint32_t mask = featureConfig->enabledFeatures;
const uint32_t mask = getFeatureMask(featureConfig->enabledFeatures);
const uint32_t defaultMask = featureConfigDefault->enabledFeatures;
for (uint32_t i = 0; featureNames[i]; i++) { // disabled features first
if (strcmp(featureNames[i], emptyString) != 0) { //Skip unused
@ -2372,15 +2384,16 @@ static void printFeature(uint8_t dumpMask, const featureConfig_t *featureConfig,
static void cliFeature(char *cmdline)
{
uint32_t len = strlen(cmdline);
uint32_t mask = featureMask();
const uint32_t mask = getFeatureMask(featureMask());
if (len == 0) {
cliPrint("Enabled: ");
for (uint32_t i = 0; ; i++) {
if (featureNames[i] == NULL)
if (featureNames[i] == NULL) {
break;
if (mask & (1 << i))
}
if (mask & (1 << i)) {
cliPrintf("%s ", featureNames[i]);
}
}
cliPrintLinefeed();
} else if (strncasecmp(cmdline, "list", len) == 0) {
@ -2394,6 +2407,12 @@ static void cliFeature(char *cmdline)
cliPrintLinefeed();
return;
} else {
if (!featureMaskIsCopied) {
featureMaskCopy = featureMask();
featureMaskIsCopied = true;
}
uint32_t feature;
bool remove = false;
if (cmdline[0] == '-') {
// remove feature
@ -2409,25 +2428,24 @@ static void cliFeature(char *cmdline)
}
if (strncasecmp(cmdline, featureNames[i], len) == 0) {
mask = 1 << i;
feature = 1 << i;
#ifndef USE_GPS
if (mask & FEATURE_GPS) {
if (feature & FEATURE_GPS) {
cliPrintLine("unavailable");
break;
}
#endif
#ifndef USE_RANGEFINDER
if (mask & FEATURE_RANGEFINDER) {
if (feature & FEATURE_RANGEFINDER) {
cliPrintLine("unavailable");
break;
}
#endif
if (remove) {
featureClear(mask);
featureClear(feature, &featureMaskCopy);
cliPrint("Disabled");
} else {
featureSet(mask);
featureSet(feature, &featureMaskCopy);
cliPrint("Enabled");
}
cliPrintLinef(" %s", featureNames[i]);
@ -2946,7 +2964,7 @@ static void cliDshotProg(char *cmdline)
pwmWriteDshotCommand(escIndex, getMotorCount(), command, true);
} else {
#if defined(USE_ESC_SENSOR) && defined(USE_ESC_SENSOR_INFO)
if (featureConfigured(FEATURE_ESC_SENSOR)) {
if (featureIsEnabled(FEATURE_ESC_SENSOR)) {
if (escIndex != ALL_MOTORS) {
executeEscInfoCommand(escIndex);
} else {
@ -3238,7 +3256,11 @@ static void cliSave(char *cmdline)
#endif
#endif // USE_BOARD_INFO
writeEEPROM();
if (featureMaskIsCopied) {
writeEEPROMWithFeatures(featureMaskCopy);
} else {
writeEEPROM();
}
cliReboot();
}
@ -4642,9 +4664,9 @@ void cliEnter(serialPort_t *serialPort)
#else
cliPrintLine("\r\nCLI");
#endif
cliPrompt();
setArmingDisabled(ARMING_DISABLED_CLI);
cliPrompt();
}
void cliInit(const serialConfig_t *serialConfig)