-
Notifications
You must be signed in to change notification settings - Fork 73
new version of network.iCubGenova11.xml after uncommenting the mtb4 b… #753
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" /> | ||
|
@@ -187,7 +185,7 @@ | |
<ondevice>ETH</ondevice> | ||
<ataddress ip="10.0.1.24" canbus="1" canadr="14" /> | ||
<connected bus="CAN" /> | ||
</board> --> | ||
</board> | ||
|
||
</part> | ||
|
||
|
@@ -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" /> | ||
|
@@ -301,7 +297,7 @@ | |
<ondevice>ETH</ondevice> | ||
<ataddress ip="10.0.1.27" canbus="1" canadr="14" /> | ||
<connected bus="CAN" /> | ||
</board> --> | ||
</board> | ||
|
||
</part> | ||
|
||
|
@@ -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" /> | ||
|
@@ -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> | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
</part> | ||
|
||
|
||
|
@@ -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" /> | ||
|
@@ -516,9 +507,6 @@ | |
<ataddress ip="10.0.1.10" canbus="2" canadr="13" /> | ||
<connected bus="CAN" /> | ||
</board> | ||
removing mtb4 on leg | ||
--> | ||
|
||
</part> | ||
|
||
|
@@ -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" /> | ||
|
@@ -672,9 +658,6 @@ | |
<ataddress ip="10.0.1.11" canbus="2" canadr="13" /> | ||
<connected bus="CAN" /> | ||
</board> | ||
removing mtb4 on leg | ||
--> | ||
|
||
</part> | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.