diff options
Diffstat (limited to 'car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java')
| -rw-r--r-- | car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java | 228 |
1 files changed, 115 insertions, 113 deletions
diff --git a/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java b/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java index 12ff423d3e..5d19fca3d2 100644 --- a/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java +++ b/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java @@ -31,8 +31,8 @@ import java.lang.annotation.RetentionPolicy; */ @SystemApi public final class CarDiagnosticSensorIndices { - public static final class Obd2IntegerSensorIndex { - private Obd2IntegerSensorIndex() {} + public static final class IntegerSensorIndex { + private IntegerSensorIndex() {} public static final int FUEL_SYSTEM_STATUS = 0; public static final int MALFUNCTION_INDICATOR_LIGHT_ON = 1; @@ -70,8 +70,8 @@ public final class CarDiagnosticSensorIndices { public static final int VENDOR_START = LAST_SYSTEM + 1; } - public static final class Obd2FloatSensorIndex { - private Obd2FloatSensorIndex() {} + public static final class FloatSensorIndex { + private FloatSensorIndex() {} public static final int CALCULATED_ENGINE_LOAD = 0; public static final int ENGINE_COOLANT_TEMPERATURE = 1; @@ -148,121 +148,123 @@ public final class CarDiagnosticSensorIndices { public static final int VENDOR_START = LAST_SYSTEM + 1; } + /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef({ - Obd2IntegerSensorIndex.FUEL_SYSTEM_STATUS, - Obd2IntegerSensorIndex.MALFUNCTION_INDICATOR_LIGHT_ON, - Obd2IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED, - Obd2IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS, - Obd2IntegerSensorIndex.INTAKE_AIR_TEMPERATURE, - Obd2IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS, - Obd2IntegerSensorIndex.NUM_OXYGEN_SENSORS_PRESENT, - Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, - Obd2IntegerSensorIndex.DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON, - Obd2IntegerSensorIndex.WARMUPS_SINCE_CODES_CLEARED, - Obd2IntegerSensorIndex.DISTANCE_TRAVELED_SINCE_CODES_CLEARED, - Obd2IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE, - Obd2IntegerSensorIndex.CONTROL_MODULE_VOLTAGE, - Obd2IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE, - Obd2IntegerSensorIndex.TIME_WITH_MALFUNCTION_LIGHT_ON, - Obd2IntegerSensorIndex.TIME_SINCE_TROUBLE_CODES_CLEARED, - Obd2IntegerSensorIndex.MAX_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2IntegerSensorIndex.MAX_OXYGEN_SENSOR_VOLTAGE, - Obd2IntegerSensorIndex.MAX_OXYGEN_SENSOR_CURRENT, - Obd2IntegerSensorIndex.MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE, - Obd2IntegerSensorIndex.MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR, - Obd2IntegerSensorIndex.FUEL_TYPE, - Obd2IntegerSensorIndex.FUEL_RAIL_ABSOLUTE_PRESSURE, - Obd2IntegerSensorIndex.ENGINE_OIL_TEMPERATURE, - Obd2IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE, - Obd2IntegerSensorIndex.ENGINE_ACTUAL_PERCENT_TORQUE, - Obd2IntegerSensorIndex.ENGINE_REFERENCE_PERCENT_TORQUE, - Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_IDLE, - Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT1, - Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT2, - Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT3, - Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT4, - Obd2IntegerSensorIndex.LAST_SYSTEM, - Obd2IntegerSensorIndex.VENDOR_START, + IntegerSensorIndex.FUEL_SYSTEM_STATUS, + IntegerSensorIndex.MALFUNCTION_INDICATOR_LIGHT_ON, + IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED, + IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS, + IntegerSensorIndex.INTAKE_AIR_TEMPERATURE, + IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS, + IntegerSensorIndex.NUM_OXYGEN_SENSORS_PRESENT, + IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, + IntegerSensorIndex.DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON, + IntegerSensorIndex.WARMUPS_SINCE_CODES_CLEARED, + IntegerSensorIndex.DISTANCE_TRAVELED_SINCE_CODES_CLEARED, + IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE, + IntegerSensorIndex.CONTROL_MODULE_VOLTAGE, + IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE, + IntegerSensorIndex.TIME_WITH_MALFUNCTION_LIGHT_ON, + IntegerSensorIndex.TIME_SINCE_TROUBLE_CODES_CLEARED, + IntegerSensorIndex.MAX_FUEL_AIR_EQUIVALENCE_RATIO, + IntegerSensorIndex.MAX_OXYGEN_SENSOR_VOLTAGE, + IntegerSensorIndex.MAX_OXYGEN_SENSOR_CURRENT, + IntegerSensorIndex.MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE, + IntegerSensorIndex.MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR, + IntegerSensorIndex.FUEL_TYPE, + IntegerSensorIndex.FUEL_RAIL_ABSOLUTE_PRESSURE, + IntegerSensorIndex.ENGINE_OIL_TEMPERATURE, + IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE, + IntegerSensorIndex.ENGINE_ACTUAL_PERCENT_TORQUE, + IntegerSensorIndex.ENGINE_REFERENCE_PERCENT_TORQUE, + IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_IDLE, + IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT1, + IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT2, + IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT3, + IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT4, + IntegerSensorIndex.LAST_SYSTEM, + IntegerSensorIndex.VENDOR_START, }) - public @interface IntegerSensorIndex {} + public @interface DiagnosticIntegerSensorIndex {} + /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef({ - Obd2FloatSensorIndex.CALCULATED_ENGINE_LOAD, - Obd2FloatSensorIndex.ENGINE_COOLANT_TEMPERATURE, - Obd2FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK1, - Obd2FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK1, - Obd2FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK2, - Obd2FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK2, - Obd2FloatSensorIndex.FUEL_PRESSURE, - Obd2FloatSensorIndex.INTAKE_MANIFOLD_ABSOLUTE_PRESSURE, - Obd2FloatSensorIndex.ENGINE_RPM, - Obd2FloatSensorIndex.VEHICLE_SPEED, - Obd2FloatSensorIndex.TIMING_ADVANCE, - Obd2FloatSensorIndex.MAF_AIR_FLOW_RATE, - Obd2FloatSensorIndex.THROTTLE_POSITION, - Obd2FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR1_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR1_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.OXYGEN_SENSOR2_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR2_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR2_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.OXYGEN_SENSOR3_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR3_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR3_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.OXYGEN_SENSOR4_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR4_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR4_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.OXYGEN_SENSOR5_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR5_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR5_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.OXYGEN_SENSOR6_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR6_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR6_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.OXYGEN_SENSOR7_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR7_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR7_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.OXYGEN_SENSOR8_VOLTAGE, - Obd2FloatSensorIndex.OXYGEN_SENSOR8_SHORT_TERM_FUEL_TRIM, - Obd2FloatSensorIndex.OXYGEN_SENSOR8_FUEL_AIR_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.FUEL_RAIL_PRESSURE, - Obd2FloatSensorIndex.FUEL_RAIL_GAUGE_PRESSURE, - Obd2FloatSensorIndex.COMMANDED_EXHAUST_GAS_RECIRCULATION, - Obd2FloatSensorIndex.EXHAUST_GAS_RECIRCULATION_ERROR, - Obd2FloatSensorIndex.COMMANDED_EVAPORATIVE_PURGE, - Obd2FloatSensorIndex.FUEL_TANK_LEVEL_INPUT, - Obd2FloatSensorIndex.EVAPORATION_SYSTEM_VAPOR_PRESSURE, - Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR1, - Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR1, - Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR2, - Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR2, - Obd2FloatSensorIndex.ABSOLUTE_LOAD_VALUE, - Obd2FloatSensorIndex.FUEL_AIR_COMMANDED_EQUIVALENCE_RATIO, - Obd2FloatSensorIndex.RELATIVE_THROTTLE_POSITION, - Obd2FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_B, - Obd2FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_C, - Obd2FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_D, - Obd2FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_E, - Obd2FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_F, - Obd2FloatSensorIndex.COMMANDED_THROTTLE_ACTUATOR, - Obd2FloatSensorIndex.ETHANOL_FUEL_PERCENTAGE, - Obd2FloatSensorIndex.ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE, - Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1, - Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2, - Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3, - Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4, - Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1, - Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2, - Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3, - Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4, - Obd2FloatSensorIndex.RELATIVE_ACCELERATOR_PEDAL_POSITION, - Obd2FloatSensorIndex.HYBRID_BATTERY_PACK_REMAINING_LIFE, - Obd2FloatSensorIndex.FUEL_INJECTION_TIMING, - Obd2FloatSensorIndex.ENGINE_FUEL_RATE, - Obd2FloatSensorIndex.LAST_SYSTEM, - Obd2FloatSensorIndex.VENDOR_START, + FloatSensorIndex.CALCULATED_ENGINE_LOAD, + FloatSensorIndex.ENGINE_COOLANT_TEMPERATURE, + FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK1, + FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK1, + FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK2, + FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK2, + FloatSensorIndex.FUEL_PRESSURE, + FloatSensorIndex.INTAKE_MANIFOLD_ABSOLUTE_PRESSURE, + FloatSensorIndex.ENGINE_RPM, + FloatSensorIndex.VEHICLE_SPEED, + FloatSensorIndex.TIMING_ADVANCE, + FloatSensorIndex.MAF_AIR_FLOW_RATE, + FloatSensorIndex.THROTTLE_POSITION, + FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR1_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR1_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.OXYGEN_SENSOR2_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR2_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR2_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.OXYGEN_SENSOR3_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR3_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR3_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.OXYGEN_SENSOR4_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR4_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR4_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.OXYGEN_SENSOR5_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR5_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR5_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.OXYGEN_SENSOR6_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR6_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR6_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.OXYGEN_SENSOR7_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR7_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR7_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.OXYGEN_SENSOR8_VOLTAGE, + FloatSensorIndex.OXYGEN_SENSOR8_SHORT_TERM_FUEL_TRIM, + FloatSensorIndex.OXYGEN_SENSOR8_FUEL_AIR_EQUIVALENCE_RATIO, + FloatSensorIndex.FUEL_RAIL_PRESSURE, + FloatSensorIndex.FUEL_RAIL_GAUGE_PRESSURE, + FloatSensorIndex.COMMANDED_EXHAUST_GAS_RECIRCULATION, + FloatSensorIndex.EXHAUST_GAS_RECIRCULATION_ERROR, + FloatSensorIndex.COMMANDED_EVAPORATIVE_PURGE, + FloatSensorIndex.FUEL_TANK_LEVEL_INPUT, + FloatSensorIndex.EVAPORATION_SYSTEM_VAPOR_PRESSURE, + FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR1, + FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR1, + FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR2, + FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR2, + FloatSensorIndex.ABSOLUTE_LOAD_VALUE, + FloatSensorIndex.FUEL_AIR_COMMANDED_EQUIVALENCE_RATIO, + FloatSensorIndex.RELATIVE_THROTTLE_POSITION, + FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_B, + FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_C, + FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_D, + FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_E, + FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_F, + FloatSensorIndex.COMMANDED_THROTTLE_ACTUATOR, + FloatSensorIndex.ETHANOL_FUEL_PERCENTAGE, + FloatSensorIndex.ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE, + FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1, + FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2, + FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3, + FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4, + FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1, + FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2, + FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3, + FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4, + FloatSensorIndex.RELATIVE_ACCELERATOR_PEDAL_POSITION, + FloatSensorIndex.HYBRID_BATTERY_PACK_REMAINING_LIFE, + FloatSensorIndex.FUEL_INJECTION_TIMING, + FloatSensorIndex.ENGINE_FUEL_RATE, + FloatSensorIndex.LAST_SYSTEM, + FloatSensorIndex.VENDOR_START, }) - public @interface FloatSensorIndex {} + public @interface DiagnosticFloatSensorIndex {} } |