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

Restore compatibility with YARP 3.2.0 #280

Merged
merged 3 commits into from
Oct 22, 2019
Merged

Restore compatibility with YARP 3.2.0 #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f79292
update launch-wholebodydynamics-icub-six-fts-sim.xml and wholebodydyn…
GiulioRomualdi Jul 24, 2019
f9e73c4
Revert changes in the included external device config file.
nunoguedelha Oct 21, 2019
218614f
Fixed the other application files.
nunoguedelha Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icub-four-fts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">

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

<!-- estimators -->
<devices file="estimators/wholebodydynamics-external.xml" />
<xi:include href="estimators/wholebodydynamics-external.xml" />
</robot>
4 changes: 2 additions & 2 deletions src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icub-six-fts-sim.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">

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

<!-- estimators -->
<devices file="estimators/wholebodydynamics-external.xml" />
<xi:include href="estimators/wholebodydynamics-external.xml" />
</robot>
4 changes: 2 additions & 2 deletions src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icub-six-fts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">

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

<!-- estimators -->
<devices file="estimators/wholebodydynamics-external.xml" />
<xi:include href="estimators/wholebodydynamics-external.xml" />
</robot>
4 changes: 2 additions & 2 deletions src/devices/wholeBodyDynamics/app/launch-wholebodydynamics-icubheidelberg01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE devices PUBLIC "-//YARP//DTD yarprobotinterface 3.0//EN" "http://www.yarp.it/DTD/yarprobotinterfaceV3.0.dtd">

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

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