Merge "CarService changes necessary to support the diagnostic enums rename on the Vehicle HAL side" into oc-mr1-dev

3 files changed, 133 insertions, 137 deletions

diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index 347c4b1782..89718ec42a 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -509,13 +509,7 @@ package android.car.hardware {
     ctor public CarDiagnosticSensorIndices();
   }
 
-  public static abstract class CarDiagnosticSensorIndices.FloatSensorIndex implements java.lang.annotation.Annotation {
-  }
-
-  public static abstract class CarDiagnosticSensorIndices.IntegerSensorIndex implements java.lang.annotation.Annotation {
-  }
-
-  public static final class CarDiagnosticSensorIndices.Obd2FloatSensorIndex {
+  public static final class CarDiagnosticSensorIndices.FloatSensorIndex {
     field public static final int ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE = 58; // 0x3a
     field public static final int ABSOLUTE_LOAD_VALUE = 48; // 0x30
     field public static final int ABSOLUTE_THROTTLE_POSITION_B = 51; // 0x33
@@ -591,7 +585,7 @@ package android.car.hardware {
     field public static final int VENDOR_START = 71; // 0x47
   }
 
-  public static final class CarDiagnosticSensorIndices.Obd2IntegerSensorIndex {
+  public static final class CarDiagnosticSensorIndices.IntegerSensorIndex {
     field public static final int ABSOLUTE_BAROMETRIC_PRESSURE = 11; // 0xb
     field public static final int AMBIENT_AIR_TEMPERATURE = 13; // 0xd
     field public static final int COMMANDED_SECONDARY_AIR_STATUS = 5; // 0x5
diff --git a/car-lib/src/android/car/hardware/CarDiagnosticEvent.java b/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
index 56df55d0b4..dfab33d6e9 100644
--- a/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
+++ b/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
@@ -253,13 +253,13 @@ public class CarDiagnosticEvent implements Parcelable {
         SparseArray<Float> newFloatValues = floatValues.clone();
         for (int i = 0; i < intValues.size(); ++i) {
             int key = intValues.keyAt(i);
-            if (key >= CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.LAST_SYSTEM) {
+            if (key >= CarDiagnosticSensorIndices.IntegerSensorIndex.LAST_SYSTEM) {
                 newIntValues.delete(key);
             }
         }
         for (int i = 0; i < floatValues.size(); ++i) {
             int key = floatValues.keyAt(i);
-            if (key >= CarDiagnosticSensorIndices.Obd2FloatSensorIndex.LAST_SYSTEM) {
+            if (key >= CarDiagnosticSensorIndices.FloatSensorIndex.LAST_SYSTEM) {
                 newFloatValues.delete(key);
             }
         }
@@ -398,7 +398,7 @@ public class CarDiagnosticEvent implements Parcelable {
      * Returns defaultValue otherwise.
      */
     public int getSystemIntegerSensor(
-            @CarDiagnosticSensorIndices.IntegerSensorIndex int sensor, int defaultValue) {
+            @CarDiagnosticSensorIndices.DiagnosticIntegerSensorIndex int sensor, int defaultValue) {
         return intValues.get(sensor, defaultValue);
     }
 
@@ -407,7 +407,7 @@ public class CarDiagnosticEvent implements Parcelable {
      * Returns defaultValue otherwise.
      */
     public float getSystemFloatSensor(
-            @CarDiagnosticSensorIndices.FloatSensorIndex int sensor, float defaultValue) {
+            @CarDiagnosticSensorIndices.DiagnosticFloatSensorIndex int sensor, float defaultValue) {
         return floatValues.get(sensor, defaultValue);
     }
 
@@ -432,7 +432,7 @@ public class CarDiagnosticEvent implements Parcelable {
      * Returns null otherwise.
      */
     public @Nullable Integer getSystemIntegerSensor(
-            @CarDiagnosticSensorIndices.IntegerSensorIndex int sensor) {
+            @CarDiagnosticSensorIndices.DiagnosticIntegerSensorIndex int sensor) {
         int index = intValues.indexOfKey(sensor);
         if (index < 0) return null;
         return intValues.valueAt(index);
@@ -443,7 +443,7 @@ public class CarDiagnosticEvent implements Parcelable {
      * Returns null otherwise.
      */
     public @Nullable Float getSystemFloatSensor(
-            @CarDiagnosticSensorIndices.FloatSensorIndex int sensor) {
+            @CarDiagnosticSensorIndices.DiagnosticFloatSensorIndex int sensor) {
         int index = floatValues.indexOfKey(sensor);
         if (index < 0) return null;
         return floatValues.valueAt(index);
@@ -471,7 +471,7 @@ public class CarDiagnosticEvent implements Parcelable {
 
     /**
      * Represents possible states of the fuel system; see {@link
-     * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#FUEL_SYSTEM_STATUS}
+     * CarDiagnosticSensorIndices.IntegerSensorIndex#FUEL_SYSTEM_STATUS}
      */
     public static final class FuelSystemStatus {
         private FuelSystemStatus() {}
@@ -496,7 +496,7 @@ public class CarDiagnosticEvent implements Parcelable {
 
     /**
      * Represents possible states of the secondary air system; see {@link
-     * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#COMMANDED_SECONDARY_AIR_STATUS}
+     * CarDiagnosticSensorIndices.IntegerSensorIndex#COMMANDED_SECONDARY_AIR_STATUS}
      */
     public static final class SecondaryAirStatus {
         private SecondaryAirStatus() {}
@@ -519,7 +519,7 @@ public class CarDiagnosticEvent implements Parcelable {
 
     /**
      * Represents possible types of fuel; see {@link
-     * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#FUEL_TYPE}
+     * CarDiagnosticSensorIndices.IntegerSensorIndex#FUEL_TYPE}
      */
     public static final class FuelType {
         private FuelType() {}
@@ -582,8 +582,8 @@ public class CarDiagnosticEvent implements Parcelable {
 
     /**
      * Represents possible states of the ignition monitors on the vehicle; see {@link
-     * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#IGNITION_MONITORS_SUPPORTED} see {@link
-     * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#IGNITION_SPECIFIC_MONITORS}
+     * CarDiagnosticSensorIndices.IntegerSensorIndex#IGNITION_MONITORS_SUPPORTED} see {@link
+     * CarDiagnosticSensorIndices.IntegerSensorIndex#IGNITION_SPECIFIC_MONITORS}
      */
     public static final class IgnitionMonitors {
         public static final class IgnitionMonitor {
@@ -794,7 +794,7 @@ public class CarDiagnosticEvent implements Parcelable {
      */
     public @Nullable @FuelSystemStatus.Status Integer getFuelSystemStatus() {
         return getSystemIntegerSensor(
-                CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.FUEL_SYSTEM_STATUS);
+                CarDiagnosticSensorIndices.IntegerSensorIndex.FUEL_SYSTEM_STATUS);
     }
 
     /**
@@ -803,7 +803,7 @@ public class CarDiagnosticEvent implements Parcelable {
      */
     public @Nullable @SecondaryAirStatus.Status Integer getSecondaryAirStatus() {
         return getSystemIntegerSensor(
-                CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS);
+                CarDiagnosticSensorIndices.IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS);
     }
 
     /**
@@ -813,11 +813,11 @@ public class CarDiagnosticEvent implements Parcelable {
     public @Nullable IgnitionMonitors.CommonIgnitionMonitors getIgnitionMonitors() {
         Integer ignitionMonitorsType =
                 getSystemIntegerSensor(
-                        CarDiagnosticSensorIndices.Obd2IntegerSensorIndex
+                        CarDiagnosticSensorIndices.IntegerSensorIndex
                                 .IGNITION_MONITORS_SUPPORTED);
         Integer ignitionMonitorsBitmask =
                 getSystemIntegerSensor(
-                        CarDiagnosticSensorIndices.Obd2IntegerSensorIndex
+                        CarDiagnosticSensorIndices.IntegerSensorIndex
                                 .IGNITION_SPECIFIC_MONITORS);
         if (null == ignitionMonitorsType) return null;
         if (null == ignitionMonitorsBitmask) return null;
@@ -836,6 +836,6 @@ public class CarDiagnosticEvent implements Parcelable {
      * Returns null otherwise.
      */
     public @Nullable @FuelType.Type Integer getFuelType() {
-        return getSystemIntegerSensor(CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.FUEL_TYPE);
+        return getSystemIntegerSensor(CarDiagnosticSensorIndices.IntegerSensorIndex.FUEL_TYPE);
     }
 }
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 {}
 
 }