Merge "Add property for vehicle speed" into qt-dev am: 0664dba927 (8ae07b19) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.0/types.hal

+65 −43

Original line number	Diff line number	Diff line
		@@ -1120,9 +1120,9 @@ enum VehicleProperty : int32_t {
		*
		* Distance units are defined in VehicleUnit.
		* VehiclePropConfig.configArray is used to indicate the supported distance display units.
		* For example: configArray[0] = 0x21 // METER
		* configArray[1] = 0x23 // KILOMETER
		* configArray[2] = 0x24 // MILE
		* For example: configArray[0] = METER
		* configArray[1] = KILOMETER
		* configArray[2] = MILE
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @data_enum VehicleUnit
		@@ -1141,8 +1141,8 @@ enum VehicleProperty : int32_t {
		*
		* VehiclePropConfig.configArray is used to indicate the supported fuel volume display units.
		* Volume units are defined in VehicleUnit.
		* For example: configArray[0] = 0x41 // LITER
		* configArray[1] = 0x42 // GALLON
		* For example: configArray[0] = LITER
		* configArray[1] = GALLON
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @data_enum VehicleUnit
		@@ -1161,9 +1161,9 @@ enum VehicleProperty : int32_t {
		*
		* VehiclePropConfig.configArray is used to indicate the supported pressure display units.
		* Pressure units are defined in VehicleUnit.
		* For example: configArray[0] = 0x70 // KILOPASCAL
		* configArray[1] = 0x71 // PSI
		* configArray[2] = 0x72 // BAR
		* For example: configArray[0] = KILOPASCAL
		* configArray[1] = PSI
		* configArray[2] = BAR
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @data_enum VehicleUnit
		@@ -1182,9 +1182,9 @@ enum VehicleProperty : int32_t {
		*
		* VehiclePropConfig.configArray is used to indicate the supported electrical energy units.
		* Electrical energy units are defined in VehicleUnit.
		* For example: configArray[0] = 0x60 // watt-hours
		* configArray[1] = 0x64 // ampere-hours
		* configArray[2] = 0x65 // kilowatt-hours
		* For example: configArray[0] = WATT_HOUR
		* configArray[1] = AMPERE_HOURS
		* configArray[2] = KILOWATT_HOUR
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @data_enum VehicleUnit
		@@ -1211,6 +1211,25 @@ enum VehicleProperty : int32_t {
		\| VehiclePropertyType:BOOLEAN
		\| VehicleArea:GLOBAL),

		/**
		* Speed units for display
		*
		* Indicates type of units the car is using to display speed to user. Eg. m/s, km/h, or mph.
		*
		* VehiclePropConfig.configArray is used to indicate the supported speed display units.
		* Pressure units are defined in VehicleUnit.
		* For example: configArray[0] = METER_PER_SEC
		* configArray[1] = MILES_PER_HOUR
		* configArray[2] = KILOMETERS_PER_HOUR
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		*/
		VEHICLE_SPEED_DISPLAY_UNITS = (
		0x0605
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:INT32
		\| VehicleArea:GLOBAL),

		/**
		* Outside temperature
		*
		@@ -2622,6 +2641,9 @@ enum VehicleUnit : int32_t {
		PSI = 0x71,
		BAR = 0x72,
		DEGREES = 0x80,

		MILES_PER_HOUR = 0x90,
		KILOMETERS_PER_HOUR = 0x91,
		};

		/**