Merge "Add DOOR_LOCK to default config." into oc-dev (c63bdfbd) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

+204 −253

Original line number	Diff line number	Diff line
		@@ -64,36 +64,34 @@ struct ConfigDeclaration {
		};

		const ConfigDeclaration kVehicleProperties[]{
		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::INFO_MAKE),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::STATIC,
		},
		.initialValue = { .stringValue = "Toy Vehicle" }
		},
		.initialValue = {.stringValue = "Toy Vehicle"}},
		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::PERF_VEHICLE_SPEED),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.minSampleRate = 1.0f,
		.maxSampleRate = 1000.0f,
		},
		.initialValue = { .floatValues = {0.0f} }
		},
		.initialValue = {.floatValues = {0.0f}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::PERF_ODOMETER),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .floatValues = {0.0f} }
		},
		.initialValue = {.floatValues = {0.0f}}},

		{
		.config = {
		.config =
		{
		.prop = toInt(VehicleProperty::ENGINE_RPM),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::CONTINUOUS,
		@@ -103,35 +101,32 @@ const ConfigDeclaration kVehicleProperties[] {
		.initialValue = {.floatValues = {0.0f}},
		},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::CURRENT_GEAR),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .int32Values = { toInt(VehicleGear::GEAR_PARK) } }
		},
		.initialValue = {.int32Values = {toInt(VehicleGear::GEAR_PARK)}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::PARKING_BRAKE_ON),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .int32Values = {1} }
		},
		.initialValue = {.int32Values = {1}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::FUEL_LEVEL_LOW),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .int32Values = {0} }
		},
		.initialValue = {.int32Values = {0}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_POWER_ON),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		@@ -140,88 +135,58 @@ const ConfigDeclaration kVehicleProperties[] {
		// kHvacPowerProperties.
		.configString = "0x12400500,0x12400501" // HVAC_FAN_SPEED,HVAC_FAN_DIRECTION
		},
		.initialValue = { .int32Values = {1} }
		},
		.initialValue = {.int32Values = {1}}},

		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_DEFROSTER),
		.config = {.prop = toInt(VehicleProperty::HVAC_DEFROSTER),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.supportedAreas =
		VehicleAreaWindow::FRONT_WINDSHIELD
		\| VehicleAreaWindow::REAR_WINDSHIELD
		},
		VehicleAreaWindow::FRONT_WINDSHIELD \| VehicleAreaWindow::REAR_WINDSHIELD},
		.initialValue = {.int32Values = {0}} // Will be used for all areas.
		},

		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_RECIRC_ON),
		{.config = {.prop = toInt(VehicleProperty::HVAC_RECIRC_ON),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.supportedAreas = toInt(VehicleAreaZone::ROW_1)
		},
		.initialValue = { .int32Values = {1} }
		},
		.supportedAreas = toInt(VehicleAreaZone::ROW_1)},
		.initialValue = {.int32Values = {1}}},

		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_AC_ON),
		{.config = {.prop = toInt(VehicleProperty::HVAC_AC_ON),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.supportedAreas = toInt(VehicleAreaZone::ROW_1)
		},
		.initialValue = { .int32Values = {1} }
		},
		.supportedAreas = toInt(VehicleAreaZone::ROW_1)},
		.initialValue = {.int32Values = {1}}},

		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_AUTO_ON),
		{.config = {.prop = toInt(VehicleProperty::HVAC_AUTO_ON),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.supportedAreas = toInt(VehicleAreaZone::ROW_1)
		},
		.initialValue = { .int32Values = {1} }
		},
		.supportedAreas = toInt(VehicleAreaZone::ROW_1)},
		.initialValue = {.int32Values = {1}}},

		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_FAN_SPEED),
		{.config = {.prop = toInt(VehicleProperty::HVAC_FAN_SPEED),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.supportedAreas = toInt(VehicleAreaZone::ROW_1),
		.areaConfigs = {
		VehicleAreaConfig {
		.areaId = toInt(VehicleAreaZone::ROW_1),
		.areaConfigs = {VehicleAreaConfig{.areaId = toInt(VehicleAreaZone::ROW_1),
		.minInt32Value = 1,
		.maxInt32Value = 7
		}
		}
		},
		.initialValue = { .int32Values = {3} }
		},
		.maxInt32Value = 7}}},
		.initialValue = {.int32Values = {3}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_FAN_DIRECTION),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.supportedAreas = toInt(VehicleAreaZone::ROW_1),
		},
		.initialValue = { .int32Values = { toInt(VehicleHvacFanDirection::FACE) } }
		},
		.initialValue = {.int32Values = {toInt(VehicleHvacFanDirection::FACE)}}},

		{
		.config = {
		.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_SET),
		{.config = {.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_SET),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.supportedAreas =
		VehicleAreaZone::ROW_1_LEFT
		\| VehicleAreaZone::ROW_1_RIGHT,
		.areaConfigs = {
		VehicleAreaConfig {
		.supportedAreas = VehicleAreaZone::ROW_1_LEFT \| VehicleAreaZone::ROW_1_RIGHT,
		.areaConfigs = {VehicleAreaConfig{
		.areaId = toInt(VehicleAreaZone::ROW_1_LEFT),
		.minFloatValue = 16,
		.maxFloatValue = 32,
		@@ -230,22 +195,12 @@ const ConfigDeclaration kVehicleProperties[] {
		.areaId = toInt(VehicleAreaZone::ROW_1_RIGHT),
		.minFloatValue = 16,
		.maxFloatValue = 32,
		}
		}
		},
		.initialAreaValues = {
		{
		toInt(VehicleAreaZone::ROW_1_LEFT),
		{ .floatValues = {16} }
		}, {
		toInt(VehicleAreaZone::ROW_1_RIGHT),
		{ .floatValues = {20} }
		}
		}
		},
		}}},
		.initialAreaValues = {{toInt(VehicleAreaZone::ROW_1_LEFT), {.floatValues = {16}}},
		{toInt(VehicleAreaZone::ROW_1_RIGHT), {.floatValues = {20}}}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::ENV_OUTSIDE_TEMPERATURE),
		.access = VehiclePropertyAccess::READ,
		// TODO(bryaneyler): Support ON_CHANGE as well.
		@@ -253,38 +208,35 @@ const ConfigDeclaration kVehicleProperties[] {
		.minSampleRate = 1.0f,
		.maxSampleRate = 2.0f,
		},
		.initialValue = { .floatValues = {25.0f} }
		},
		.initialValue = {.floatValues = {25.0f}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::NIGHT_MODE),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .int32Values = {0} }
		},
		.initialValue = {.int32Values = {0}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::DRIVING_STATUS),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .int32Values = { toInt(VehicleDrivingStatus::UNRESTRICTED) } }
		},
		.initialValue = {.int32Values = {toInt(VehicleDrivingStatus::UNRESTRICTED)}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::GEAR_SELECTION),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .int32Values = { toInt(VehicleGear::GEAR_PARK) } }
		},
		.initialValue = {.int32Values = {toInt(VehicleGear::GEAR_PARK)}}},

		{
		.config = {
		.config =
		{
		.prop = toInt(VehicleProperty::INFO_FUEL_CAPACITY),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::STATIC,
		@@ -292,48 +244,47 @@ const ConfigDeclaration kVehicleProperties[] {
		.initialValue = {.floatValues = {123000.0f}} // In Milliliters
		},

		{
		.config = {
		.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS),
		{.config = {.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.areaConfigs = {
		VehicleAreaConfig {
		.minInt32Value = 0,
		.maxInt32Value = 10
		}
		}
		},
		.initialValue = { .int32Values = {7} }
		},
		.areaConfigs = {VehicleAreaConfig{.minInt32Value = 0, .maxInt32Value = 10}}},
		.initialValue = {.int32Values = {7}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::IGNITION_STATE),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = { .int32Values = { toInt(VehicleIgnitionState::ON) } }
		},
		.initialValue = {.int32Values = {toInt(VehicleIgnitionState::ON)}}},

		{.config =
		{
		.config = {
		.prop = toInt(VehicleProperty::ENGINE_OIL_TEMP),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::CONTINUOUS,
		.minSampleRate = 0.1, // 0.1 Hz, every 10 seconds
		.maxSampleRate = 10, // 10 Hz, every 100 ms
		},
		.initialValue = { .floatValues = {101.0f} }
		},
		.initialValue = {.floatValues = {101.0f}}},

		{
		.config = {
		.config =
		{
		.prop = kGenerateFakeDataControllingProperty,
		.access = VehiclePropertyAccess::WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		}
		},

		{.config =
		{
		.prop = toInt(VehicleProperty::DOOR_LOCK),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = {.int32Values = {1}}}

		};

		} // impl