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

Jump to bottom

Update the calibrators for ergoCubSN001 (right arm and right hip roll) #630

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Update the calibrators for ergoCubSN001 (right arm and right hip roll) #630

merged 3 commits into from
Mar 14, 2024

Conversation

GiulioRomualdi
Copy link
Member

This PR updates the calibrators for right arm and right hip roll after the robot maintenance.

@pattacini
Copy link
Member

We have conflicts to handle, @GiulioRomualdi.
Could you have a look?

pattacini
pattacini requested changes Mar 14, 2024
View reviewed changes
Copy link
Member

@pattacini pattacini left a comment

Choose a reason for hiding this comment

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

Some conflicts to handle

@GiulioRomualdi
Copy link
Member Author

There is a conflict with ergoCubSN001/hardware/mechanicals/right_leg-eb6-j0_3-mec.xml however we cannot switch the branch to devel given this PR that introduces breaking changes on the robot #623

@GiulioRomualdi
Copy link
Member Author

I will keep this branch https://github.com/ami-iit/robots-configuration/tree/ergocubsn001_calibrators_local_branch_that_should_be_used_since_devel_do_not_work_on_sn001 on the robot after the PR will be merged given #623

@pattacini
Copy link
Member

There is a conflict with ergoCubSN001/hardware/mechanicals/right_leg-eb6-j0_3-mec.xml however we cannot switch the branch to devel given this PR that introduces breaking changes on the robot #623

cc @marcoaccame

@pattacini pattacini merged commit 29beb51 into robotology:devel Mar 14, 2024
1 check passed
@GiulioRomualdi GiulioRomualdi deleted the ergocubsn001_calibrators branch March 15, 2024 10:29
@pattacini
Copy link
Member

I will keep this branch https://github.com/ami-iit/robots-configuration/tree/ergocubsn001_calibrators_local_branch_that_should_be_used_since_devel_do_not_work_on_sn001 on the robot after the PR will be merged given #623

Hi @GiulioRomualdi

It should be now safe for you to use the upstream devel as a reference after @marcoaccame's PR:

cc @Nicogene @sgiraz

MSECode pushed a commit to valegagge/robots-configuration that referenced this pull request Apr 11, 2024
@GiulioRomualdi @valegagge
Update the calibrators for ergoCubSN001 (right arm and right hip roll) (
34b2698 
robotology#630)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pattacini pattacini pattacini approved these changes

Assignees

@GiulioRomualdi GiulioRomualdi

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GiulioRomualdi @pattacini