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

Improve controller base #250

Merged
merged 4 commits into from
Apr 28, 2022

Conversation

gergondet
Copy link
Member

The main purpose of this PR is to bring in the helpers from the FSM controller into the regular controller class

This is essentially:

  • renaming mc_control::fsm::Contact to mc_control::Contact (keeping an alias in the fsm namespace)
  • moving code from the FSM controller to the regular controller
  • Tightening the relationship between contacts in mc_solver::QPSolver and the contacts in the controller
  • Improving the presentation of contacts in the GUI

Copy link
Collaborator

@arntanguy arntanguy left a 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!

include/mc_control/MCController.h Show resolved Hide resolved
include/mc_solver/QPSolver.h Show resolved Hide resolved
src/mc_control/MCController.cpp Show resolved Hide resolved
@gergondet
Copy link
Member Author

Hi @arntanguy

Thanks for the feedback, I have integrated it into the PR and rebased on #251

Will merge then CI lands

@gergondet gergondet merged commit 1816e00 into jrl-umi3218:master Apr 28, 2022
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants