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

EasyFullControl integration with rmf_demos #158

Merged
merged 26 commits into from
Aug 18, 2023
Merged

Conversation

xiyuoh
Copy link
Member

@xiyuoh xiyuoh commented Sep 21, 2022

This PR depends on open-rmf/rmf_ros2#235.

It demonstrates how you can create a fleet adapter with the EasyFullControl API and its python bindings:

  • A fleet adapter is created using EasyFullControl::make, and appropriate callbacks such as get_position, navigate, dock, etc. modified from RobotClientAPI are passed to the adapter via EasyFullControl::add_robot for each robot that should be added to the fleet. These callbacks are used by the internal fleet adapter code to receive updates from and send commands to the fleet robots.
  • An action field is added to the Office world's tinyRobot config file to support teleop actions as part of the EasyFullControl API.
  • An argument easy_fleet is also added to the fleet adapter launch file to easily switch between the current rmf_demos_fleet_adapter and the EasyFullControl adapter implementations.

To test, you may run any full control demo world with an easy_fleet:=1 flag. For example:

ros2 launch rmf_demos_gz_classic office.launch.xml easy_fleet:=1

Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
@xiyuoh xiyuoh mentioned this pull request Sep 21, 2022
3 tasks
@Yadunund
Copy link
Member

I don't think we need to keep the previous fleet adapter implementation since this was copied into the implementation of EasyFullControl?

@xiyuoh
Copy link
Member Author

xiyuoh commented Sep 21, 2022

@Yadunund do we need to keep the python implementation in case some users want to modify the internal logic for their own application?

Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
@xiyuoh xiyuoh marked this pull request as draft November 9, 2022 05:29
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
Signed-off-by: Xi Yu Oh <xiyu@openrobotics.org>
@xiyuoh xiyuoh marked this pull request as ready for review November 11, 2022 05:47
@xiyuoh xiyuoh requested a review from Yadunund November 11, 2022 05:47
xiyuoh and others added 7 commits May 18, 2023 16:18
Signed-off-by: Xi Yu Oh <xiyuoh@intrinsic.ai>
Signed-off-by: Xi Yu Oh <xiyuoh@intrinsic.ai>
Signed-off-by: Xi Yu Oh <xiyuoh@intrinsic.ai>
Signed-off-by: Xi Yu Oh <xiyuoh@intrinsic.ai>
Signed-off-by: Xi Yu Oh <xiyuoh@intrinsic.ai>
Signed-off-by: Xiyu Oh <xiyu@openrobotics.org>
Yadunund and others added 2 commits August 14, 2023 16:56
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
Co-authored-by: Aaron Chong <aaronchongth@gmail.com>
Co-authored-by: Yadunund <yadunund@openrobotics.org>
@mxgrey mxgrey enabled auto-merge (squash) August 18, 2023 05:19
@mxgrey mxgrey merged commit 3a6fc90 into main Aug 18, 2023
3 checks passed
@mxgrey mxgrey deleted the feature/easy_full_control branch August 18, 2023 08:52
Yadunund added a commit that referenced this pull request Sep 18, 2023
Signed-off-by: Xi Yu Oh <xiyuoh@intrinsic.ai>
Signed-off-by: Yadunund <yadunund@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
Co-authored-by: Yadunund <yadunund@openrobotics.org>
Co-authored-by: Grey <grey@openrobotics.org>
Co-authored-by: Aaron Chong <aaronchongth@gmail.com>
xiyuoh added a commit that referenced this pull request Sep 19, 2023
Signed-off-by: Xi Yu Oh <xiyuoh@intrinsic.ai>
Signed-off-by: Yadunund <yadunund@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
Co-authored-by: Xiyu <xiyu@openrobotics.org>
Co-authored-by: Grey <grey@openrobotics.org>
Co-authored-by: Aaron Chong <aaronchongth@gmail.com>
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.

3 participants