diff options
author | android-build-team Robot | 2018-05-08 02:25:47 -0500 |
---|---|---|
committer | android-build-team Robot | 2018-05-08 02:25:47 -0500 |
commit | 0541524eaa7388ea84260590b542b6c12e869eda (patch) | |
tree | 813bf1c33ad4da6ded56b2e896ddd00a1c0c20b8 | |
parent | 32ca66c03527f950edd09c29b89009da42ff26e5 (diff) | |
parent | 73bfa71121f882493ca63265926b8e7979cde46f (diff) | |
download | platform-hardware-interfaces-0541524eaa7388ea84260590b542b6c12e869eda.tar.gz platform-hardware-interfaces-0541524eaa7388ea84260590b542b6c12e869eda.tar.xz platform-hardware-interfaces-0541524eaa7388ea84260590b542b6c12e869eda.zip |
Snap for 4767765 from 73bfa71121f882493ca63265926b8e7979cde46f to pi-release
Change-Id: Ia53e0f84f8a26bdd52eb7b2f26d8f4ca40d79a29
-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 48ee1bb5..348f8783 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[]{ | |||
266 | .initialValue = {.int32Values = {0}} // Will be used for all areas. | 266 | .initialValue = {.int32Values = {0}} // Will be used for all areas. |
267 | }, | 267 | }, |
268 | 268 | ||
269 | {.config = {.prop = toInt(VehicleProperty::HVAC_MAX_DEFROST_ON), | ||
270 | .access = VehiclePropertyAccess::READ_WRITE, | ||
271 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | ||
272 | .areaConfigs = {VehicleAreaConfig{ | ||
273 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | ||
274 | .initialValue = {.int32Values = {0}}}, | ||
275 | |||
269 | {.config = {.prop = toInt(VehicleProperty::HVAC_RECIRC_ON), | 276 | {.config = {.prop = toInt(VehicleProperty::HVAC_RECIRC_ON), |
270 | .access = VehiclePropertyAccess::READ_WRITE, | 277 | .access = VehiclePropertyAccess::READ_WRITE, |
271 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | 278 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, |
@@ -273,6 +280,13 @@ const ConfigDeclaration kVehicleProperties[]{ | |||
273 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | 280 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, |
274 | .initialValue = {.int32Values = {1}}}, | 281 | .initialValue = {.int32Values = {1}}}, |
275 | 282 | ||
283 | {.config = {.prop = toInt(VehicleProperty::HVAC_AUTO_RECIRC_ON), | ||
284 | .access = VehiclePropertyAccess::READ_WRITE, | ||
285 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | ||
286 | .areaConfigs = {VehicleAreaConfig{ | ||
287 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | ||
288 | .initialValue = {.int32Values = {0}}}, | ||
289 | |||
276 | {.config = {.prop = toInt(VehicleProperty::HVAC_AC_ON), | 290 | {.config = {.prop = toInt(VehicleProperty::HVAC_AC_ON), |
277 | .access = VehiclePropertyAccess::READ_WRITE, | 291 | .access = VehiclePropertyAccess::READ_WRITE, |
278 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | 292 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, |
@@ -280,6 +294,13 @@ const ConfigDeclaration kVehicleProperties[]{ | |||
280 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | 294 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, |
281 | .initialValue = {.int32Values = {1}}}, | 295 | .initialValue = {.int32Values = {1}}}, |
282 | 296 | ||
297 | {.config = {.prop = toInt(VehicleProperty::HVAC_MAX_AC_ON), | ||
298 | .access = VehiclePropertyAccess::READ_WRITE, | ||
299 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | ||
300 | .areaConfigs = {VehicleAreaConfig{ | ||
301 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | ||
302 | .initialValue = {.int32Values = {0}}}, | ||
303 | |||
283 | {.config = {.prop = toInt(VehicleProperty::HVAC_AUTO_ON), | 304 | {.config = {.prop = toInt(VehicleProperty::HVAC_AUTO_ON), |
284 | .access = VehiclePropertyAccess::READ_WRITE, | 305 | .access = VehiclePropertyAccess::READ_WRITE, |
285 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | 306 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, |
@@ -287,6 +308,13 @@ const ConfigDeclaration kVehicleProperties[]{ | |||
287 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | 308 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, |
288 | .initialValue = {.int32Values = {1}}}, | 309 | .initialValue = {.int32Values = {1}}}, |
289 | 310 | ||
311 | {.config = {.prop = toInt(VehicleProperty::HVAC_DUAL_ON), | ||
312 | .access = VehiclePropertyAccess::READ_WRITE, | ||
313 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | ||
314 | .areaConfigs = {VehicleAreaConfig{ | ||
315 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | ||
316 | .initialValue = {.int32Values = {0}}}, | ||
317 | |||
290 | {.config = {.prop = toInt(VehicleProperty::HVAC_FAN_SPEED), | 318 | {.config = {.prop = toInt(VehicleProperty::HVAC_FAN_SPEED), |
291 | .access = VehiclePropertyAccess::READ_WRITE, | 319 | .access = VehiclePropertyAccess::READ_WRITE, |
292 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | 320 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, |
@@ -303,6 +331,13 @@ const ConfigDeclaration kVehicleProperties[]{ | |||
303 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, | 331 | .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}}, |
304 | .initialValue = {.int32Values = {toInt(VehicleHvacFanDirection::FACE)}}}, | 332 | .initialValue = {.int32Values = {toInt(VehicleHvacFanDirection::FACE)}}}, |
305 | 333 | ||
334 | {.config = {.prop = toInt(VehicleProperty::HVAC_STEERING_WHEEL_HEAT), | ||
335 | .access = VehiclePropertyAccess::READ_WRITE, | ||
336 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | ||
337 | .areaConfigs = {VehicleAreaConfig{ | ||
338 | .areaId = (0), .minInt32Value = -2, .maxInt32Value = 2}}}, | ||
339 | .initialValue = {.int32Values = {0}}}, // +ve values for heating and -ve for cooling | ||
340 | |||
306 | {.config = {.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_SET), | 341 | {.config = {.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_SET), |
307 | .access = VehiclePropertyAccess::READ_WRITE, | 342 | .access = VehiclePropertyAccess::READ_WRITE, |
308 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | 343 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, |
@@ -330,6 +365,12 @@ const ConfigDeclaration kVehicleProperties[]{ | |||
330 | }, | 365 | }, |
331 | .initialValue = {.floatValues = {25.0f}}}, | 366 | .initialValue = {.floatValues = {25.0f}}}, |
332 | 367 | ||
368 | {.config = {.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_DISPLAY_UNITS), | ||
369 | .access = VehiclePropertyAccess::READ_WRITE, | ||
370 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | ||
371 | .areaConfigs = {VehicleAreaConfig{.areaId = (0)}}}, | ||
372 | .initialValue = {.int32Values = {(int)VehicleUnit::FAHRENHEIT}}}, | ||
373 | |||
333 | {.config = | 374 | {.config = |
334 | { | 375 | { |
335 | .prop = toInt(VehicleProperty::NIGHT_MODE), | 376 | .prop = toInt(VehicleProperty::NIGHT_MODE), |