Skip to content
Merged
Changes from all commits
Commits
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
43 changes: 13 additions & 30 deletions iCubGenova11/network.iCubGenova11.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@
<connected bus="CAN" />
</board>

<!--consistency issue in the discovery using gui, skipping for automatic firmware update process-->

<!-- <board type='mtb4' name="mtb4.left_arm.CAN1:8">
<board type='mtb4' name="mtb4.left_arm.CAN1:8">
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.24" canbus="1" canadr="8" />
<connected bus="CAN" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This line appears to use a tab character for indentation, which is inconsistent with other similar elements in this file that use spaces. For better maintainability and consistency, please use spaces for indentation.

Suggested change
<connected bus="CAN" />
<connected bus="CAN" />

Expand Down Expand Up @@ -187,7 +185,7 @@
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.24" canbus="1" canadr="14" />
<connected bus="CAN" />
</board> -->
</board>

</part>

Expand Down Expand Up @@ -259,9 +257,7 @@
<connected bus="CAN" />
</board>

<!--consistency issue in the discovery using gui, skipping for automatic firmware update process-->

<!--<board type='mtb4' name="mtb4.right_arm.CAN1:8">
<board type='mtb4' name="mtb4.right_arm.CAN1:8">
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.27" canbus="1" canadr="8" />
<connected bus="CAN" />
Expand Down Expand Up @@ -301,7 +297,7 @@
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.27" canbus="1" canadr="14" />
<connected bus="CAN" />
</board> -->
</board>

</part>

Expand Down Expand Up @@ -337,17 +333,8 @@
<ataddress ip="10.0.1.5" canbus="1" canadr="4" />
<connected bus="CAN" />
</board>


<!--
the torso hosts the skin read via mtb4 boards.
but the mtb4 boards are attached to board 10.0.1.22 that is located in the head
so, we put the mtb4 in here
-->

<!--consistency issue with the following boards at the discovery using the GUI-->

<!-- <board type='mtb4' name="mtb4.torso.CAN1:7">

<board type='mtb4' name="mtb4.torso.CAN1:7">
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.22" canbus="1" canadr="7" />
<connected bus="CAN" />
Expand All @@ -363,8 +350,14 @@
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.22" canbus="1" canadr="9" />
<connected bus="CAN" />
</board> -->
</board>

<board type='mtb4' name="mtb4.torso.CAN1:10">
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.22" canbus="1" canadr="10" />
<connected bus="CAN" />
</board>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This line contains only whitespace. For cleanliness, it's better to have it as a completely empty line.

</part>


Expand Down Expand Up @@ -437,8 +430,6 @@
<connected bus="CAN" />
</board>

<!-- removing mtb4 on leg
<board type='mtb4' name="mtb4.left_leg.CAN1:1">
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.10" canbus="1" canadr="1" />
Expand Down Expand Up @@ -516,9 +507,6 @@
<ataddress ip="10.0.1.10" canbus="2" canadr="13" />
<connected bus="CAN" />
</board>
removing mtb4 on leg
-->

</part>

Expand Down Expand Up @@ -593,8 +581,6 @@
<connected bus="CAN" />
</board>

<!-- removing mtb4 on leg
<board type='mtb4' name="mtb4.right_leg.CAN1:1">
<ondevice>ETH</ondevice>
<ataddress ip="10.0.1.11" canbus="1" canadr="1" />
Expand Down Expand Up @@ -672,9 +658,6 @@
<ataddress ip="10.0.1.11" canbus="2" canadr="13" />
<connected bus="CAN" />
</board>
removing mtb4 on leg
-->

</part>

Expand Down