Skip to content
This repository was archived by the owner on Apr 6, 2020. It is now read-only.

Commit d673cbe

Browse files
authored
Merge pull request #280 from GiulioRomualdi/fix/wbd_in_simulation
Restore compatibility with YARP 3.2.0
2 parents ae3fcb2 + 218614f commit d673cbe

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icub-four-fts.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">
33

4-
<robot name="@WBD_YARP_ROBOT_NAME">
4+
<robot name="@WBD_YARP_ROBOT_NAME" build="1" xmlns:xi="http://www.w3.org/2001/XInclude">
55
<!-- controlboards -->
66
<device name="torso_mc" type="remote_controlboard">
77
<param name="remote"> /icub/torso </param>
@@ -120,5 +120,5 @@
120120
</device>
121121

122122
<!-- estimators -->
123-
<devices file="estimators/wholebodydynamics-external.xml" />
123+
<xi:include href="estimators/wholebodydynamics-external.xml" />
124124
</robot>

src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icub-six-fts-sim.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">
33

4-
<robot name="@WBD_YARP_ROBOT_NAME">
4+
<robot name="@WBD_YARP_ROBOT_NAME" build="1" xmlns:xi="http://www.w3.org/2001/XInclude">
55
<!-- controlboards -->
66
<device name="torso_mc" type="remote_controlboard">
77
<param name="remote"> /icubSim/torso </param>
@@ -94,5 +94,5 @@
9494
</device>
9595

9696
<!-- estimators -->
97-
<devices file="estimators/wholebodydynamics-external.xml" />
97+
<xi:include href="estimators/wholebodydynamics-external.xml" />
9898
</robot>

src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icub-six-fts.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">
33

4-
<robot name="@WBD_YARP_ROBOT_NAME">
4+
<robot name="@WBD_YARP_ROBOT_NAME" build="1" xmlns:xi="http://www.w3.org/2001/XInclude">
55
<!-- controlboards -->
66
<device name="torso_mc" type="remote_controlboard">
77
<param name="remote"> /icub/torso </param>
@@ -130,5 +130,5 @@
130130
</device>
131131

132132
<!-- estimators -->
133-
<devices file="estimators/wholebodydynamics-external.xml" />
133+
<xi:include href="estimators/wholebodydynamics-external.xml" />
134134
</robot>

src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icubheidelberg01.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">
33

4-
<robot name="iCubHeidelberg01">
4+
<robot name="iCubHeidelberg01" build="1" xmlns:xi="http://www.w3.org/2001/XInclude">
55
<!-- controlboards -->
66
<device name="torso_mc" type="remote_controlboard">
77
<param name="remote"> /icub/torso </param>
@@ -68,5 +68,5 @@
6868
</device>
6969

7070
<!-- estimators -->
71-
<devices file="estimators/wholebodydynamics-external.xml" />
71+
<xi:include href="estimators/wholebodydynamics-external.xml" />
7272
</robot>

0 commit comments

Comments
 (0)