From b6d5f927911bfbc501f888379789bfe400747138 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 27 Apr 2017 13:05:48 -0400 Subject: [PATCH] COMBINED_WARNING_LIGHT --- firmware/controllers/system_fsio.h | 7 +++---- firmware/controllers/system_fsio.txt | 3 +-- .../src/com/fathzer/soft/javaluator/AbstractEvaluator.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/system_fsio.h b/firmware/controllers/system_fsio.h index 08898c0a7c..2d5c6cb4ec 100644 --- a/firmware/controllers/system_fsio.h +++ b/firmware/controllers/system_fsio.h @@ -1,6 +1,6 @@ // this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically // 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 @@ -24,6 +24,5 @@ // Human-readable: ac_on_switch #define AC_RELAY_LOGIC "ac_on_switch" -// Human-readable: rpm > fsio_setting(2) -#define SIMPLE_WARNING_LIGHT "rpm 2 fsio_setting >" -//COMBINED_WARNING_LIGHT=rpm > fsio_setting(2) | coolant fsio_setting(3) | vbatt < fsio_setting(4) +// Human-readable: (rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | (vbatt < fsio_setting(4))) +#define COMBINED_WARNING_LIGHT "rpm 2 fsio_setting > coolant 3 fsio_setting > vbatt 4 fsio_setting < | |" diff --git a/firmware/controllers/system_fsio.txt b/firmware/controllers/system_fsio.txt index abd326149a..adf8ba0984 100644 --- a/firmware/controllers/system_fsio.txt +++ b/firmware/controllers/system_fsio.txt @@ -16,6 +16,5 @@ ALTERNATOR_LOGIC=vbatt < 14.5 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))) diff --git a/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java b/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java index ac478ec777..5002cbede8 100644 --- a/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java +++ b/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java @@ -385,7 +385,7 @@ public abstract class AbstractEvaluator { output(values, sc, evaluationContext); } if (values.size() != 1) { - throw new IllegalArgumentException("Only one element expected "+ values); + throw new IllegalArgumentException(expression + ": Only one element expected "+ values); } Collections.reverse(stackRPN);