Closed GiulioRomualdi closed 5 months ago
We have conflicts to handle, @GiulioRomualdi. Could you have a look?
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 https://github.com/robotology/robots-configuration/pull/623
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 https://github.com/robotology/robots-configuration/pull/623
There is a conflict with
ergoCubSN001/hardware/mechanicals/right_leg-eb6-j0_3-mec.xml
however we cannot switch the branch todevel
given this PR that introduces breaking changes on the robot #623
cc @marcoaccame
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
This PR updates the calibrators for right arm and right hip roll after the robot maintenance.