-
Notifications
You must be signed in to change notification settings - Fork 18
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
Created CMM Simulink Block #194
Created CMM Simulink Block #194
Conversation
I saw that the CI failed, I have tried again the compilation from a brand new build and everything worked fine. I checked the output of the CI tests and I saw that the problem is in the iDynTree dependency i.e.
Which branch is the CI using ? is it possible that the error is due to "wrong" iDynTree version? In my configuration I have iDynTree branch devel commit 03a667417dcc4f5ac2ec881bad99cc24cea24947. |
I think that the images in https://github.com/robotology-playground/docker_images should be updated, if we're lucky we just need to re-run its CI. Let's wait and then retrigger the tests of this PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @CarlottaSartore for your contribution! It looks good to me apart for some nits. Just checking, did you export the mdl and slx for the correct Matlab version we support?
toolbox/library/CMakeLists.txt
Outdated
@@ -38,6 +38,7 @@ list(APPEND WBT_BLOCKS "Jacobian") | |||
list(APPEND WBT_BLOCKS "ForwardKinematics") | |||
list(APPEND WBT_BLOCKS "RelativeTransform") | |||
list(APPEND WBT_BLOCKS "CentroidalMomentum") | |||
list(APPEND WBT_BLOCKS "CMM") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would extend CMM to CentroidalTotalMomentumMatrix pretty much everywhere (class names, files names, etc)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect, I will apply this change right away!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in commit 95fa7bc
toolbox/library/src/CMM.cpp
Outdated
|
||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that the clang-format of this repo allows multiple blank lines. Are you sure you're using it? If not, can you update the style of all the C++ file with that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes sure !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in commit 95fa7bc
@diegoferigo Thank you for your review!
For exporting the slx I have used the export_library script (i.e. it is 2014b), instead, the mdl version is 2019b, which Matlab version is the default one? 2014b ? |
Just to understand, @CarlottaSartore you have addressed all the reviews of @diegoferigo, right? |
Yes, the only thing missing, to the best of my knowledge, regards the version of Matlab as per the following comment:
The CI tests are not passing but it could due to #194 (comment) |
I think that executing the wb-toolbox/matlab/CMakeLists.txt Lines 9 to 14 in 3fd8eee
For what concerns CI, I triggered the generation of the updated Docker images, let's see if they succeed. The pipeline is a bit rusty lately, I had not much time to dedicate and there was no one else that was maintaining it. Let's see if the building process succeeds, it's gonna take a while. |
@CarlottaSartore Can you please rebase this PR on top of current |
05a59e0
to
16aae9b
Compare
@diegoferigo I have updated all the file with the clang-format (using QT), I have rebase on top of devel and fix one leftover. of the reanming in the simulink library. |
Perfect, thanks for your contribution @CarlottaSartore, it looks good! A last nit, can you please squash together the two commits with the slx file? Minimizing the changes to binary files is very important to avoid the size of the git project to diverge :) Otherwise, I can squash and merge this PR. Let me know what you prefer. |
56a8981
to
44f3d8b
Compare
As commented in issue #20 , This PR contains the implementation of the Simulink block calling the
iDynTree::KinDynComputations::getCentroidalTotalMomentumJacobian()
function implemented by @GiulioRomualdi .C.C. @traversaro @gabrielenava