rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-12-04 20:03:12 -06:00
parent ce4920c421
commit 623a6c16e2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ static LENameOrdinalPair leLessOrEquals(LE_OPERATOR_LESS_OR_EQUAL, "<=");
static LENameOrdinalPair leMax(LE_METHOD_MAX, "max"); static LENameOrdinalPair leMax(LE_METHOD_MAX, "max");
static LENameOrdinalPair leMin(LE_METHOD_MIN, "min"); static LENameOrdinalPair leMin(LE_METHOD_MIN, "min");
static LENameOrdinalPair leIf(LE_METHOD_IF, "if");
#define LE_EVAL_POOL_SIZE 32 #define LE_EVAL_POOL_SIZE 32
@ -205,6 +206,14 @@ void LECalculator::doJob(Engine *engine, LEElement *element) {
stack.push(v1 >= v2); stack.push(v1 >= v2);
} }
break; break;
case LE_METHOD_IF: {
// elements on stack are in reverse order
float vFalse = pop(LE_METHOD_IF);
float vTrue = pop(LE_METHOD_IF);
float vCond = pop(LE_METHOD_IF);
stack.push(vCond != 0 ? vTrue : vFalse);
}
break;
case LE_METHOD_MAX: { case LE_METHOD_MAX: {
float v2 = pop(LE_METHOD_MAX); float v2 = pop(LE_METHOD_MAX);
float v1 = pop(LE_METHOD_MAX); float v1 = pop(LE_METHOD_MAX);

1
firmware/controllers/core/logic_expression.h
View File

@ -29,6 +29,7 @@ typedef enum {
LE_OPERATOR_DIVISION = 12, LE_OPERATOR_DIVISION = 12,
LE_METHOD_MAX = 13, LE_METHOD_MAX = 13,
LE_METHOD_MIN = 14, LE_METHOD_MIN = 14,
LE_METHOD_IF = 15,
LE_METHOD_RPM = 100, LE_METHOD_RPM = 100,
LE_METHOD_COOLANT = 101, LE_METHOD_COOLANT = 101,

3
unit_tests/test_logic_expression.cpp
View File

@ -167,10 +167,9 @@ void testLogicExpressions(void) {
testExpression("coolant 90 >", 1); testExpression("coolant 90 >", 1);
testExpression("fan not coolant 90 > and", 1); testExpression("fan not coolant 90 > and", 1);
testExpression("100 200 1 if", 200);
testExpression("10 99 max", 99); testExpression("10 99 max", 99);
testExpression("fan NOT coolant 90 > AND fan coolant 85 > AND OR", 1); testExpression("fan NOT coolant 90 > AND fan coolant 85 > AND OR", 1);
mockRpm = 900; mockRpm = 900;