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

Merge changes in actuation, contact force residual and fix on force derivative for 6d contact loop #2

Open
wants to merge 11 commits into
base: topic/contact-6D-closed-loop
Choose a base branch
from

Conversation

msabbah06
Copy link
Collaborator

  • Actuation data now requires pinocchio data as input in create data, in order to make actuation model rely on pinocchio calculation
  • Contact force residual now has a new constructor for contact 6d loop where it takes now the name of the contact and no more a frame id (since for a loop several frames are involved)
  • Derivatives of contact force for contact loop 6D lacks a minus to be consistent with the definition of the force in the contact

@LudovicDeMatteis
Copy link
Owner

I think this PR should be spitted in several ones:

  • The fix on the force derivative should definitely be merged to this branch.
  • Changes on the actuation should be a totally different PR (as it is a different topic and should first be discussed with Nicolas or Carlos)
  • Changes on the contact force residual could go in this PR

@LudovicDeMatteis
Copy link
Owner

The branch as conflict that prevent merging, you should clean the work tree (by rebasing and/or cherrypicking the correct commits)

@LudovicDeMatteis
Copy link
Owner

@msabbah06 I cherrypicked the fixed on update force to include it in the PR here

@msabbah06
Copy link
Collaborator Author

@LudovicDeMatteis I normally should have cleaned the working tree. Let me know if I did something wrong

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.

2 participants