diff options
author | Kiran Rachuri <krachuri@google.com> | 2018-05-07 22:15:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-07 22:15:01 +0000 |
commit | 73bfa71121f882493ca63265926b8e7979cde46f (patch) | |
tree | 813bf1c33ad4da6ded56b2e896ddd00a1c0c20b8 /automotive/vehicle | |
parent | 8f3b492c83fb2a01e95e3edc8a4bda1471c7aa3d (diff) | |
parent | 74570ecb71db460a538a3e1b1d689965ac9b7220 (diff) | |
download | android_hardware_interfaces-73bfa71121f882493ca63265926b8e7979cde46f.tar.gz android_hardware_interfaces-73bfa71121f882493ca63265926b8e7979cde46f.tar.bz2 android_hardware_interfaces-73bfa71121f882493ca63265926b8e7979cde46f.zip |
Merge "Add HVAC properties" into pi-dev
Diffstat (limited to 'automotive/vehicle')
-rw-r--r-- | automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 41 |
1 files changed, 41 insertions, 0 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 48ee1bb5d..348f87834 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 @@ -266,6 +266,13 @@ const ConfigDeclaration kVehicleProperties[]{ .initialValue = {.int32Values = {0}} // Will be used for all areas. }, + {.config = {.prop = toInt(VehicleProperty::HVAC_MAX_DEFROST_ON), + .access = VehiclePropertyAccess::READ_WRITE, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{ + .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, + .initialValue = {.int32Values = {0}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_RECIRC_ON), .access = VehiclePropertyAccess::READ_WRITE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, @@ -273,6 +280,13 @@ const ConfigDeclaration kVehicleProperties[]{ .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, .initialValue = {.int32Values = {1}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_AUTO_RECIRC_ON), + .access = VehiclePropertyAccess::READ_WRITE, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{ + .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, + .initialValue = {.int32Values = {0}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_AC_ON), .access = VehiclePropertyAccess::READ_WRITE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, @@ -280,6 +294,13 @@ const ConfigDeclaration kVehicleProperties[]{ .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, .initialValue = {.int32Values = {1}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_MAX_AC_ON), + .access = VehiclePropertyAccess::READ_WRITE, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{ + .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, + .initialValue = {.int32Values = {0}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_AUTO_ON), .access = VehiclePropertyAccess::READ_WRITE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, @@ -287,6 +308,13 @@ const ConfigDeclaration kVehicleProperties[]{ .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, .initialValue = {.int32Values = {1}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_DUAL_ON), + .access = VehiclePropertyAccess::READ_WRITE, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{ + .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, + .initialValue = {.int32Values = {0}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_FAN_SPEED), .access = VehiclePropertyAccess::READ_WRITE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, @@ -303,6 +331,13 @@ const ConfigDeclaration kVehicleProperties[]{ .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, .initialValue = {.int32Values = {toInt(VehicleHvacFanDirection::FACE)}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_STEERING_WHEEL_HEAT), + .access = VehiclePropertyAccess::READ_WRITE, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{ + .areaId = (0), .minInt32Value = -2, .maxInt32Value = 2}}}, + .initialValue = {.int32Values = {0}}}, // +ve values for heating and -ve for cooling + {.config = {.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_SET), .access = VehiclePropertyAccess::READ_WRITE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, @@ -330,6 +365,12 @@ const ConfigDeclaration kVehicleProperties[]{ }, .initialValue = {.floatValues = {25.0f}}}, + {.config = {.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_DISPLAY_UNITS), + .access = VehiclePropertyAccess::READ_WRITE, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{.areaId = (0)}}}, + .initialValue = {.int32Values = {(int)VehicleUnit::FAHRENHEIT}}}, + {.config = { .prop = toInt(VehicleProperty::NIGHT_MODE), |