Devel ergocub sn002 #692
Devel ergocub sn002 #692
Conversation
|
cc @Nicogene |
|
The robot just went into maintenance to fix the wrists, the neck, and (in theory) also the broken temperature sensor on the ankle |
Same as #691 (comment). |
|
Sorry, I accidentally solved the conflict of the PR, not sure if this is done according the workflow. Anyhow, today with @S-Dafarra we were able to run the robot, and even if we only did the teleoperation test with a mixed YARP 3.10/YARP 3.9 setup. So I think at this point we can merge this and release 2024.11.0, what do you think @Nicogene @pattacini ? |
|
Great! I'll merge the PR and tag the repo. |
|
Hi @traversaro Is this fork/branch already rebased on top of upstream devel? |
I am afraid not, I accidentally did a conflict resolution from the GitHub UI (that we can drop), but I did not interacted with the branch in any other way. |
|
It's not rebased. Although the conflicts are solved, GitHub is unable to rebase & merge via the GUI. |
pattacini
force-pushed
the
devel-ergoCubSN002
branch
from
eb135e1 to
1f95e28
Compare
It seems broken
# Conflicts: # ergoCubSN002/hardware/motorControl/left_arm-eb31-j4_6-mc_service.xml # ergoCubSN002/hardware/motorControl/right_arm-eb30-j4_6-mc_service.xml
This reverts commit bfedb46.
pattacini
force-pushed
the
devel-ergoCubSN002
branch
from
1f95e28 to
f89a68a
Compare
Alignment in view of distro 2024.11.0.