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 devel into master - minor changes and fixes #130

Merged
merged 11 commits into from
Aug 6, 2021
Merged

Conversation

gabrielenava
Copy link
Collaborator

Should fix robotology/robotology-superbuild#782

I will remove the WIP after a quick check on the files that are going to change with this PR

CarlottaSartore and others added 9 commits April 9, 2021 10:22
…ationForJumping

Velocity controller preparation for jumping
…ulator

- Restore the link of the 'holder' blocks in the controller model to the
  WBToolbox (utilities) library -> after the new holder implementation was
  (robotology/wb-toolbox#211).
- Remove the 'holder' block (not required anymore) from the 'utilityBlocks_lib.slx'
  library.
- Converted boolean flags to enumerations.
- Introduced None/Warning/EmergencyStop choices.
@gabrielenava
Copy link
Collaborator Author

gabrielenava commented Aug 6, 2021

As I suspected, the modification of the inputs of checkInputSpikes.m broke all controllers, including the ones that are not in whole-body-controllers (for example, iRonCub ones):

image

Therefore I will revert this modification, and apply it in a separate branch that before being merged in devel will also require to update all controllers because of this modification, at least the ones in whole-body-controllers. Also, the users should be warned that such modification is introduced so that they can update their controllers accordingly.

cc @traversaro @nunoguedelha @CarlottaSartore

I proceed reverting the changes in devel branch.

Gabriele added 2 commits August 6, 2021 16:41
…ithSimu, fixed torqueControlBalancingWithSimu and exported to 2019b
@gabrielenava
Copy link
Collaborator Author

With 20ba6af I reverted and tested, now the controllers are working.

I double-checked all others modifications and they seem fine to me.

With 7bf78dc I created a checkInputSpikesWithSimulator.m function in the library to restore compatibility also with the Simulink-only simulator. I think for now it is ok, I will open an issue to remove the duplicates and converge to a single function.

Fixed also other small issues.

Now devel can be merged into master.

cc @traversaro @nunoguedelha @CarlottaSartore

@gabrielenava gabrielenava changed the title Merge devel into master [WIP] Merge devel into master - minor changes and fixes Aug 6, 2021
@gabrielenava gabrielenava merged commit c5067a8 into master Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants