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

Commit 7dea3ee6 authored by Aaqib Ismail's avatar Aaqib Ismail Committed by Android (Google) Code Review
Browse files

Merge "Add HAL changes for EV_CURRENT_BATTERY_CAPACITY"

parents ba335e94 aec678ac

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ enum VehicleProperty { 
  FUEL_LEVEL = 291504903,

  FUEL_DOOR_OPEN = 287310600,

  EV_BATTERY_LEVEL = 291504905,

  EV_CURRENT_BATTERY_CAPACITY = 291504909,

  EV_CHARGE_PORT_OPEN = 287310602,

  EV_CHARGE_PORT_CONNECTED = 287310603,

  EV_BATTERY_INSTANTANEOUS_CHARGE_RATE = 291504908,

automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleProperty.aidl

+14 −0
Original line number Diff line number Diff line
@@ -343,6 +343,20 @@ enum VehicleProperty { 
     */

    EV_BATTERY_LEVEL = 0x0309 + 0x10000000 + 0x01000000

            + 0x00600000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:FLOAT

    /**

     * Current battery capacity for EV or hybrid vehicle

     *

     * Returns the actual value of battery capacity, if EV or hybrid. This property captures the

     * real-time battery capacity taking into account factors such as battery aging and temperature

     * dependency. Therefore, this value might be different from INFO_EV_BATTERY_CAPACITY because

     * INFO_EV_BATTERY_CAPACITY returns the nominal battery capacity from when the vehicle was new.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ

     * @unit VehicleUnit:WH

     */

    EV_CURRENT_BATTERY_CAPACITY =

            0x030D + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.FLOAT,

    /**

     * EV charge port open

     *

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

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

        {VehicleProperty::FUEL_DOOR_OPEN, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::EV_BATTERY_LEVEL, VehiclePropertyAccess::READ},

        {VehicleProperty::EV_CURRENT_BATTERY_CAPACITY, VehiclePropertyAccess::READ},

        {VehicleProperty::EV_CHARGE_PORT_OPEN, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::EV_CHARGE_PORT_CONNECTED, VehiclePropertyAccess::READ},

        {VehicleProperty::EV_BATTERY_INSTANTANEOUS_CHARGE_RATE, VehiclePropertyAccess::READ},

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

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

        {VehicleProperty::FUEL_DOOR_OPEN, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::EV_BATTERY_LEVEL, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::EV_CURRENT_BATTERY_CAPACITY, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::EV_CHARGE_PORT_OPEN, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::EV_CHARGE_PORT_CONNECTED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::EV_BATTERY_INSTANTANEOUS_CHARGE_RATE, VehiclePropertyChangeMode::CONTINUOUS},

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

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

        Map.entry(VehicleProperty.FUEL_DOOR_OPEN, VehiclePropertyAccess.READ_WRITE),

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

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

        Map.entry(VehicleProperty.EV_CHARGE_PORT_OPEN, VehiclePropertyAccess.READ_WRITE),

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

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