Skip to content
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

Jump to bottom

Stop showing all LCs for every LC set in dump #8448

Merged
merged 2 commits into from Oct 7, 2022
Merged

Stop showing all LCs for every LC set in dump #8448

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1745606
Stop showing all LCs for every LC set in dump
MrD-RC Oct 5, 2022
512225e
Reduced size of ints
MrD-RC Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 42 additions & 32 deletions src/main/fc/cli.c
View file
Open in desktop
Expand Up @@ -1903,26 +1903,39 @@ static void cliServoMix(char *cmdline)

#ifdef USE_PROGRAMMING_FRAMEWORK

static void printLogic(uint8_t dumpMask, const logicCondition_t *logicConditions, const logicCondition_t *defaultLogicConditions)
static void printLogic(uint8_t dumpMask, const logicCondition_t *logicConditions, const logicCondition_t *defaultLogicConditions, int16_t showLC)
{
const char *format = "logic %d %d %d %d %d %d %d %d %d";
for (uint32_t i = 0; i < MAX_LOGIC_CONDITIONS; i++) {
const logicCondition_t logic = logicConditions[i];
for (uint8_t i = 0; i < MAX_LOGIC_CONDITIONS; i++) {
if (showLC == -1 || showLC == i) {
const logicCondition_t logic = logicConditions[i];

bool equalsDefault = false;
if (defaultLogicConditions) {
logicCondition_t defaultValue = defaultLogicConditions[i];
equalsDefault =
logic.enabled == defaultValue.enabled &&
logic.activatorId == defaultValue.activatorId &&
logic.operation == defaultValue.operation &&
logic.operandA.type == defaultValue.operandA.type &&
logic.operandA.value == defaultValue.operandA.value &&
logic.operandB.type == defaultValue.operandB.type &&
logic.operandB.value == defaultValue.operandB.value &&
logic.flags == defaultValue.flags;

cliDefaultPrintLinef(dumpMask, equalsDefault, format,
bool equalsDefault = false;
if (defaultLogicConditions) {
logicCondition_t defaultValue = defaultLogicConditions[i];
equalsDefault =
logic.enabled == defaultValue.enabled &&
logic.activatorId == defaultValue.activatorId &&
logic.operation == defaultValue.operation &&
logic.operandA.type == defaultValue.operandA.type &&
logic.operandA.value == defaultValue.operandA.value &&
logic.operandB.type == defaultValue.operandB.type &&
logic.operandB.value == defaultValue.operandB.value &&
logic.flags == defaultValue.flags;

cliDefaultPrintLinef(dumpMask, equalsDefault, format,
i,
logic.enabled,
logic.activatorId,
logic.operation,
logic.operandA.type,
logic.operandA.value,
logic.operandB.type,
logic.operandB.value,
logic.flags
);
}
cliDumpPrintLinef(dumpMask, equalsDefault, format,
i,
logic.enabled,
logic.activatorId,
Expand All @@ -1934,27 +1947,20 @@ static void printLogic(uint8_t dumpMask, const logicCondition_t *logicConditions
logic.flags
);
}
cliDumpPrintLinef(dumpMask, equalsDefault, format,
i,
logic.enabled,
logic.activatorId,
logic.operation,
logic.operandA.type,
logic.operandA.value,
logic.operandB.type,
logic.operandB.value,
logic.flags
);
}
}

static void cliLogic(char *cmdline) {
static void processCliLogic(char *cmdline, int16_t lcIndex) {
char * saveptr;
int args[9], check = 0;
uint8_t len = strlen(cmdline);

if (len == 0) {
printLogic(DUMP_MASTER, logicConditions(0), NULL);
if (!commandBatchActive) {
printLogic(DUMP_MASTER, logicConditions(0), NULL, -1);
} else if (lcIndex >= 0) {
printLogic(DUMP_MASTER, logicConditions(0), NULL, lcIndex);
}
} else if (sl_strncasecmp(cmdline, "reset", 5) == 0) {
pgResetCopy(logicConditionsMutable(0), PG_LOGIC_CONDITIONS);
} else {
Expand Down Expand Up @@ -2003,13 +2009,17 @@ static void cliLogic(char *cmdline) {
logicConditionsMutable(i)->operandB.value = args[OPERAND_B_VALUE];
logicConditionsMutable(i)->flags = args[FLAGS];

cliLogic("");
processCliLogic("", i);
} else {
cliShowParseError();
}
}
}

static void cliLogic(char *cmdline) {
processCliLogic(cmdline, -1);
}

static void printGvar(uint8_t dumpMask, const globalVariableConfig_t *gvars, const globalVariableConfig_t *defaultGvars)
{
const char *format = "gvar %d %d %d %d";
Expand Down Expand Up @@ -3708,7 +3718,7 @@ static void printConfig(const char *cmdline, bool doDiff)

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

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