rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-11-18 16:03:01 -06:00
parent 2e4c6c6f76
commit 932ad2b7df
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/controllers/core/logic_expression.cpp
View File

@ -35,6 +35,10 @@ static LENameOrdinalPair leLessOrEquals(LE_OPERATOR_LESS_OR_EQUAL, "<=");
#define LE_EVAL_POOL_SIZE 32
#if EFI_PROD_CODE || EFI_SIMULATOR
static Logging logger;
#endif
static LECalculator evalCalc;
static LEElement evalPoolElements[LE_EVAL_POOL_SIZE];
static LEElementPool evalPool(evalPoolElements, LE_EVAL_POOL_SIZE);
@ -288,14 +292,20 @@ LEElement *LEElementPool::parseExpression(const char * line) {
#if (EFI_PROD_CODE || EFI_SIMULATOR)
static void eval(char *line, Engine *engine) {
scheduleMsg(&logger, "Parsing [%s]", line);
evalPool.reset();
evalPool.parseExpression(line);
LEElement * e = evalPool.parseExpression(line);
if (e == NULL) {
scheduleMsg(&logger, "parsing failed");
} else {
float result = evalCalc.getValue2(e, engine);
scheduleMsg(&logger, "Eval result: %f", result);
}
}
void initEval(Engine *engine) {
addConsoleActionSP("eval", (VoidCharPtrVoidPtr)eval, engine);
initLogging(&logger, "le");
addConsoleActionSP("eval", (VoidCharPtrVoidPtr) eval, engine);
}
#endif

2
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -41,7 +41,7 @@ bool printGapRatio = false;
#endif /* ! EFI_PROD_CODE */
#if (EFI_PROD_CODE || EFI_SIMULATOR)
Logging logger;
static Logging logger;
#endif
/**