-
Notifications
You must be signed in to change notification settings - Fork 36
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
Improve controller base #250
Merged
gergondet
merged 4 commits into
jrl-umi3218:master
from
gergondet:topic/ImproveControllerBase
Apr 28, 2022
Merged
Improve controller base #250
gergondet
merged 4 commits into
jrl-umi3218:master
from
gergondet:topic/ImproveControllerBase
Apr 28, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arntanguy
approved these changes
Apr 27, 2022
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.
Nice, looks good, and it's definitely great to bring back all these features into MCController
and unify how we deal with contacts/collisions!
arntanguy
reviewed
Apr 27, 2022
gergondet
force-pushed
the
topic/ImproveControllerBase
branch
from
April 28, 2022 09:23
df03f77
to
45df983
Compare
Hi @arntanguy Thanks for the feedback, I have integrated it into the PR and rebased on #251 Will merge then CI lands |
gergondet
added a commit
that referenced
this pull request
Jul 8, 2022
Highlights === `mc_rbdyn::Frame` and `mc_rbdyn::RobotFrame` have been introduced. This removes the unnecessary distinction between bodies and surfaces that has existed in the framework. (#247) API breaks === - `mc_rbdyn::Robots` cannot be created directly anymore, one has to go through a factory function (#247) - `mc_rbdyn::Robots` stores indiviual robot as pointer and in particular `robots.robots()` returns a self reference instead of `vector<Robot>`, `Robots` behaves a little more like a vector now to mitigate the impact of this change (#247) - `EndEffectorTask` and co. cannot use a `bodyPoint` in their constructor anymore, proper frames should be used instead (#247) - `VectorOrientationTask` and co. cannot set or get the `bodyVector` after the fact anymore (#247) Deprecations === - Usage of `body` or `surface` in JSON/YAML is deprecated in favor of frame, the doc will only show `frame` but it should continue to work with all old JSON/YAML files (#247) - Idem for specifications of relative targets (#247) Changes === - [mc_control] Many functionalities of FSM controllers -- notably simplified contact and collision manipulations and configuration based initialization -- are now available in basic controllers (#250) Added === - [mc_control] Controllers can specify extra frames in their configuration frame (#251) - [mc_control] Controllers can specify different `init_pos` for different `MainRobot` (#251) - [mc_rbdyn] Add an overload to load a robot module with a custom name - [mc_rtc_utils] `mc_rtc::shared` is a wrapper around `std::enabled_shared_from_this` to allow reference-style API where the data is backed by a shared pointer (#247) - [mc_tasks] All tasks (when it makes sense) can accept a frame at construction (#247) - [mc_solver] `mc_solver::BoundedSpeedConstr` can be used to constraint a frame velocity (#247) - [mc_solver] Active joints in a collision can be specified via `mc_rbdyn::Collision` objects (#262) - [utils] `build_and_install` now supports Ubuntu Jammy (22.04) (#248) - [utils] `build_and_install` can now install the Panda module (#249) Fixes === - [debian] Python bindings now include mc_observers - [fsm::Meta] Fix missed iterations at the start of meta states (#257) - [mc_control] Make robot position initialization consistant (#245) - [mc_rbdyn] Fix initialization of the default body sensor (#258) - [utils] Fix issues with pip/pip3 on Ubuntu Focal (#246) - [utils] Honor forced selection of Python for mc_log_ui
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main purpose of this PR is to bring in the helpers from the FSM controller into the regular controller class
This is essentially:
mc_control::fsm::Contact
tomc_control::Contact
(keeping an alias in thefsm
namespace)mc_solver::QPSolver
and the contacts in the controller