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

improvements in velocity controller #104

Merged

Conversation

CarlottaSartore
Copy link
Contributor

This PR implements various improvements in the velocity control and the related update in the documentation.

Copy link
Collaborator

@gabrielenava gabrielenava left a comment

Choose a reason for hiding this comment

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

I looked at the matlab functions and everything seems ok to me, but I cannot test the block at the moment. However overall seems ok, we can merge in devel after addressing my small ocmments.

J_c_dot_nu(7:end) = J_dot_nu_R;
end

end
Copy link
Collaborator

Choose a reason for hiding this comment

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

Missing newline

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done in 6c3d28f


s_dot_star_k_1 = s_dot_des_k_1 - Gains.KP_Postural*(s_k-s_des_k);

end
Copy link
Collaborator

Choose a reason for hiding this comment

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

also here missing newline

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done in 6c3d28f

s_dot_des_k = zeros(size(s_des_k));


end
Copy link
Collaborator

Choose a reason for hiding this comment

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

same comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done in 6c3d28f

@@ -0,0 +1,44 @@
function centroidalDyn = centroidalConversion(DYNAMICS,FORKINEMATICS,STATE)
Copy link
Collaborator

Choose a reason for hiding this comment

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

these centroidal -related functions could be moved in the wbc library folder. But for now it is ok to have them in the sources of the velocity controller, being the only user of the transformation.

@gabrielenava gabrielenava merged commit 246ee04 into robotology:devel Dec 16, 2020
gabrielenava pushed a commit that referenced this pull request Mar 26, 2021
* added a new momentum-velocity controller

* cleanup of the WCB simulink library

* improvements in velocity controller (#104)

* improvements in velocity controller

* added new line at the end of the files

* Velocity Controller-Relax Momentum Constraint  (#107)

* fixes centroidalTransformaion and ComputeReferencesController

* fixed some typos, removed hardcoded variables, clean up

* fixed indeces for velocity limits

* minor fixes

Co-authored-by: Giuseppe <gl.giuseppelerario@gmail.com>
Co-authored-by: CarlottaSartore <56030908+CarlottaSartore@users.noreply.github.com>
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