Merge "Fix WHEEL_TICK + and add friends" (85d75ba6) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.1/default/impl/vhal_v2_1/DefaultConfig.h

+17 −0

Original line number	Diff line number	Diff line
		@@ -29,12 +29,16 @@ namespace V2_1 {
		namespace impl {

		// Some handy constants to avoid conversions from enum to int.
		constexpr int ABS_ACTIVE = (int) V2_1::VehicleProperty::ABS_ACTIVE;
		constexpr int OBD2_LIVE_FRAME = (int) V2_1::VehicleProperty::OBD2_LIVE_FRAME;
		constexpr int OBD2_FREEZE_FRAME = (int) V2_1::VehicleProperty::OBD2_FREEZE_FRAME;
		constexpr int OBD2_FREEZE_FRAME_INFO = (int) V2_1::VehicleProperty::OBD2_FREEZE_FRAME_INFO;
		constexpr int OBD2_FREEZE_FRAME_CLEAR = (int) V2_1::VehicleProperty::OBD2_FREEZE_FRAME_CLEAR;
		constexpr int TRACTION_CONTROL_ACTIVE = (int) V2_1::VehicleProperty::TRACTION_CONTROL_ACTIVE;
		constexpr int VEHICLE_MAP_SERVICE = (int) V2_1::VehicleProperty::VEHICLE_MAP_SERVICE;
		constexpr int WHEEL_TICK = (int) V2_1::VehicleProperty::WHEEL_TICK;
		constexpr int ALL_WHEELS = (int) (V2_0::Wheel::LEFT_FRONT \| V2_0::Wheel::RIGHT_FRONT \|
		V2_0::Wheel::LEFT_REAR \| V2_0::Wheel::RIGHT_REAR);


		const V2_0::VehiclePropConfig kVehicleProperties[] = {
		@@ -42,10 +46,23 @@ const V2_0::VehiclePropConfig kVehicleProperties[] = {
		.prop = WHEEL_TICK,
		.access = V2_0::VehiclePropertyAccess::READ,
		.changeMode = V2_0::VehiclePropertyChangeMode::CONTINUOUS,
		.configArray = {ALL_WHEELS, 50000, 50000, 50000, 50000},
		.minSampleRate = 1.0f,
		.maxSampleRate = 100.0f,
		},

		{
		.prop = ABS_ACTIVE,
		.access = V2_0::VehiclePropertyAccess::READ,
		.changeMode = V2_0::VehiclePropertyChangeMode::ON_CHANGE,
		},

		{
		.prop = TRACTION_CONTROL_ACTIVE,
		.access = V2_0::VehiclePropertyAccess::READ,
		.changeMode = V2_0::VehiclePropertyChangeMode::ON_CHANGE,
		},

		{
		.prop = OBD2_LIVE_FRAME,
		.access = V2_0::VehiclePropertyAccess::READ,

automotive/vehicle/2.1/types.hal

+55 −7

Original line number	Diff line number	Diff line
		@@ -23,12 +23,37 @@ import android.hardware.automotive.vehicle@2.0;
		*/
		enum VehicleProperty: @2.0::VehicleProperty {
		/**
		* Reports wheel rotational distance in meters since last wheel tick
		* event
		* Reports wheel ticks
		*
		* The value is a vector each element represents distance for individual
		* wheel in the following order: left front, right front, left rear,
		* right rear. VehiclePropValue.timestamp must be correctly filled in.
		* The first four elements represent ticks for individual wheels in the
		* following order: front left, front right, rear right, rear left. All
		* tick counts are cumulative. Tick counts increment when the vehicle
		* moves forward, and decrement when vehicles moves in reverse. The ticks
		* should be reset to 0 when the vehicle is started by the user.
		*
		* The next element in the vector is a reset count. A reset indicates
		* previous tick counts are not comparable with this and future ones. Some
		* sort of discontinuity in tick counting has occurred.
		*
		* int64Values[0] = reset count
		* int64Values[1] = front left ticks
		* int64Values[2] = front right ticks
		* int64Values[3] = rear right ticks
		* int64Values[4] = rear left ticks
		*
		* configArray is used to indicate the micrometers-per-wheel-tick value as well as
		* which wheels are supported. configArray is set as follows:
		*
		* configArray[0], bits [0:3] = supported wheels. Uses enum Wheel.
		* configArray[1] = micrometers per front left wheel tick
		* configArray[2] = micrometers per front right wheel tick
		* configArray[3] = micrometers per rear right wheel tick
		* configArray[4] = micrometers per rear left wheel tick
		*
		* NOTE: If a wheel is not supported, its value shall always be set to
		* LONG_MAX = 9223372036854775807.
		*
		* VehiclePropValue.timestamp must be correctly filled in.
		*
		* Vendors must specify wheels that support this sensor in
		* VehiclePropConfig.configFlags. The format of this field is a bitset of
		@@ -36,12 +61,35 @@ enum VehicleProperty: @2.0::VehicleProperty {
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE \|VehiclePropertyChangeMode:CONTINUOUS
		* @access VehiclePropertyAccess:READ
		* @unit VehicleUnit:METER
		*/
		WHEEL_TICK = (
		0x0306
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:FLOAT_VEC
		\| VehiclePropertyType:COMPLEX
		\| VehicleArea:GLOBAL),

		/**
		* ABS is active. Set to true whenever ABS is activated. Reset to false when ABS is off.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ
		*/
		ABS_ACTIVE = (
		0x040A
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:BOOLEAN
		\| VehicleArea:GLOBAL),

		/**
		* Traction Control is active.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ
		*/
		TRACTION_CONTROL_ACTIVE = (
		0x040B
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:BOOLEAN
		\| VehicleArea:GLOBAL),

		/**