Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 682cd76c authored by Tyler Trephan's avatar Tyler Trephan Committed by Android (Google) Code Review
Browse files

Merge "Added INSTANTANEOUS_EV_EFFICIENCY to HAL" into main

parents 9ab096da 444dca1f

automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ 
                "value": 291504657,

                "description": "Instantaneous Fuel Economy in L\/100km.\nThis property must communicate the instantaneous fuel economy of the vehicle in units of L\/100km. The property's value is independent of DISTANCE_DISPLAY_UNITS, FUEL_VOLUME_DISPLAY_UNITS, and FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME property i.e. this property must always communicate the value in L\/100km.\nFor the EV version of this property, see INSTANTANEOUS_EV_EFFICIENCY."

            },

            {

                "name": "INSTANTANEOUS_EV_EFFICIENCY",

                "value": 291504658,

                "description": "Instantaneous EV efficiency in km\/kWh.\nThis property must communicate the instantaneous EV battery efficiency of the vehicle in units of km\/kWh. The property's value is independent of the DISTANCE_DISPLAY_UNITS and EV_BATTERY_DISPLAY_UNITS properties i.e. this property must always communicate the value in km\/kWh.\nFor the fuel version of this property, see INSTANTANEOUS_FUEL_ECONOMY."

            },

            {

                "name": "Temperature of engine coolant",

                "value": 291504897,

automotive/vehicle/aidl/generated_lib/4/cpp/AccessForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::PERF_STEERING_ANGLE, VehiclePropertyAccess::READ},

        {VehicleProperty::PERF_REAR_STEERING_ANGLE, VehiclePropertyAccess::READ},

        {VehicleProperty::INSTANTANEOUS_FUEL_ECONOMY, VehiclePropertyAccess::READ},

        {VehicleProperty::INSTANTANEOUS_EV_EFFICIENCY, VehiclePropertyAccess::READ},

        {VehicleProperty::ENGINE_COOLANT_TEMP, VehiclePropertyAccess::READ},

        {VehicleProperty::ENGINE_OIL_LEVEL, VehiclePropertyAccess::READ},

        {VehicleProperty::ENGINE_OIL_TEMP, VehiclePropertyAccess::READ},

automotive/vehicle/aidl/generated_lib/4/cpp/ChangeModeForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::PERF_STEERING_ANGLE, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::PERF_REAR_STEERING_ANGLE, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::INSTANTANEOUS_FUEL_ECONOMY, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::INSTANTANEOUS_EV_EFFICIENCY, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::ENGINE_COOLANT_TEMP, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::ENGINE_OIL_LEVEL, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::ENGINE_OIL_TEMP, VehiclePropertyChangeMode::CONTINUOUS},

automotive/vehicle/aidl/generated_lib/4/cpp/VersionForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::PERF_STEERING_ANGLE, 2},

        {VehicleProperty::PERF_REAR_STEERING_ANGLE, 2},

        {VehicleProperty::INSTANTANEOUS_FUEL_ECONOMY, 4},

        {VehicleProperty::INSTANTANEOUS_EV_EFFICIENCY, 4},

        {VehicleProperty::ENGINE_COOLANT_TEMP, 2},

        {VehicleProperty::ENGINE_OIL_LEVEL, 2},

        {VehicleProperty::ENGINE_OIL_TEMP, 2},

automotive/vehicle/aidl/generated_lib/4/java/AccessForVehicleProperty.java

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.PERF_STEERING_ANGLE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.PERF_REAR_STEERING_ANGLE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.INSTANTANEOUS_FUEL_ECONOMY, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.INSTANTANEOUS_EV_EFFICIENCY, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.ENGINE_COOLANT_TEMP, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.ENGINE_OIL_LEVEL, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.ENGINE_OIL_TEMP, VehiclePropertyAccess.READ),