diff options
| author | Steve Paik <spaik@google.com> | 2018-02-06 19:33:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-06 19:33:13 +0000 |
| commit | 27bfe5ce9fe9c6ef0f99a682992d39b476bcc723 (patch) | |
| tree | 79535326b7e7d1f5bb911d79459ab8a66369f2de /automotive | |
| parent | d17343bdbdd665f2dab4b33ab589c3ef977f9af0 (diff) | |
| parent | 84b5aeaaf9da6f2526a8e789ef441defb66990f1 (diff) | |
| download | android_hardware_interfaces-27bfe5ce9fe9c6ef0f99a682992d39b476bcc723.tar.gz android_hardware_interfaces-27bfe5ce9fe9c6ef0f99a682992d39b476bcc723.tar.bz2 android_hardware_interfaces-27bfe5ce9fe9c6ef0f99a682992d39b476bcc723.zip | |
Merge "Add ENGINE_OIL_LEVEL, PARKING_BRAKE_AUTO_APPLY"
Diffstat (limited to 'automotive')
| -rw-r--r-- | automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 8 | ||||
| -rw-r--r-- | automotive/vehicle/2.0/types.hal | 38 |
2 files changed, 45 insertions, 1 deletions
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h index 18e8c4006..7938b7312 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h @@ -358,6 +358,14 @@ const ConfigDeclaration kVehicleProperties[]{ {.config = { + .prop = toInt(VehicleProperty::ENGINE_OIL_LEVEL), + .access = VehiclePropertyAccess::READ, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + }, + .initialValue = {.int32Values = {toInt(VehicleOilLevel::NORMAL)}}}, + + {.config = + { .prop = toInt(VehicleProperty::ENGINE_OIL_TEMP), .access = VehiclePropertyAccess::READ, .changeMode = VehiclePropertyChangeMode::CONTINUOUS, diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index 4313dce05..3001213fc 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -253,6 +253,19 @@ enum VehicleProperty: int32_t { | VehicleArea:GLOBAL), /** + * Engine oil level + * + * @change_mode VehiclePropertyChangeMode:ON_CHANGE + * @access VehiclePropertyAccess:READ + * @data_enum VehicleOilLevel + */ + ENGINE_OIL_LEVEL = ( + 0x0303 + | VehiclePropertyGroup:SYSTEM + | VehiclePropertyType:INT32 + | VehicleArea:GLOBAL), + + /** * Temperature of engine oil * * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS @@ -433,7 +446,7 @@ enum VehicleProperty: int32_t { * Parking brake state. * * @change_mode VehiclePropertyChangeMode:ON_CHANGE - * @access VehiclePropertyAccess:READ + * @access VehiclePropertyAccess:READ_WRITE */ PARKING_BRAKE_ON = ( 0x0402 @@ -442,6 +455,18 @@ enum VehicleProperty: int32_t { | VehicleArea:GLOBAL), /** + * Auto-apply parking brake. + * + * @change_mode VehiclePropertyChangeMode:ON_CHANGE + * @access VehiclePropertyAccess:READ_WRITE + */ + PARKING_BRAKE_AUTO_APPLY = ( + 0x0403 + | VehiclePropertyGroup:SYSTEM + | VehiclePropertyType:BOOLEAN + | VehicleArea:GLOBAL), + + /** * Driving status policy. * * @change_mode VehiclePropertyChangeMode:ON_CHANGE @@ -1861,6 +1886,17 @@ enum VehicleHvacFanDirection : int32_t { DEFROST = 0x4, }; +enum VehicleOilLevel : int32_t { + /** + * Oil level values + */ + CRITICALLY_LOW = 0, + LOW = 1, + NORMAL = 2, + HIGH = 3, + ERROR = 4, +}; + /** * Constants relevant to radio. */ |