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.

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

Fix minor issues in iCubGazeboV3_visuomanip #176

Merged
merged 3 commits into from
Dec 13, 2022

Conversation

mebbaid
Copy link
Contributor

@mebbaid mebbaid commented Oct 18, 2022

This is a PR that fixes

When finialized, this PR should close #169

@mebbaid
Copy link
Contributor Author

mebbaid commented Oct 18, 2022

This is a draft PR for now. I will squash, and cancel irrelevant commits and select only unmerged commits.
Once cleaned, i will put it up for review.

@mebbaid mebbaid marked this pull request as ready for review December 1, 2022 11:15
@xEnVrE
Copy link
Contributor

xEnVrE commented Dec 1, 2022

Hi @mebbaid,

if I am not wrong this PR is also changing the files associated to the iCubGazeboV2_5_visuomanip model. Is this a mistake or is it intended? I am referring to these changes.

Thank you

@mebbaid
Copy link
Contributor Author

mebbaid commented Dec 1, 2022

Hi @mebbaid,

if I am not wrong this PR is also changing the files associated to the iCubGazeboV2_5_visuomanip model. Is this a mistake or is it intended? I am referring to these changes.

Thank you

Thanks for the catch @xEnVrE , indeed these changes are probably a copy mistake. Will discard them.

@traversaro
Copy link
Member

@mebbaid can you rebase on top of master? It seems that there is the commit f547a99 in this release that actually already belongs to master.

parent 530d017
author mebbaid <mohd-b-mohd@hotmail.com> 1669978606 +0100
committer mebbaid <mohd-b-mohd@hotmail.com> 1669978616 +0100

fix rebase conflict

restore current version

added missing velocityControlImplementationType  param in config variables

delete un-used config files

add arm_no_hand config files to conf_manual

Fix Hands weird position

hand location fix

fix r_hand collision group

fix r_wrist_axis, play with camera sensors

correct file name in l_eye sensor

fix flipped pose of rgb sensors

fix l_eye and r_eye pan axis

Fix to make sure that ROS2 can find the iCub package (robotology#178)
@mebbaid
Copy link
Contributor Author

mebbaid commented Dec 2, 2022

Hi @mebbaid,

if I am not wrong this PR is also changing the files associated to the iCubGazeboV2_5_visuomanip model. Is this a mistake or is it intended? I am referring to these changes.

Thank you

Hi @xEnVrE , I was indeed confused why the file changed since the output of git log --follow iCub_manual/robots/iCubGazeboV2_5_visuomanip/model.urdf gives me the following

(base) mebbaid@IITICUBLAP213:~/robot-code/mebbaid_icub-models/icub-models$ git log --follow iCub_manual/robots/iCubGazeboV2_5_visuomanip/model.urdf
commit 0a00225459d35eb45e8be676388ee906c4dc2cb1
Author: Nicola Piga <nicolapiga@gmail.com>
Date:   Mon Mar 14 11:28:51 2022 +0100

    Fix wrong collision of 'l_hand_little_1' in iCub_manual/iCubGazeboV2_5

commit 6f1d59b59aaa024dc9117c6523e22c8baaf05f26
Author: Nicola Piga <nicolapiga@gmail.com>
Date:   Fri Mar 11 17:43:17 2022 +0100

    Fix material colors of iCub_manual/iCubGazeboV2_5_visuomanip as per https://github.com/robotology/icub-models-generator/pull/217

commit ac14772fb48d8aa887bc3b2397491e5762749745
Author: Ugo Pattacini <ugo.pattacini@iit.it>
Date:   Sun Jul 26 16:28:40 2020 +0200

    address #44

commit e0b88c461e7996003bdfe340cef9ea741f3ecf6c
Author: Nicola Piga <nicolapiga@gmail.com>
Date:   Thu Jul 23 17:11:30 2020 +0200

    Add model iCub_manual/iCubGazeboV2_5_visuomanip

with no local changes. Hopefully things should be ok now.

Copy link
Member

@Nicogene Nicogene left a comment

Choose a reason for hiding this comment

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

My comments are related to the network wrappers used, in general we should port all the models to the new one for supporting future versions of YARP

cc @traversaro

@traversaro traversaro merged commit 97b5662 into robotology:master Dec 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create iCubGazeboV3_visuomanip
4 participants