diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index ae8024e039..ba998f42f1 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -25,8 +25,8 @@ public enum Sensor { MAFR("MAFR", SensorCategory.SENSOR_INPUTS, "kg/hr", 4), TPS("throttle", SensorCategory.SENSOR_INPUTS, "%", 100), PPS("pedal", SensorCategory.SENSOR_INPUTS, "%", 100), - KS("Knock", SensorCategory.SENSOR_INPUTS, "count", 30), - KV("Knock level", SensorCategory.SENSOR_INPUTS, "v", 6), + knockCount("Knock", SensorCategory.SENSOR_INPUTS, "count", 30), + KnockValue("Knock level", SensorCategory.SENSOR_INPUTS, "v", 6), ENGINE_LOAD("Engine Load", SensorCategory.SENSOR_INPUTS, "x", 300), diff --git a/java_console/models/src/com/rusefi/core/SensorCentral.java b/java_console/models/src/com/rusefi/core/SensorCentral.java index 97b7fd075b..b9a2c6ea68 100644 --- a/java_console/models/src/com/rusefi/core/SensorCentral.java +++ b/java_console/models/src/com/rusefi/core/SensorCentral.java @@ -87,6 +87,11 @@ public class SensorCentral { addDoubleSensor("clt", Sensor.CLT, es); addDoubleSensor("tp", Sensor.TPS, es); addDoubleSensor("pps", Sensor.TPS, es); + addDoubleSensor("error", Sensor.lastErrorCode, es); + addDoubleSensor("warn", Sensor.warningCounter, es); + addDoubleSensor("knck_c", Sensor.knockCount, es); + addDoubleSensor("knck_v", Sensor.KnockValue, es); + addDoubleSensor("target", Sensor.TARGET_AFR, es); addDoubleSensor(Sensor.VSS, es); addDoubleSensor(Sensor.ENGINE_LOAD, es); @@ -102,8 +107,8 @@ public class SensorCentral { addDoubleSensor(Sensor.ADVANCE1, es); addDoubleSensor(Sensor.ADVANCE2, es); addDoubleSensor(Sensor.ADVANCE3, es); - addDoubleSensor(Sensor.KS, es); - addDoubleSensor(Sensor.KV, es); + addDoubleSensor(Sensor.knockCount, es); + addDoubleSensor(Sensor.KnockValue, es); addDoubleSensor("tch", Sensor.T_CHARGE, es); addDoubleSensor(Sensor.AFR, es); diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 6ecd3256bf..b8ef74ffcd 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -39,7 +39,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20160719; + public static final int CONSOLE_VERSION = 20160724; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port";