-
Notifications
You must be signed in to change notification settings - Fork 195
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
Add support for HC10DTP #541
Add support for HC10DTP #541
Conversation
Personal branch update
…into kinetic-devel
…into kinetic-devel
…into kinetic-devel
Is there an Also, the files are labeled as |
No. I just didn't know the difference |
motoman_hc10_support/launch/robot_interface_streaming_hc10dtp_b00.launch
Outdated
Show resolved
Hide resolved
motoman_hc10_support/launch/robot_state_visualize_hc10dtp_b00.launch
Outdated
Show resolved
Hide resolved
just for reference, the full name of the HC10-DTP version with IP67 and "Food grade grease" is The non-dust/food-safe version appears to be called "HC10DTP Classic" here, with the model number Both DTP variants have |
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.
should this file be part of the PR?
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.
I created a PR in Erics repo with the suggestions by gavanderhoorn and some minor corrections by me
EricMarcil#10
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.
@cjue
Thanks for getting this done.
I've merge the changes to my branch.
@gavanderhoorn
We should be good to merge this pull request.
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.
@EricMarcil could you please rebase your HC10DTP-Update
branch to ros-industrial:kinetic-devel
? It appears the kinetic-devel
in your repo is not identical to the one in ros-industrial
.
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.
@cjue Rebase should be done now. Hopefully, I've done it properly.
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.
@cjue Rebase should be done now. Hopefully, I've done it properly.
Almost right, the branch has the right content but the commit history is more complicated because of the merge than it would be with a rebase.
The git CLI commands for rebasing the branch look like this, if you are using the shell:
git checkout HC10DTP-Update
# upstream is my name for the ros-industrial repo
git rebase -i upstream/kinetic-devel # "-i" allows you to check that exactly the expected commits will be rebased
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 should in a commit history like this:
https://github.com/isys-vision/motoman/tree/HC10DTP-Update_rebase
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.
@cjue So what is our next step here? Do we go with the commit as is? Or do you want to make a new PR?
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.
I would prefer a PR with just the four new commits.
I just opened a replacement-PR with the four commits here, without the extra merge of newer kinetic-devel commits:
#573
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.
@gavanderhoorn all your feedback has been applied in the replacement PR #573
Added support for HC10DTP (1-06VXCP10-B0*)
The DTP model was originally set as 'dtp-b10' but it should be 'dtp-b00'. File names and references were corrected to 'dtp-b00'
1b01b38
to
201ff28
Compare
Closing. Replaced by #573 |
Added support for HC10DTP (1-06VXCP10-B0*)