From f7f16932da6fca16c46fe0b767763ed8c0a8b0f4 Mon Sep 17 00:00:00 2001 From: shrikar Date: Thu, 23 Feb 2023 18:40:13 +0000 Subject: [PATCH] Updated HVAC property docs with go/revising-hvac-additional-rule Bug: 267352912 Test: manual build Change-Id: I0b68d92d1a6e3a7739145bd302933e00c7f1aac1 --- automotive/vehicle/2.0/types.hal | 18 ++++++++++++++---- .../automotive/vehicle/VehicleProperty.aidl | 18 ++++++++++++++---- current.txt | 1 + 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index 83b0d94a6b..00d0452bcb 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -829,10 +829,10 @@ enum VehicleProperty : int32_t { /* * HVAC Properties * - * Additional rules for mapping a zoned HVAC property (except - * HVAC_MAX_DEFROST_ON) to AreaIDs: - * - Every seat in VehicleAreaSeat that is available in the car, must be - * part of an AreaID in the AreaID array. + * Additional rules for mapping non-GLOBAL VehicleArea type HVAC properties + * to AreaIDs: + * - Every “area” for a specific VehicleArea type that is affected by the + * property, must be included in an area ID for that property. * * Example 1: A car has two front seats (ROW_1_LEFT, ROW_1_RIGHT) and three * back seats (ROW_2_LEFT, ROW_2_CENTER, ROW_2_RIGHT). There are two @@ -860,6 +860,16 @@ enum VehicleProperty : int32_t { * - ROW_1_LEFT * - ROW_1_RIGHT * - ROW_2_LEFT | ROW_2_CENTER | ROW_2_RIGHT | ROW_3_LEFT | ROW_3_CENTER | ROW_3_RIGHT + * + * Example 3: A car has two front seats (ROW_1_LEFT, ROW_1_RIGHT) and three + * back seats (ROW_2_LEFT, ROW_2_CENTER, ROW_2_RIGHT). Suppose the car + * supports HVAC_AUTO_ON for just the two front seats. + * - A valid mapping set of AreaIDs for HVAC_AUTO_ON would be: + * - ROW_1_LEFT | ROW_1_RIGHT + * - If HVAC_AUTO_ON had two separate control units for the driver side + * and passenger side, an alternative mapping would be: + * - ROW_1_LEFT + * - ROW_1_RIGHT */ /** diff --git a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl index d4b02a2af5..d3dd70aa26 100644 --- a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl +++ b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl @@ -619,10 +619,10 @@ enum VehicleProperty { /** * HVAC Properties * - * Additional rules for mapping a zoned HVAC property (except - * HVAC_MAX_DEFROST_ON) to AreaIDs: - * - Every seat in VehicleAreaSeat that is available in the car, must be - * part of an AreaID in the AreaID array. + * Additional rules for mapping non-GLOBAL VehicleArea type HVAC properties + * to AreaIDs: + * - Every “area” for a specific VehicleArea type that is affected by the + * property, must be included in an area ID for that property. * * Example 1: A car has two front seats (ROW_1_LEFT, ROW_1_RIGHT) and three * back seats (ROW_2_LEFT, ROW_2_CENTER, ROW_2_RIGHT). There are two @@ -651,6 +651,16 @@ enum VehicleProperty { * - ROW_1_RIGHT * - ROW_2_LEFT | ROW_2_CENTER | ROW_2_RIGHT | ROW_3_LEFT | ROW_3_CENTER | ROW_3_RIGHT * + * Example 3: A car has two front seats (ROW_1_LEFT, ROW_1_RIGHT) and three + * back seats (ROW_2_LEFT, ROW_2_CENTER, ROW_2_RIGHT). Suppose the car + * supports HVAC_AUTO_ON for just the two front seats. + * - A valid mapping set of AreaIDs for HVAC_AUTO_ON would be: + * - ROW_1_LEFT | ROW_1_RIGHT + * - If HVAC_AUTO_ON had two separate control units for the driver side + * and passenger side, an alternative mapping would be: + * - ROW_1_LEFT + * - ROW_1_RIGHT + * * * Fan speed setting * diff --git a/current.txt b/current.txt index 358d05a60e..c40f9ea9b6 100644 --- a/current.txt +++ b/current.txt @@ -935,5 +935,6 @@ b7ce2d87841585551b082fca6d099622e63b7099e0d8013f687ea1a1dc35c4dc android.hardwar 4f1a02d21a22104c734f71cdbba19b6f7e93d4ee107ff79f0dbdd171a8430e0e android.hardware.automotive.vehicle@2.0::types a2fbd9747fbb9ceb8c1090b5a24138312246502d5af0654a8c2b603a9bf521fc android.hardware.gnss@1.0::IGnssCallback 889b59e3e7a59afa67bf19882a44f51a2f9e43b6556ec52baa9ec3efd1ef7fbe android.hardware.camera.device@3.2::types +db37a1c757e2e69b1ec9c75a981a6987bd87a131d92ab6acc00e04d19f374281 android.hardware.automotive.vehicle@2.0::types # There will be no more HIDL HALs. Use AIDL instead.