diff options
| author | Steve Paik <spaik@google.com> | 2018-05-29 16:15:24 -0700 |
|---|---|---|
| committer | Steve Paik <spaik@google.com> | 2018-06-04 21:07:39 +0000 |
| commit | 44b0283f6ce0125ea00060bd3b18aad42b62c5a5 (patch) | |
| tree | cea8672d1431e7ed26499c6a80563f3c7a6f3e4c /automotive | |
| parent | a12e7b7847958fd57144ea643fed971543dbf353 (diff) | |
| download | platform_hardware_interfaces-44b0283f6ce0125ea00060bd3b18aad42b62c5a5.tar.gz platform_hardware_interfaces-44b0283f6ce0125ea00060bd3b18aad42b62c5a5.tar.bz2 platform_hardware_interfaces-44b0283f6ce0125ea00060bd3b18aad42b62c5a5.zip | |
Add initial values for properties
Cleanup defaultconfig.h to have proper initial values so that all
properties may be tested with EmbeddedKitchenSink.
Bug: 109674339
Test: Embedded Kitchen Sink
Change-Id: I3007c645b90b0e6805b8d1011c3a8d659eb13d2b
Diffstat (limited to 'automotive')
| -rw-r--r-- | automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 36 |
1 files changed, 15 insertions, 21 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 4ae94c0011..eb9d6605cf 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 @@ -32,6 +32,8 @@ namespace impl { constexpr int ABS_ACTIVE = (int)VehicleProperty::ABS_ACTIVE; constexpr int AP_POWER_STATE_REQ = (int)VehicleProperty::AP_POWER_STATE_REQ; constexpr int AP_POWER_STATE_REPORT = (int)VehicleProperty::AP_POWER_STATE_REPORT; +constexpr int DOOR_1_LEFT = (int)VehicleAreaDoor::ROW_1_LEFT; +constexpr int DOOR_1_RIGHT = (int)VehicleAreaDoor::ROW_1_RIGHT; constexpr int OBD2_LIVE_FRAME = (int)VehicleProperty::OBD2_LIVE_FRAME; constexpr int OBD2_FREEZE_FRAME = (int)VehicleProperty::OBD2_FREEZE_FRAME; constexpr int OBD2_FREEZE_FRAME_INFO = (int)VehicleProperty::OBD2_FREEZE_FRAME_INFO; @@ -440,13 +442,13 @@ const ConfigDeclaration kVehicleProperties[]{ }, }, - {.config = - { - .prop = toInt(VehicleProperty::DOOR_LOCK), - .access = VehiclePropertyAccess::READ, - .changeMode = VehiclePropertyChangeMode::ON_CHANGE, - }, - .initialValue = {.int32Values = {1}}}, + {.config = {.prop = toInt(VehicleProperty::DOOR_LOCK), + .access = VehiclePropertyAccess::READ, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{.areaId = DOOR_1_LEFT}, + VehicleAreaConfig{.areaId = DOOR_1_RIGHT}}}, + .initialAreaValues = {{DOOR_1_LEFT, {.int32Values = {1}}}, + {DOOR_1_RIGHT, {.int32Values = {1}}}}}, {.config = { @@ -459,23 +461,15 @@ const ConfigDeclaration kVehicleProperties[]{ }, .initialValue = {.int64Values = {0, 100000, 200000, 300000, 400000}}}, - { - .config = - { - .prop = ABS_ACTIVE, + {.config = {.prop = ABS_ACTIVE, .access = VehiclePropertyAccess::READ, - .changeMode = VehiclePropertyChangeMode::ON_CHANGE, - }, - }, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE}, + .initialValue = {.int32Values = {0}}}, - { - .config = - { - .prop = TRACTION_CONTROL_ACTIVE, + {.config = {.prop = TRACTION_CONTROL_ACTIVE, .access = VehiclePropertyAccess::READ, - .changeMode = VehiclePropertyChangeMode::ON_CHANGE, - }, - }, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE}, + .initialValue = {.int32Values = {0}}}, {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REQ), .access = VehiclePropertyAccess::READ, |