From 5fc65ccafc71e275b5e2766f904a81b257f7cace Mon Sep 17 00:00:00 2001 From: Steve Paik Date: Wed, 25 Apr 2018 11:04:06 -0700 Subject: [PATCH] Rename EV_CONNECTOR_TYPE enums Bug: 78571971 Test: Documentation / naming update Change-Id: I6ca65a9a745d9f5dd109f5b47a3a4af4d818fe39 --- automotive/vehicle/2.0/types.hal | 26 ++++++++++++++------------ current.txt | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index 12e2257adb..d4e4d46841 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -2003,30 +2003,32 @@ enum VehicleLightSwitch : int32_t { /** * Used by INFO_EV_CONNECTOR_TYPE to enumerate the type of connectors - * available to charge the vehicle. Consistent with projection protocol. + * available to charge the vehicle. */ enum EvConnectorType : int32_t { /** * Default type if the vehicle does not know or report the EV connector * type. */ - EV_CONNECTOR_TYPE_UNKNOWN = 0, - EV_CONNECTOR_TYPE_J1772 = 1, - EV_CONNECTOR_TYPE_MENNEKES = 2, - EV_CONNECTOR_TYPE_CHADEMO = 3, - EV_CONNECTOR_TYPE_COMBO_1 = 4, - EV_CONNECTOR_TYPE_COMBO_2 = 5, - EV_CONNECTOR_TYPE_TESLA_ROADSTER = 6, - EV_CONNECTOR_TYPE_TESLA_HPWC = 7, - EV_CONNECTOR_TYPE_TESLA_SUPERCHARGER = 8, - EV_CONNECTOR_TYPE_GBT = 9, + UNKNOWN = 0, + IEC_TYPE_1_AC = 1, // aka Yazaki + IEC_TYPE_2_AC = 2, // aka Mennekes + IEC_TYPE_3_AC = 3, // aka Scame + IEC_TYPE_4_DC = 4, // aka CHAdeMO + IEC_TYPE_1_CCS_DC = 5, // aka Combo 1 + IEC_TYPE_2_CCS_DC = 6, // aka Combo 2 + TESLA_ROADSTER = 7, + TESLA_HPWC = 8, + TESLA_SUPERCHARGER = 9, + GBT_AC = 10, + GBT_DC = 11, /** * Connector type to use when no other types apply. Before using this * value, work with Google to see if the EvConnectorType enum can be * extended with an appropriate value. */ - EV_CONNECTOR_TYPE_OTHER = 101, + OTHER = 101, }; /** diff --git a/current.txt b/current.txt index 75b1a06e54..67a55340f4 100644 --- a/current.txt +++ b/current.txt @@ -299,7 +299,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar 3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle 7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback -2e1815967a3e3278a7f304ed7efc04fbc56d0bb65b3126248c3a0d515b93f63d android.hardware.automotive.vehicle@2.0::types +962b18e414231b5f3930d63daba116347241b3606242b0606b3699ba25b14315 android.hardware.automotive.vehicle@2.0::types 32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload 27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types