summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Paik2018-06-05 18:32:24 -0500
committerAndroid (Google) Code Review2018-06-05 18:32:24 -0500
commit3b50bd927b7c494d04657383d486aa0b862b3fe5 (patch)
treee4408cd2e11c550ec864e7f7a46043999ba26a45
parent62fd03d8e64f368fadce4a972ead88404f94b21d (diff)
parent44b0283f6ce0125ea00060bd3b18aad42b62c5a5 (diff)
downloadplatform-hardware-interfaces-3b50bd927b7c494d04657383d486aa0b862b3fe5.tar.gz
platform-hardware-interfaces-3b50bd927b7c494d04657383d486aa0b862b3fe5.tar.xz
platform-hardware-interfaces-3b50bd927b7c494d04657383d486aa0b862b3fe5.zip
Merge "Add initial values for properties" into pi-dev
-rw-r--r--automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h36
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 4ae94c00..eb9d6605 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 {
32constexpr int ABS_ACTIVE = (int)VehicleProperty::ABS_ACTIVE; 32constexpr int ABS_ACTIVE = (int)VehicleProperty::ABS_ACTIVE;
33constexpr int AP_POWER_STATE_REQ = (int)VehicleProperty::AP_POWER_STATE_REQ; 33constexpr int AP_POWER_STATE_REQ = (int)VehicleProperty::AP_POWER_STATE_REQ;
34constexpr int AP_POWER_STATE_REPORT = (int)VehicleProperty::AP_POWER_STATE_REPORT; 34constexpr int AP_POWER_STATE_REPORT = (int)VehicleProperty::AP_POWER_STATE_REPORT;
35constexpr int DOOR_1_LEFT = (int)VehicleAreaDoor::ROW_1_LEFT;
36constexpr int DOOR_1_RIGHT = (int)VehicleAreaDoor::ROW_1_RIGHT;
35constexpr int OBD2_LIVE_FRAME = (int)VehicleProperty::OBD2_LIVE_FRAME; 37constexpr int OBD2_LIVE_FRAME = (int)VehicleProperty::OBD2_LIVE_FRAME;
36constexpr int OBD2_FREEZE_FRAME = (int)VehicleProperty::OBD2_FREEZE_FRAME; 38constexpr int OBD2_FREEZE_FRAME = (int)VehicleProperty::OBD2_FREEZE_FRAME;
37constexpr int OBD2_FREEZE_FRAME_INFO = (int)VehicleProperty::OBD2_FREEZE_FRAME_INFO; 39constexpr int OBD2_FREEZE_FRAME_INFO = (int)VehicleProperty::OBD2_FREEZE_FRAME_INFO;
@@ -440,13 +442,13 @@ const ConfigDeclaration kVehicleProperties[]{
440 }, 442 },
441 }, 443 },
442 444
443 {.config = 445 {.config = {.prop = toInt(VehicleProperty::DOOR_LOCK),
444 { 446 .access = VehiclePropertyAccess::READ,
445 .prop = toInt(VehicleProperty::DOOR_LOCK), 447 .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
446 .access = VehiclePropertyAccess::READ, 448 .areaConfigs = {VehicleAreaConfig{.areaId = DOOR_1_LEFT},
447 .changeMode = VehiclePropertyChangeMode::ON_CHANGE, 449 VehicleAreaConfig{.areaId = DOOR_1_RIGHT}}},
448 }, 450 .initialAreaValues = {{DOOR_1_LEFT, {.int32Values = {1}}},
449 .initialValue = {.int32Values = {1}}}, 451 {DOOR_1_RIGHT, {.int32Values = {1}}}}},
450 452
451 {.config = 453 {.config =
452 { 454 {
@@ -459,23 +461,15 @@ const ConfigDeclaration kVehicleProperties[]{
459 }, 461 },
460 .initialValue = {.int64Values = {0, 100000, 200000, 300000, 400000}}}, 462 .initialValue = {.int64Values = {0, 100000, 200000, 300000, 400000}}},
461 463
462 { 464 {.config = {.prop = ABS_ACTIVE,
463 .config =
464 {
465 .prop = ABS_ACTIVE,
466 .access = VehiclePropertyAccess::READ, 465 .access = VehiclePropertyAccess::READ,
467 .changeMode = VehiclePropertyChangeMode::ON_CHANGE, 466 .changeMode = VehiclePropertyChangeMode::ON_CHANGE},
468 }, 467 .initialValue = {.int32Values = {0}}},
469 },
470 468
471 { 469 {.config = {.prop = TRACTION_CONTROL_ACTIVE,
472 .config =
473 {
474 .prop = TRACTION_CONTROL_ACTIVE,
475 .access = VehiclePropertyAccess::READ, 470 .access = VehiclePropertyAccess::READ,
476 .changeMode = VehiclePropertyChangeMode::ON_CHANGE, 471 .changeMode = VehiclePropertyChangeMode::ON_CHANGE},
477 }, 472 .initialValue = {.int32Values = {0}}},
478 },
479 473
480 {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REQ), 474 {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),
481 .access = VehiclePropertyAccess::READ, 475 .access = VehiclePropertyAccess::READ,