diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 33128d81be..842dce4a6f 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Sun May 22 12:33:02 EDT 2016 +// Mon May 23 08:56:04 EDT 2016 #ifndef VCS_VERSION -#define VCS_VERSION "9923" +#define VCS_VERSION "9928" #endif diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index c079542356..82c2bd5ad4 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -36,6 +36,11 @@ public enum Sensor { CLT_F("Coolant F", SensorCategory.SENSOR_INPUTS, "temperature, F", -40, 500), IAT_F("Intake Air F", SensorCategory.SENSOR_INPUTS, "temperature, F", -40, 350), + ADC0("adc0", SensorCategory.SENSOR_INPUTS, "%", 100), + ADC1("adc1", SensorCategory.SENSOR_INPUTS, "%", 100), + ADC2("adc2", SensorCategory.SENSOR_INPUTS, "%", 100), + ADC3("adc3", SensorCategory.SENSOR_INPUTS, "%", 100), + TRG_0_DUTY("trg0 duty", SensorCategory.SENSOR_INPUTS, "%", 100), TRG_1_DUTY("trg1 duty", SensorCategory.SENSOR_INPUTS, "%", 100), diff --git a/java_console/models/src/com/rusefi/core/SensorCentral.java b/java_console/models/src/com/rusefi/core/SensorCentral.java index c75afe423d..97b7fd075b 100644 --- a/java_console/models/src/com/rusefi/core/SensorCentral.java +++ b/java_console/models/src/com/rusefi/core/SensorCentral.java @@ -126,6 +126,11 @@ public class SensorCentral { addDoubleSensor(Sensor.TRG_0_DUTY, es); addDoubleSensor(Sensor.TRG_1_DUTY, es); + addDoubleSensor(Sensor.ADC0, es); + addDoubleSensor(Sensor.ADC1, es); + addDoubleSensor(Sensor.ADC2, es); + addDoubleSensor(Sensor.ADC3, es); + addDoubleSensor("idl", Sensor.IDLE_SWITCH, es); addDoubleSensor("chart", Sensor.CHART_STATUS, true, es); diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 3caa8847ca..2eb84a0e9b 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -36,7 +36,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20160507; + public static final int CONSOLE_VERSION = 20160523; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port";