Skip to content

Make programming framework CLI safe #8266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2022
Merged

Make programming framework CLI safe #8266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c521ad
Move programming framework to end of dump
MrD-RC Jul 29, 2022
d1fc694
Rethink of issue and solution
MrD-RC Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/main/fc/cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3663,7 +3663,7 @@ static void printConfig(const char *cmdline, bool doDiff)
printMotorMix(dumpMask, primaryMotorMixer_CopyArray, primaryMotorMixer(0));

// print custom servo mixer if exists
cliPrintHashLine("servo mix");
cliPrintHashLine("servo mixer");
cliDumpPrintLinef(dumpMask, customServoMixers_CopyArray[0].rate == 0, "smix reset\r\n");
printServoMix(dumpMask, customServoMixers_CopyArray, customServoMixers(0));

Expand All @@ -3675,16 +3675,6 @@ static void printConfig(const char *cmdline, bool doDiff)
cliPrintHashLine("safehome");
printSafeHomes(dumpMask, safeHomeConfig_CopyArray, safeHomeConfig(0));
#endif
#ifdef USE_PROGRAMMING_FRAMEWORK
cliPrintHashLine("logic");
printLogic(dumpMask, logicConditions_CopyArray, logicConditions(0));

cliPrintHashLine("gvar");
printGvar(dumpMask, globalVariableConfigs_CopyArray, globalVariableConfigs(0));

cliPrintHashLine("pid");
printPid(dumpMask, programmingPids_CopyArray, programmingPids(0));
#endif

cliPrintHashLine("feature");
printFeature(dumpMask, &featureConfig_Copy, featureConfig());
Expand Down Expand Up @@ -3740,6 +3730,17 @@ static void printConfig(const char *cmdline, bool doDiff)
printOsdLayout(dumpMask, &osdLayoutsConfig_Copy, osdLayoutsConfig(), -1, -1);
#endif

#ifdef USE_PROGRAMMING_FRAMEWORK
cliPrintHashLine("logic");
printLogic(dumpMask, logicConditions_CopyArray, logicConditions(0));

cliPrintHashLine("global vars");
printGvar(dumpMask, globalVariableConfigs_CopyArray, globalVariableConfigs(0));

cliPrintHashLine("programmable pid controllers");
printPid(dumpMask, programmingPids_CopyArray, programmingPids(0));
#endif

cliPrintHashLine("master");
dumpAllValues(MASTER_VALUE, dumpMask);

Expand All @@ -3760,7 +3761,6 @@ static void printConfig(const char *cmdline, bool doDiff)
cliPrintLinef("profile %d", currentProfileIndexSave + 1);
cliPrintLinef("battery_profile %d", currentBatteryProfileIndexSave + 1);

cliPrintHashLine("save configuration\r\nsave");
#ifdef USE_CLI_BATCH
batchModeEnabled = false;
#endif
Expand All @@ -3779,6 +3779,10 @@ static void printConfig(const char *cmdline, bool doDiff)
cliDumpBatteryProfile(getConfigBatteryProfile(), dumpMask);
}

if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) {
cliPrintHashLine("save configuration\r\nsave");
}

#ifdef USE_CLI_BATCH
if (batchModeEnabled) {
cliPrintHashLine("end the command batch");
Expand Down
3 changes: 2 additions & 1 deletion src/main/programming/logic_condition.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "rx/rx.h"
#include "common/maths.h"
#include "fc/config.h"
#include "fc/cli.h"
#include "fc/fc_core.h"
#include "fc/rc_controls.h"
#include "fc/runtime_config.h"
Expand Down Expand Up @@ -411,7 +412,7 @@ void logicConditionProcess(uint8_t i) {

const int activatorValue = logicConditionGetValue(logicConditions(i)->activatorId);

if (logicConditions(i)->enabled && activatorValue) {
if (logicConditions(i)->enabled && activatorValue && !cliMode) {

/*
* Process condition only when latch flag is not set
Expand Down