Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 15:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "[hardware][interfaces][automotive] fix -Wreorder-init-list"

Browse Source 
am: 0d5782e99e

Change-Id: I6cf4376bbcbf7ae19f1e8ebfd443b7f96a16d545
This commit is contained in:
Nick Desaulniers
2019-10-21 11:31:44 -07:00
committed by android-build-merger
parent d3d760716e 0d5782e99e
commit 62a2c3a00e
4 changed files with 717 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1368
automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
View File

File diff suppressed because it is too large Load Diff

4
automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp
View File

@@ -249,8 +249,8 @@ void EmulatedVehicleHal::onCreate() {
// Create a separate instance for each individual zone
VehiclePropValue prop = {
.prop = cfg.prop,
.areaId = curArea,
.areaId = curArea,
.prop = cfg.prop,
};
if (it.initialAreaValues.size() > 0) {

8
automotive/vehicle/2.0/default/impl/vhal_v2_0/JsonFakeValueGenerator.cpp
View File

@@ -101,9 +101,11 @@ std::vector<VehiclePropValue> JsonFakeValueGenerator::parseFakeValueJson(std::is
rawEvent.toStyledString().c_str());
continue;
}
VehiclePropValue event = {.prop = rawEvent["prop"].asInt(),
.areaId = rawEvent["areaId"].asInt(),
.timestamp = rawEvent["timestamp"].asInt64()};
VehiclePropValue event = {
.timestamp = rawEvent["timestamp"].asInt64(),
.areaId = rawEvent["areaId"].asInt(),
.prop = rawEvent["prop"].asInt(),
};
Json::Value rawEventValue = rawEvent["value"];
auto& value = event.value;

13
automotive/vehicle/2.0/default/impl/vhal_v2_0/VehicleEmulator.cpp
View File

@@ -120,7 +120,10 @@ void VehicleEmulator::doGetProperty(VehicleEmulator::EmulatorMessage const& rxMs
}
{
VehiclePropValue request = { .prop = propId, .areaId = areaId };
VehiclePropValue request = {
.areaId = areaId,
.prop = propId,
};
StatusCode halStatus;
auto val = mHal->get(request, &halStatus);
if (val != nullptr) {
@@ -150,10 +153,10 @@ void VehicleEmulator::doSetProperty(VehicleEmulator::EmulatorMessage const& rxMs
VehicleEmulator::EmulatorMessage& respMsg) {
emulator::VehiclePropValue protoVal = rxMsg.value(0);
VehiclePropValue val = {
.prop = protoVal.prop(),
.areaId = protoVal.area_id(),
.status = (VehiclePropertyStatus)protoVal.status(),
.timestamp = elapsedRealtimeNano(),
.timestamp = elapsedRealtimeNano(),
.areaId = protoVal.area_id(),
.prop = protoVal.prop(),
.status = (VehiclePropertyStatus)protoVal.status(),
};
respMsg.set_msg_type(emulator::SET_PROPERTY_RESP);