Skip to content
This repository has been archived by the owner on Sep 29, 2020. It is now read-only.

Update repo #78

Closed
wants to merge 33 commits into from
Closed

Update repo #78

wants to merge 33 commits into from

Conversation

gabrielenava
Copy link
Contributor

I think it is time to merge the WBM-class into master. But before doing this, it is necessary to verify the controllers are still working properly, and that's why I want to first merge this branch into WBM-class.

@gabrielenava
Copy link
Contributor Author

@Ganimed do you agree with this merge? I worked mostly at the high level (matlab functions) so nothing is changed in your code

@Ganimed
Copy link
Contributor

Ganimed commented Jan 24, 2017

Try it, then we will see. Or better make a copy of the WBM-Class branch and merge it there.

@gabrielenava
Copy link
Contributor Author

@Ganimed if you prefer, I can merge updateRepo into master instead of your branch, considering that when I resolved the conficts I merged your commits into my branch so it is currently the most updated branch of the repo


references = trajectoryGenerator(CONFIG.initForKinematics.xCoM,t,CONFIG);
CONFIG.figureCont = visualizeSimulation(t,chi,CONFIG,references);
CONFIG.consideredJoints.push_back('torso_pitch');
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be automatically extracted by the used joint lists, but at the moment that is not exposed in mex-wholebodymodel, so I see why you had to hardcode this.

end_time = length(qj(1,:));

% load the model from .urdf
mdlLdr.loadReducedModelFromFile('model/model.urdf',consideredJoints);
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be exposed by the C++ to be sure that we are loading the same model.urdf of the underlying model.

Copy link
Contributor

Choose a reason for hiding this comment

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

But for doing that we should first make sure that we install the meshes together with the urdf, something that at the moment we are not doing (see robotology/icub-models-generator#28 and robotology/icub-models-generator#33).

@gabrielenava
Copy link
Contributor Author

updateRepo will be merged into master so no need for this pull request anymore

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants