Skip to content

Commit

Permalink
fixup forcetorque
Browse files Browse the repository at this point in the history
  • Loading branch information
traversaro authored Dec 4, 2021
1 parent 9071db9 commit 82902c5
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions plugins/forcetorque/src/ForceTorque.cc
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,20 @@ void GazeboYarpForceTorque::Load(sensors::SensorPtr _sensor, sdf::ElementPtr _sd
if( !m_iWrap->attachAll(driver_list) ) {
yError() << "GazeboYarpForceTorque : error in connecting wrapper and device ";
}
}

if(!driver_properties.check("yarpDeviceName"))
{
scopedDeviceName = m_sensorName + "::" + driver_list[0]->key;
}
else
{

if(!driver_properties.check("yarpDeviceName"))
{
scopedDeviceName = m_sensorName + "::" + driver_list[0]->key;
}
else
{
scopedDeviceName = m_sensorName + "::" + driver_properties.find("yarpDeviceName").asString();
}
} else {
scopedDeviceName = m_sensorName + "::" + driver_properties.find("yarpDeviceName").asString();
}


#else
if(!driver_properties.check("yarpDeviceName"))
{
Expand Down

0 comments on commit 82902c5

Please sign in to comment.