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-12-10 09:03:10 -06:00
parent 464313a88c
commit c32b3832b6
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,9 @@ LENameOrdinalPair * LE_FIRST = NULL;
* them in the magic list of operator name/ordinal pairs
*/
static LENameOrdinalPair leAnd(LE_OPERATOR_AND, "and");
static LENameOrdinalPair leAnd2(LE_OPERATOR_AND, "&");
static LENameOrdinalPair leOr(LE_OPERATOR_OR, "or");
static LENameOrdinalPair leOr2(LE_OPERATOR_OR, "|");
static LENameOrdinalPair leNot(LE_OPERATOR_NOT, "not");
static LENameOrdinalPair leAdd(LE_OPERATOR_ADDITION, "+");

2
unit_tests/main.cpp
View File

@ -138,7 +138,7 @@ int main(void) {
testFLStack();
// resizeMap();
printf("Success 20131126\r\n");
printf("Success 20131210\r\n");
return EXIT_SUCCESS;
}

11
unit_tests/test_logic_expression.cpp
View File

@ -31,8 +31,12 @@ float getLEValue(Engine *engine, calc_stack_t *s, le_action_e action) {
return mockRpm;
case LE_METHOD_TIME_SINCE_BOOT:
return mockTimeSinceBoot;
case LE_METHOD_FAN_ON_SETTING:
return 0;
case LE_METHOD_FAN_OFF_SETTING:
return 0;
default:
firmwareError("No mock value for %d", action);
firmwareError("No mock value for %d", action);
return NAN;
}
}
@ -172,6 +176,11 @@ void testLogicExpressions(void) {
testExpression("fan NOT coolant 90 > AND fan coolant 85 > AND OR", 1);
testExpression("0 1 &", 0);
testExpression("0 1 |", 1);
testExpression(FAN_CONTROL_LOGIC, 1);
mockRpm = 900;
testExpression(FUEL_PUMP_LOGIC, 1);