Skip to content

Commit

Permalink
Merge pull request #239 from martinaxgloria/fix/refactorFT
Browse files Browse the repository at this point in the history
Refactoring of FT configurations for publishing them divided per parts
  • Loading branch information
traversaro authored Jun 5, 2023
2 parents fd2d430 + c76b4fe commit 3d66375
Show file tree
Hide file tree
Showing 21 changed files with 115 additions and 141 deletions.
8 changes: 4 additions & 4 deletions simmechanics/data/icub2_5/conf/icub.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<xi:include href="wrappers/motorControl/head-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/torso-mc_remapper.xml" />
<!-- ANALOG SENSORS FT -->
<xi:include href="wrappers/FT/left_foot-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_foot-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_leg-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_leg-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_leg-FT_remapper.xml" />
<xi:include href="wrappers/FT/right_leg-FT_remapper.xml" />
<xi:include href="wrappers/FT/left_arm-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_arm-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_leg_hip-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_leg_hip-FT_wrapper.xml" />

<!-- INERTIAL SENSOR-->
<xi:include href="wrappers/inertials/head-inertials_wrapper.xml" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_arm-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/left_arm </param>
<param name="name"> ${portprefix}/left_arm/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_leg-FT_remapper" type="multipleanalogsensorsremapper">
<param name="SixAxisForceTorqueSensorsNames">
(l_leg_ft_sensor l_foot_ft_sensor)
</param>
<param name="TemperatureSensorsNames">
(l_leg_ft_sensor l_foot_ft_sensor)
</param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="left_leg_ft_sensor"> icub_left_leg_ft </elem>
<elem name="left_foot_ft_sensor"> icub_left_foot_ft </elem>
</paramlist>
</action>

<action phase="shutdown" level="20" type="detach" />
</device>
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_foot-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/left_foot </param>
<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_leg-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/left_leg/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
<elem name="FirstStrain"> icub_left_foot_ft </elem>
<elem name="FirstStrain"> left_leg-FT_remapper </elem>
</paramlist>
</action>

<action phase="shutdown" level="15" type="detach" />
</device>

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_arm-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/right_arm </param>
<param name="name"> ${portprefix}/right_arm/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_leg-FT_remapper" type="multipleanalogsensorsremapper">
<param name="SixAxisForceTorqueSensorsNames">
(r_leg_ft_sensor r_foot_ft_sensor)
</param>
<param name="TemperatureSensorsNames">
(r_leg_ft_sensor r_foot_ft_sensor)
</param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="right_leg_ft_sensor"> icub_right_leg_ft </elem>
<elem name="right_foot_ft_sensor"> icub_right_foot_ft </elem>
</paramlist>
</action>

<action phase="shutdown" level="20" type="detach" />
</device>
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_leg_hip-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/right_leg_hip </param>
<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_leg-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/right_leg/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
<elem name="FirstStrain"> icub_right_leg_ft </elem>
<elem name="FirstStrain"> right_leg-FT_remapper </elem>
</paramlist>
</action>

<action phase="shutdown" level="15" type="detach" />
</device>

This file was deleted.

10 changes: 4 additions & 6 deletions simmechanics/data/icub3/conf/icub.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
<xi:include href="wrappers/motorControl/head-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/torso-mc_remapper.xml" />
<!-- ANALOG SENSORS FT -->
<xi:include href="wrappers/FT/left_foot-FT_remapper.xml" />
<xi:include href="wrappers/FT/right_foot-FT_remapper.xml" />
<xi:include href="wrappers/FT/left_foot-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_foot-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_leg-FT_remapper.xml" />
<xi:include href="wrappers/FT/right_leg-FT_remapper.xml" />
<xi:include href="wrappers/FT/left_leg-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_leg-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_arm-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_arm-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_leg_hip-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_leg_hip-FT_wrapper.xml" />

<!-- INERTIAL SENSOR-->
<xi:include href="wrappers/inertials/head-inertials_wrapper.xml" />
Expand Down
12 changes: 5 additions & 7 deletions simmechanics/data/icub3/conf/icub_ROS2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
<xi:include href="wrappers/motorControl/head-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/torso-mc_remapper.xml" />
<!-- ANALOG SENSORS FT -->
<xi:include href="wrappers/FT/left_foot-FT_remapper.xml" />
<xi:include href="wrappers/FT/right_foot-FT_remapper.xml" />
<xi:include href="wrappers/FT/left_foot-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_foot-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_leg-FT_remapper.xml" />
<xi:include href="wrappers/FT/left_leg-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_leg-FT_remapper.xml" />
<xi:include href="wrappers/FT/right_leg-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_arm-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_arm-FT_wrapper.xml" />
<xi:include href="wrappers/FT/right_leg_hip-FT_wrapper.xml" />
<xi:include href="wrappers/FT/left_leg_hip-FT_wrapper.xml" />

<!-- INERTIAL SENSOR-->
<xi:include href="wrappers/inertials/head-inertials_wrapper.xml" />
Expand All @@ -41,7 +39,7 @@
<xi:include href="wrappers/FT/right_foot-FT_nws_ros2.xml" />
<xi:include href="wrappers/FT/left_leg_hip-FT_nws_ros2.xml" />
<xi:include href="wrappers/FT/right_leg_hip-FT_nws_ros2.xml" />
<xi:include href="wrappers/FT/left_arm-FT_nws_ros2.xml" /> -->
<xi:include href="wrappers/FT/left_arm-FT_nws_ros2.xml" />
<xi:include href="wrappers/FT/right_arm-FT_nws_ros2.xml" />
</devices>
</robot>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_arm-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/left_arm </param>
<param name="name"> ${portprefix}/left_arm/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
Expand Down
16 changes: 0 additions & 16 deletions simmechanics/data/icub3/conf/wrappers/FT/left_foot-FT_remapper.xml

This file was deleted.

17 changes: 0 additions & 17 deletions simmechanics/data/icub3/conf/wrappers/FT/left_foot-FT_wrapper.xml

This file was deleted.

21 changes: 21 additions & 0 deletions simmechanics/data/icub3/conf/wrappers/FT/left_leg-FT_remapper.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_leg-FT_remapper" type="multipleanalogsensorsremapper">
<param name="SixAxisForceTorqueSensorsNames">
(l_leg_ft_sensor l_foot_rear_ft_sensor l_foot_front_ft_sensor)
</param>
<param name="TemperatureSensorsNames">
(l_leg_ft_sensor l_foot_rear_ft_sensor l_foot_front_ft_sensor)
</param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="left_leg_ft_sensor"> icub_left_leg_ft </elem>
<elem name="left_foot_rear_ft_sensor"> icub_left_foot_rear_ft </elem>
<elem name="left_foot_front_ft_sensor"> icub_left_foot_front_ft </elem>
</paramlist>
</action>

<action phase="shutdown" level="20" type="detach" />
</device>
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_leg_hip-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/left_leg_hip </param>
<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_leg-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/left_leg/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
<elem name="FirstStrain"> icub_left_leg_ft </elem>
<elem name="FirstStrain"> left_leg-FT_remapper </elem>
</paramlist>
</action>

<action phase="shutdown" level="15" type="detach" />
</device>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_arm-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/right_arm </param>
<param name="name"> ${portprefix}/right_arm/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
Expand Down

This file was deleted.

17 changes: 0 additions & 17 deletions simmechanics/data/icub3/conf/wrappers/FT/right_foot-FT_wrapper.xml

This file was deleted.

21 changes: 21 additions & 0 deletions simmechanics/data/icub3/conf/wrappers/FT/right_leg-FT_remapper.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_leg-FT_remapper" type="multipleanalogsensorsremapper">
<param name="SixAxisForceTorqueSensorsNames">
(r_leg_ft_sensor r_foot_rear_ft_sensor r_foot_front_ft_sensor)
</param>
<param name="TemperatureSensorsNames">
(r_leg_ft_sensor r_foot_rear_ft_sensor r_foot_front_ft_sensor)
</param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="right_leg_ft_sensor"> icub_right_leg_ft </elem>
<elem name="right_foot_rear_ft_sensor"> icub_right_foot_rear_ft </elem>
<elem name="right_foot_front_ft_sensor"> icub_right_foot_front_ft </elem>
</paramlist>
</action>

<action phase="shutdown" level="20" type="detach" />
</device>
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">


<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_foot-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/right_foot </param>
<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_leg-FT_wrapper" type="multipleanalogsensorsserver">
<param name="period"> 10 </param>
<param name="name"> ${portprefix}/right_leg/FT </param>

<action phase="startup" level="10" type="attach">
<paramlist name="networks">
<elem name="FirstStrain"> icub_right_foot_ft </elem>
<elem name="FirstStrain"> right_leg-FT_remapper </elem>
</paramlist>
</action>

<action phase="shutdown" level="15" type="detach" />
</device>

0 comments on commit 3d66375

Please sign in to comment.