Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-17 05:15:23 +03:00
Code Issues Wiki Activity

Rethink of issue and solution

Browse source
This commit is contained in:
Darren Lines 2022-07-30 09:17:28 +01:00
parent 8c521adbda
commit d1fc69486f
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/fc/cli.c
View file

@ -3730,6 +3730,17 @@ static void printConfig(const char *cmdline, bool doDiff)
printOsdLayout(dumpMask, &osdLayoutsConfig_Copy, osdLayoutsConfig(), -1, -1); printOsdLayout(dumpMask, &osdLayoutsConfig_Copy, osdLayoutsConfig(), -1, -1);
#endif #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"); cliPrintHashLine("master");
dumpAllValues(MASTER_VALUE, dumpMask); dumpAllValues(MASTER_VALUE, dumpMask);
@ -3769,17 +3780,6 @@ static void printConfig(const char *cmdline, bool doDiff)
} }
if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) { if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) {
#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("save configuration\r\nsave"); cliPrintHashLine("save configuration\r\nsave");
} }

3
src/main/programming/logic_condition.c
View file

@ -35,6 +35,7 @@
#include "rx/rx.h" #include "rx/rx.h"
#include "common/maths.h" #include "common/maths.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/cli.h"
#include "fc/fc_core.h" #include "fc/fc_core.h"
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
@ -411,7 +412,7 @@ void logicConditionProcess(uint8_t i) {
const int activatorValue = logicConditionGetValue(logicConditions(i)->activatorId); 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 * Process condition only when latch flag is not set