Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade robots to the latest NWS/NWC layers - 6 #329

Merged
merged 5 commits into from
May 13, 2022
Merged

Upgrade robots to the latest NWS/NWC layers - 6 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5498e1c
iCubNancy01 - updated files for nws layer
davidetome Jan 25, 2022
ae58bde
iCubNottingham01 - updated files for nws layer
davidetome Jan 25, 2022
b36eea3
iCubSheffield01 - updated files for nws layer
davidetome Jan 25, 2022
46f5f30
iCubTwente01 - updated files for nws layer
davidetome Jan 25, 2022
ee35cc1
files tested and fixed with XSD and XPATH
davidetome May 13, 2022
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 iCubNancy01/calibrators/head-calib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<param name="CALIB_ORDER"> (0 1 2) (3) (4) (5) </param>

<action level="10" phase="startup" type="calibrate">
<param name="target">head-mc_wrapper</param>
<param name="target">head-mc_remapper</param>
</action>

<action level="1" phase="interrupt1" type="park">
<param name="target">head-mc_wrapper</param>
<param name="target">head-mc_remapper</param>
</action>

<action level="1" phase="interrupt3" type="abort"/>
Expand Down
4 changes: 2 additions & 2 deletions iCubNancy01/calibrators/left_arm-calib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<param name="CALIB_ORDER">(0 1 2 3) (4 6 7) (5) (8 9 11 13) (10 12 14 15) </param>

<action level="10" phase="startup" type="calibrate">
<param name="target">left_arm-mc_wrapper</param>
<param name="target">left_arm-mc_remapper</param>
</action>

<action level="1" phase="interrupt1" type="park">
<param name="target">left_arm-mc_wrapper</param>
<param name="target">left_arm-mc_remapper</param>
</action>

<action level="1" phase="interrupt3" type="abort"/>
Expand Down
4 changes: 2 additions & 2 deletions iCubNancy01/calibrators/left_leg-calib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<param name="CALIB_ORDER"> (0 1 2 3 4 5)</param>

<action level="10" phase="startup" type="calibrate">
<param name="target">left_leg-mc_wrapper</param>
<param name="target">left_leg-mc_remapper</param>
</action>

<action level="1" phase="interrupt1" type="park">
<param name="target">left_leg-mc_wrapper</param>
<param name="target">left_leg-mc_remapper</param>
</action>

<action level="1" phase="interrupt3" type="abort"/>
Expand Down
4 changes: 2 additions & 2 deletions iCubNancy01/calibrators/right_arm-calib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<param name="CALIB_ORDER">(0 1 2 3) (4 6 7) (5) (8 9 11 13) (10 12 14 15) </param>

<action level="10" phase="startup" type="calibrate">
<param name="target">right_arm-mc_wrapper</param>
<param name="target">right_arm-mc_remapper</param>
</action>

<action level="1" phase="interrupt1" type="park">
<param name="target">right_arm-mc_wrapper</param>
<param name="target">right_arm-mc_remapper</param>
</action>

<action level="1" phase="interrupt3" type="abort"/>
Expand Down
4 changes: 2 additions & 2 deletions iCubNancy01/calibrators/right_leg-calib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<param name="CALIB_ORDER">(0 1 2 3 4 5) </param>

<action level="10" phase="startup" type="calibrate">
<param name="target">right_leg-mc_wrapper</param>
<param name="target">right_leg-mc_remapper</param>
</action>

<action level="1" phase="interrupt1" type="park">
<param name="target">right_leg-mc_wrapper</param>
<param name="target">right_leg-mc_remapper</param>
</action>

<action level="1" phase="interrupt3" type="abort"/>
Expand Down
4 changes: 2 additions & 2 deletions iCubNancy01/calibrators/torso-calib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<param name="CALIB_ORDER"> (0 1 2) </param>

<action level="10" phase="startup" type="calibrate">
<param name="target">torso-mc_wrapper</param>
<param name="target">torso-mc_remapper</param>
</action>

<action level="1" phase="interrupt1" type="park">
<param name="target">torso-mc_wrapper</param>
<param name="target">torso-mc_remapper</param>
</action>

<action level="1" phase="interrupt3" type="abort"/>
Expand Down
4 changes: 2 additions & 2 deletions iCubNancy01/cartesian/left_arm-cartesian.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

<action phase="startup" level="15" type="attach">
<paramlist name="networks">
<elem name="torso">torso-mc_wrapper</elem>
<elem name="left_arm">left_arm-mc_wrapper</elem>
<elem name="torso">torso-mc_remapper</elem>
<elem name="left_arm">left_arm-mc_remapper</elem>
</paramlist>
</action>

Expand Down
4 changes: 2 additions & 2 deletions iCubNancy01/cartesian/right_arm-cartesian.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

<action phase="startup" level="15" type="attach">
<paramlist name="networks">
<elem name="torso">torso-mc_wrapper</elem>
<elem name="right_arm">right_arm-mc_wrapper</elem>
<elem name="torso">torso-mc_remapper</elem>
<elem name="right_arm">right_arm-mc_remapper</elem>
</paramlist>
</action>

Expand Down
37 changes: 23 additions & 14 deletions iCubNancy01/icub_all.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,42 @@
<xi:include href="cartesian/left_arm-cartesian.xml" />
<xi:include href="cartesian/right_arm-cartesian.xml" />

<!-- motor controllers wrappers -->
<xi:include href="wrappers/motorControl/left_arm-mc_wrapper.xml" />
<xi:include href="wrappers/motorControl/right_arm-mc_wrapper.xml" />
<xi:include href="wrappers/motorControl/left_leg-mc_wrapper.xml" />
<xi:include href="wrappers/motorControl/right_leg-mc_wrapper.xml" />
<xi:include href="wrappers/motorControl/head-mc_wrapper.xml" />
<xi:include href="wrappers/motorControl/torso-mc_wrapper.xml" />

<xi:include href="wrappers/motorControl/left_arm-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/right_arm-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/left_leg-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/right_leg-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/head-mc_remapper.xml" />
<xi:include href="wrappers/motorControl/torso-mc_remapper.xml" />

<!-- HEAD -->
<xi:include href="hardware/motorControl/head-cfw2_can0-mc.xml" />
<xi:include href="wrappers/motorControl/head-mc_wrapper.xml" />

<!-- TORSO -->
<xi:include href="hardware/motorControl/torso-eb5-j0_2-mc.xml" />
<xi:include href="wrappers/motorControl/torso-mc_wrapper.xml" />

<!-- LEFT ARM -->
<xi:include href="hardware/motorControl/left_arm-eb1-j0_3-mc.xml" />
<xi:include href="hardware/motorControl/left_arm-eb2-j4_15-mc.xml" />
<xi:include href="wrappers/motorControl/left_arm-mc_wrapper.xml" />

<!-- RIGHT ARM -->
<xi:include href="hardware/motorControl/right_arm-eb3-j0_3-mc.xml" />
<xi:include href="hardware/motorControl/right_arm-eb4-j4_15-mc.xml" />
<xi:include href="wrappers/motorControl/right_arm-mc_wrapper.xml" />

<!-- LEFT LEG -->
<xi:include href="hardware/motorControl/left_leg-eb6-j0_3-mc.xml" />
<xi:include href="hardware/motorControl/left_leg-eb7-j4_5-mc.xml" />

<!-- RIGHT LEG -->
<xi:include href="hardware/motorControl/right_leg-eb8-j0_3-mc.xml" />
<xi:include href="hardware/motorControl/right_leg-eb9-j4_5-mc.xml" />

<!-- ANALOG SENSOR FT -->
<xi:include href="wrappers/FT/left_arm-FT_wrapper.xml" />
Expand Down Expand Up @@ -55,16 +74,6 @@
<xi:include href="wrappers/MAIS/right_arm-mais_wrapper.xml" />
<xi:include href="hardware/MAIS/left_arm-eb2-j4_15-mais.xml" />
<xi:include href="hardware/MAIS/right_arm-eb4-j4_15-mais.xml" />

<!-- LEFT LEG -->
<xi:include href="hardware/motorControl/left_leg-eb6-j0_3-mc.xml" />
<xi:include href="hardware/motorControl/left_leg-eb7-j4_5-mc.xml" />
<xi:include href="wrappers/motorControl/left_leg-mc_wrapper.xml" />

<!-- RIGHT LEG -->
<xi:include href="hardware/motorControl/right_leg-eb8-j0_3-mc.xml" />
<xi:include href="hardware/motorControl/right_leg-eb9-j4_5-mc.xml" />
<xi:include href="wrappers/motorControl/right_leg-mc_wrapper.xml" />

<!-- INERTIAL SENSOR-->
<xi:include href="wrappers/inertials/head-imuFilter_wrapper.xml" />
Expand Down
15 changes: 15 additions & 0 deletions iCubNancy01/wrappers/motorControl/head-mc_remapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?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="head-mc_remapper" type="controlboardremapper">
<paramlist name="networks">
<elem name="head_joints">( 0 5 0 5 )</elem>
</paramlist>
<param name="joints"> 6 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="head_joints"> head-cfw2_can0-mc </elem>
</paramlist>
</action>
<action phase="shutdown" level="20" type="detach" />
</device>
22 changes: 7 additions & 15 deletions iCubNancy01/wrappers/motorControl/head-mc_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
<?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="head-mc_wrapper" type="controlboardwrapper2">
<paramlist name="networks">
<elem name="FirstSetOfJoints">( 0 5 0 5 )</elem>
</paramlist>
<param name="period"> 10 </param>
<param name="name"> /icub/head </param>
<param name="ports"> head </param>
<param name="joints"> 6 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="FirstSetOfJoints"> head-cfw2_can0-mc </elem>
<elem name="Calibrator"> head-calibrator </elem>
</paramlist>

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="head-mc_nws_yarp" type="controlBoard_nws_yarp">
<param name="name"> /icub/head </param>
<action phase="startup" level="10" type="attach">
<param name="device"> head-mc_remapper </param>
</action>
<action phase="shutdown" level="5" type="detach" />
</device>
<action phase="shutdown" level="15" type="detach" />
</device>
17 changes: 17 additions & 0 deletions iCubNancy01/wrappers/motorControl/left_arm-mc_remapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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_arm-mc_remapper" type="controlboardremapper">
<paramlist name="networks">
<elem name="left_arm_joints1">( 0 3 0 3 )</elem>
<elem name="left_arm_joints2">( 4 15 0 11 )</elem>
</paramlist>
<param name="joints"> 16 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="left_arm_joints1"> left_arm-eb1-j0_3-mc </elem>
<elem name="left_arm_joints2"> left_arm-eb2-j4_15-mc </elem>
</paramlist>
</action>
<action phase="shutdown" level="20" type="detach" />
</device>
26 changes: 7 additions & 19 deletions iCubNancy01/wrappers/motorControl/left_arm-mc_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
<?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_arm-mc_wrapper" type="controlboardwrapper2">
<paramlist name="networks">
<!-- elem name hereafter are custom names that live only in this file, they are used in the attach phase -->
<elem name="FirstSetOfJoints">( 0 3 0 3 )</elem>
<elem name="SecondSetOfJoints">( 4 15 0 11 )</elem>
</paramlist>
<param name="period"> 10 </param>
<param name="name"> /icub/left_arm </param>
<param name="ports"> left_arm </param>
<param name="joints"> 16 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<!-- The param value must match the device name in the corresponding body_part-ebX-jA_B-mc.xml file -->
<elem name="FirstSetOfJoints"> left_arm-eb1-j0_3-mc </elem>
<elem name="SecondSetOfJoints"> left_arm-eb2-j4_15-mc </elem>
<elem name="Calibrator"> left_arm-calibrator </elem>
</paramlist>

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_arm-mc_nws_yarp" type="controlBoard_nws_yarp">
<param name="name"> /icub/left_arm </param>
<action phase="startup" level="10" type="attach">
<param name="device"> left_arm-mc_remapper </param>
</action>
<action phase="shutdown" level="5" type="detach" />
</device>
<action phase="shutdown" level="15" type="detach" />
</device>
16 changes: 16 additions & 0 deletions iCubNancy01/wrappers/motorControl/left_leg-mc_remapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?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-mc_remapper" type="controlboardremapper">
<paramlist name="networks">
<elem name="left_leg_joints1">( 0 3 0 3 )</elem>
<elem name="left_leg_joints2">( 4 5 0 1 )</elem>
</paramlist>
<param name="joints"> 6 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="left_leg_joints1"> left_leg-eb6-j0_3-mc </elem>
<elem name="left_leg_joints2"> left_leg-eb7-j4_5-mc </elem>
</paramlist>
</action>
<action phase="shutdown" level="20" type="detach" />
</device>
26 changes: 7 additions & 19 deletions iCubNancy01/wrappers/motorControl/left_leg-mc_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
<?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-mc_wrapper" type="controlboardwrapper2">
<paramlist name="networks">
<!-- elem name hereafter are custom names that live only in this file, they are used in the attach phase -->
<elem name="FirstSetOfJoints">( 0 3 0 3 )</elem>
<elem name="SecondSetOfJoints">( 4 5 0 1 )</elem>
</paramlist>
<param name="period"> 10 </param>
<param name="name"> /icub/left_leg </param>
<param name="ports"> left_leg </param>
<param name="joints"> 6 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<!-- The param value must match the device name in the corresponding body_part-ebx-mc file -->
<elem name="FirstSetOfJoints"> left_leg-eb6-j0_3-mc </elem>
<elem name="SecondSetOfJoints"> left_leg-eb7-j4_5-mc </elem>
<elem name="Calibrator"> left_leg-calibrator </elem>
</paramlist>

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="left_leg-mc_nws_yarp" type="controlBoard_nws_yarp">
<param name="name"> /icub/left_leg </param>
<action phase="startup" level="10" type="attach">
<param name="device"> left_leg-mc_remapper </param>
</action>
<action phase="shutdown" level="5" type="detach" />
</device>
<action phase="shutdown" level="15" type="detach" />
</device>
17 changes: 17 additions & 0 deletions iCubNancy01/wrappers/motorControl/right_arm-mc_remapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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_arm-mc_remapper" type="controlboardremapper">
<paramlist name="networks">
<elem name="right_arm_joints1">( 0 3 0 3 )</elem>
<elem name="right_arm_joints2">( 4 15 0 11 )</elem>
</paramlist>
<param name="joints"> 16 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="right_arm_joints1"> right_arm-eb3-j0_3-mc </elem>
<elem name="right_arm_joints2"> right_arm-eb4-j4_15-mc </elem>
</paramlist>
</action>
<action phase="shutdown" level="20" type="detach" />
</device>
26 changes: 7 additions & 19 deletions iCubNancy01/wrappers/motorControl/right_arm-mc_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
<?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_arm-mc_wrapper" type="controlboardwrapper2">
<paramlist name="networks">
<!-- elem name hereafter are custom names that live only in this file, they are used in the attach phase -->
<elem name="FirstSetOfJoints">( 0 3 0 3 )</elem>
<elem name="SecondSetOfJoints">( 4 15 0 11 )</elem>
</paramlist>
<param name="period"> 10 </param>
<param name="name"> /icub/right_arm </param>
<param name="ports"> right_arm </param>
<param name="joints"> 16 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<!-- The param value must match the device name in the corresponding right_lower_arm-jx_y-mc.xml file -->
<elem name="FirstSetOfJoints"> right_arm-eb3-j0_3-mc </elem>
<elem name="SecondSetOfJoints"> right_arm-eb4-j4_15-mc </elem>
<elem name="Calibrator"> right_arm-calibrator </elem>
</paramlist>

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="right_arm-mc_nws_yarp" type="controlBoard_nws_yarp">
<param name="name"> /icub/right_arm </param>
<action phase="startup" level="10" type="attach">
<param name="device"> right_arm-mc_remapper </param>
</action>
<action phase="shutdown" level="5" type="detach" />
</device>
<action phase="shutdown" level="15" type="detach" />
</device>
16 changes: 16 additions & 0 deletions iCubNancy01/wrappers/motorControl/right_leg-mc_remapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?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-mc_remapper" type="controlboardremapper">
<paramlist name="networks">
<elem name="right_leg_joints1">( 0 3 0 3 )</elem>
<elem name="right_leg_joints2">( 4 5 0 1 )</elem>
</paramlist>
<param name="joints"> 6 </param>
<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="right_leg_joints1"> right_leg-eb8-j0_3-mc </elem>
<elem name="right_leg_joints2"> right_leg-eb9-j4_5-mc </elem>
</paramlist>
</action>
<action phase="shutdown" level="20" type="detach" />
</device>
Loading