Skip to content

Commit 6e24146

Browse files
authored
Merge branch 'main' into wide_angle_camera
2 parents cc1fa5a + 892c296 commit 6e24146

File tree

6 files changed

+6
-16
lines changed

6 files changed

+6
-16
lines changed

src/systems/air_pressure/AirPressure.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ void AirPressure::PostUpdate(const UpdateInfo &_info,
123123
for (auto &it : this->dataPtr->entitySensorMap)
124124
{
125125
// Update measurement time
126-
auto time = math::durationToSecNsec(_info.simTime);
127-
dynamic_cast<sensors::Sensor *>(it.second.get())->Update(
128-
math::secNsecToDuration(time.first, time.second), false);
126+
it.second->Update(_info.simTime, false);
129127
}
130128
}
131129

src/systems/altimeter/Altimeter.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,7 @@ void Altimeter::PostUpdate(const UpdateInfo &_info,
124124
for (auto &it : this->dataPtr->entitySensorMap)
125125
{
126126
// Update measurement time
127-
auto time = math::durationToSecNsec(_info.simTime);
128-
dynamic_cast<sensors::Sensor *>(it.second.get())->Update(
129-
math::secNsecToDuration(time.first, time.second), false);
127+
it.second->Update(_info.simTime, false);
130128
}
131129
}
132130

src/systems/force_torque/ForceTorque.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void ForceTorque::PostUpdate(const UpdateInfo &_info,
136136

137137
for (auto &it : this->dataPtr->entitySensorMap)
138138
{
139-
it.second.get()->sensors::Sensor::Update(_info.simTime, false);
139+
it.second->Update(_info.simTime, false);
140140
}
141141
}
142142

src/systems/imu/Imu.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ void Imu::PostUpdate(const UpdateInfo &_info,
127127
for (auto &it : this->dataPtr->entitySensorMap)
128128
{
129129
// Update measurement time
130-
auto time = math::durationToSecNsec(_info.simTime);
131-
dynamic_cast<sensors::Sensor *>(it.second.get())->Update(
132-
math::secNsecToDuration(time.first, time.second), false);
130+
it.second->Update(_info.simTime, false);
133131
}
134132
}
135133

src/systems/logical_camera/LogicalCamera.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,7 @@ void LogicalCamera::PostUpdate(const UpdateInfo &_info,
126126
for (auto &it : this->dataPtr->entitySensorMap)
127127
{
128128
// Update sensor
129-
auto time = math::durationToSecNsec(_info.simTime);
130-
dynamic_cast<sensors::Sensor *>(it.second.get())->Update(
131-
math::secNsecToDuration(time.first, time.second), false);
129+
it.second->Update(_info.simTime, false);
132130
}
133131
}
134132

src/systems/magnetometer/Magnetometer.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ void Magnetometer::PostUpdate(const UpdateInfo &_info,
125125
for (auto &it : this->dataPtr->entitySensorMap)
126126
{
127127
// Update measurement time
128-
auto time = math::durationToSecNsec(_info.simTime);
129-
dynamic_cast<sensors::Sensor *>(it.second.get())->Update(
130-
math::secNsecToDuration(time.first, time.second), false);
128+
it.second->Update(_info.simTime, false);
131129
}
132130
}
133131

0 commit comments

Comments
 (0)