diff --git a/java_console/models/src/main/java/com/rusefi/core/Sensor.java b/java_console/models/src/main/java/com/rusefi/core/Sensor.java index 21cfd6bbdc..cacb8d3c13 100644 --- a/java_console/models/src/main/java/com/rusefi/core/Sensor.java +++ b/java_console/models/src/main/java/com/rusefi/core/Sensor.java @@ -15,35 +15,34 @@ import static com.rusefi.config.generated.Fields.*; public enum Sensor { // RPM, vss - RPMValue(GAUGE_NAME_RPM, SensorCategory.SENSOR_INPUTS, FieldType.UINT16, TsOutputs.RPMVALUE, 1, 0, 8000, "RPM"), - vehicleSpeedKph("Vehicle Speed", SensorCategory.SENSOR_INPUTS, FieldType.UINT8, TsOutputs.VEHICLESPEEDKPH, 1.0, 0.0, 0.0, "kph"), + RPMValue(GAUGE_NAME_RPM, FieldType.UINT16, TsOutputs.RPMVALUE, 1, 0, 8000, "RPM"), + vehicleSpeedKph("Vehicle Speed", FieldType.UINT8, TsOutputs.VEHICLESPEEDKPH, 1.0, 0.0, 0.0, "kph"), // Temperatures - INT_TEMP(GAUGE_NAME_ECU_TEMPERATURE, SensorCategory.OPERATIONS, FieldType.INT8, TsOutputs.INTERNALMCUTEMPERATURE, 1, 0, 5, "C"), + INT_TEMP(GAUGE_NAME_ECU_TEMPERATURE, FieldType.INT8, TsOutputs.INTERNALMCUTEMPERATURE, 1, 0, 5, "C"), // throttle, pedal - TPS(GAUGE_NAME_TPS, SensorCategory.SENSOR_INPUTS, FieldType.INT16, TsOutputs.TPSVALUE, 1.0 / PACK_MULT_PERCENT, 0, 100, "%"), // throttle position sensor + TPS(GAUGE_NAME_TPS, FieldType.INT16, TsOutputs.TPSVALUE, 1.0 / PACK_MULT_PERCENT, 0, 100, "%"), // throttle position sensor // air flow/mass measurement - MAF(GAUGE_NAME_MAF, SensorCategory.SENSOR_INPUTS, FieldType.UINT16, TsOutputs.MAFMEASURED, 1.0 / PACK_MULT_MASS_FLOW, 0, 5, "Volts"), - MAP(GAUGE_NAME_MAP, SensorCategory.SENSOR_INPUTS, FieldType.UINT16, TsOutputs.MAPVALUE, 1.0 / PACK_MULT_PRESSURE, 20, 300, "kPa"), + MAF(GAUGE_NAME_MAF, FieldType.UINT16, TsOutputs.MAFMEASURED, 1.0 / PACK_MULT_MASS_FLOW, 0, 5, "Volts"), + MAP(GAUGE_NAME_MAP, FieldType.UINT16, TsOutputs.MAPVALUE, 1.0 / PACK_MULT_PRESSURE, 20, 300, "kPa"), - VBATT(GAUGE_NAME_VBAT, SensorCategory.SENSOR_INPUTS, FieldType.UINT16, TsOutputs.VBATT, 1.0 / PACK_MULT_VOLTAGE, 4, 18, "Volts"), + VBATT(GAUGE_NAME_VBAT, FieldType.UINT16, TsOutputs.VBATT, 1.0 / PACK_MULT_VOLTAGE, 4, 18, "Volts"), // Mode, firmware, protocol, run time - TIME_SECONDS(GAUGE_NAME_TIME, SensorCategory.OPERATIONS, FieldType.INT, TsOutputs.SECONDS, 1, 0, 5, ""), + TIME_SECONDS(GAUGE_NAME_TIME, FieldType.INT, TsOutputs.SECONDS, 1, 0, 5, ""), // Errors - totalTriggerErrorCounter(GAUGE_NAME_TRG_ERR, SensorCategory.STATUS, FieldType.INT, TsOutputs.TOTALTRIGGERERRORCOUNTER, 0, 5), + totalTriggerErrorCounter(GAUGE_NAME_TRG_ERR, FieldType.INT, TsOutputs.TOTALTRIGGERERRORCOUNTER, 0, 5), // Debug - debugIntField1(GAUGE_NAME_DEBUG_I1, SensorCategory.DEBUG, FieldType.INT, TsOutputs.DEBUGINTFIELD1, 0, 5), + debugIntField1(GAUGE_NAME_DEBUG_I1, FieldType.INT, TsOutputs.DEBUGINTFIELD1, 0, 5), // Raw sensors - rawClt("raw CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT16, TsOutputs.RAWCLT, 1.0 / PACK_MULT_VOLTAGE, 0, 5, "volts"), - rawIat("raw IAT", SensorCategory.SENSOR_INPUTS, FieldType.INT16, TsOutputs.RAWIAT, 1.0 / PACK_MULT_VOLTAGE, 0, 5, "volts"), + rawClt("raw CLT", FieldType.INT16, TsOutputs.RAWCLT, 1.0 / PACK_MULT_VOLTAGE, 0, 5, "volts"), + rawIat("raw IAT", FieldType.INT16, TsOutputs.RAWIAT, 1.0 / PACK_MULT_VOLTAGE, 0, 5, "volts"), ; private final String name; - private final SensorCategory category; private final String units; private final double minValue; private final double maxValue; @@ -61,62 +60,18 @@ public enum Sensor { } } - Sensor(String name, SensorCategory category, FieldType type, Field field, double scale, double minValue, double maxValue, String units) { + Sensor(String name, FieldType type, Field field, double scale, double minValue, double maxValue, String units) { this.name = name == null ? name() : name; this.type = type; this.offset = field.getTotalOffset(); this.scale = scale; - this.category = category; this.units = units; this.minValue = minValue; this.maxValue = maxValue; } - Sensor(String name, SensorCategory category, FieldType type, Field field, double minValue, double maxValue) { - this(name, category, type, field, 1.0, minValue, maxValue, "n/a"); - } - - Sensor(String name, SensorCategory category, FieldType type, Field field) { - this(name, category, type, field, 0, 100); - } - - /** - * This constructor is used for virtual sensors which do not directly come from ECU - */ - Sensor(String name, SensorCategory category, String units, double maxValue) { - this(name, category, units, 0, maxValue); - } - - /** - * This constructor is used for virtual sensors which do not directly come from ECU - */ - Sensor(String name, SensorCategory category, String units, double minValue, double maxValue) { - this.name = name; - this.category = category; - this.units = units; - this.minValue = minValue; - this.maxValue = maxValue; - this.scale = 1.0; - type = null; - offset = -1; - } - - - - public static Collection getSensorsForCategory(String category) { - final Set sensors = new TreeSet<>(Comparator.comparing(o -> o.getName().toLowerCase())); - - for (final Sensor sensor : values()) { - if (sensor.category.getName().equals(category)) { - sensors.add(sensor); - } - } - - return sensors; - } - - public static double processAdvance(double advance) { - return advance > 360 ? advance - 720 : advance; + Sensor(String name, FieldType type, Field field, double minValue, double maxValue) { + this(name, type, field, 1.0, minValue, maxValue, "n/a"); } public static Sensor lookup(String gaugeName, Sensor defaultValue) { @@ -186,22 +141,10 @@ public enum Sensor { } } - public SensorCategory getCategory() { - return category; - } - public String getUnits() { return units; } - public double getMinValue() { - return minValue; - } - - public double getMaxValue() { - return maxValue; - } - public int getOffset() { return offset; } diff --git a/java_console/models/src/main/java/com/rusefi/core/SensorCategory.java b/java_console/models/src/main/java/com/rusefi/core/SensorCategory.java deleted file mode 100644 index 0a211391e3..0000000000 --- a/java_console/models/src/main/java/com/rusefi/core/SensorCategory.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.rusefi.core; - -public enum SensorCategory { - OPERATIONS("Operations"), - FUEL("Fuel-related"), - SNIFFING("Sniffing"), - SENSOR_INPUTS("Sensor inputs"), - DEBUG("Debug"), - STATUS("Status"), - OTHERS("Others"); - - private final String name; - - SensorCategory(String name) { - this.name = name; - } - - public String getName() { - return name; - } -} diff --git a/java_tools/.idea/gradle.xml b/java_tools/.idea/gradle.xml index c961b13b04..84a62267fd 100644 --- a/java_tools/.idea/gradle.xml +++ b/java_tools/.idea/gradle.xml @@ -4,9 +4,11 @@