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

COMBINED_WARNING_LIGHT

This commit is contained in:
rusefi 2017-04-27 13:05:48 -04:00
parent 0999c74da3
commit b6d5f92791
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/controllers/system_fsio.h
View File

@ -1,6 +1,6 @@
// this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically // this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically
// from controllers/system_fsio.txt // from controllers/system_fsio.txt
// on 2017-04-25_08_26_37 // on 2017-04-25_15_33_33
// //
// //
// in this file we define system FSIO expressions // in this file we define system FSIO expressions
@ -24,6 +24,5 @@
// Human-readable: ac_on_switch // Human-readable: ac_on_switch
#define AC_RELAY_LOGIC "ac_on_switch" #define AC_RELAY_LOGIC "ac_on_switch"
// Human-readable: rpm > fsio_setting(2) // Human-readable: (rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | (vbatt < fsio_setting(4)))
#define SIMPLE_WARNING_LIGHT "rpm 2 fsio_setting >" #define COMBINED_WARNING_LIGHT "rpm 2 fsio_setting > coolant 3 fsio_setting > vbatt 4 fsio_setting < | |"
//COMBINED_WARNING_LIGHT=rpm > fsio_setting(2) | coolant fsio_setting(3) | vbatt < fsio_setting(4)

3
firmware/controllers/system_fsio.txt
View File

@ -16,6 +16,5 @@ ALTERNATOR_LOGIC=vbatt < 14.5
AC_RELAY_LOGIC=ac_on_switch AC_RELAY_LOGIC=ac_on_switch
SIMPLE_WARNING_LIGHT=rpm > fsio_setting(2)
#COMBINED_WARNING_LIGHT=rpm > fsio_setting(2) | coolant fsio_setting(3) | vbatt < fsio_setting(4) COMBINED_WARNING_LIGHT=(rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | (vbatt < fsio_setting(4)))

2
java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java
View File

@ -385,7 +385,7 @@ public abstract class AbstractEvaluator<T> {
output(values, sc, evaluationContext); output(values, sc, evaluationContext);
} }
if (values.size() != 1) { if (values.size() != 1) {
throw new IllegalArgumentException("Only one element expected "+ values); throw new IllegalArgumentException(expression + ": Only one element expected "+ values);
} }
Collections.reverse(stackRPN); Collections.reverse(stackRPN);