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

Finish rename of nonholonomic to ackermann, make ackermann vehicles standardized with RMF stack #49

Merged
merged 5 commits into from
Sep 9, 2021

Conversation

luca-della-vedova
Copy link
Member

Bug fix

Fixed bug

Closes #47 and closes #48.
Ackermann vehicles were using custom topics for path requests (even though they use the same data format as normal robots), as well as not reporting their state hence making it impossible for downstream users to monitor them. This PR fixes both the issues, as well as finishing the renaming of nonholonomic -> ackermann drive and cleaning up the code a bit.

To test, with the matching PR in rmf_demos:

ros2 launch rmf_demos_ign test_ackman.launch.xml

And

ros2 run rmf_demos_tasks request_ackmann_path -p rmf_demos_maps -n maps/test_ackman/nav_graphs/0.yaml -s a1 -e c1 -i task11 -r ambulance

@codecov
Copy link

codecov bot commented Sep 7, 2021

Codecov Report

Merging #49 (de0f865) into main (d683575) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            main     #49     +/-   ##
=======================================
  Coverage   0.00%   0.00%             
=======================================
  Files        204     138     -66     
  Lines      19244   12833   -6411     
=======================================
+ Misses     19244   12833   -6411     
Flag Coverage Δ
tests 0.00% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...lation/rmf_building_sim_common/src/lift_common.cpp
...robot_sim_gazebo_plugins/src/TeleportDispenser.cpp
...uilding_sim_gazebo_plugins/src/toggle_charging.cpp
...ion/rmf_robot_sim_ignition_plugins/src/slotcar.cpp
...ion/rmf_building_sim_ignition_plugins/src/lift.cpp
...m_ignition_plugins/src/LightTuning/LightTuning.cpp
...ation/rmf_robot_sim_gazebo_plugins/src/slotcar.cpp
...on/include/rmf_robot_sim_common/slotcar_common.hpp
...tion/rmf_robot_sim_gazebo_plugins/src/readonly.cpp
...bot_sim_ignition_plugins/src/TeleportDispenser.cpp
... and 320 more

Signed-off-by: Luca Della Vedova <[email protected]>
@luca-della-vedova luca-della-vedova force-pushed the feataure/nonholonomic_state branch from 66ba1cb to 3e638fb Compare September 7, 2021 08:48
ddengster
ddengster previously approved these changes Sep 8, 2021
Copy link
Contributor

@ddengster ddengster left a comment

Choose a reason for hiding this comment

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

tested with the new changes on open-rmf/rmf_demos#86, LGTM!

Copy link
Member

@aaronchongth aaronchongth left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks for the changes, I just have a few minor comments.

rmf_robot_sim_common/src/slotcar_common.cpp Outdated Show resolved Hide resolved
rmf_robot_sim_common/src/slotcar_common.cpp Outdated Show resolved Hide resolved
rmf_robot_sim_common/src/slotcar_common.cpp Outdated Show resolved Hide resolved
rmf_robot_sim_common/src/slotcar_common.cpp Outdated Show resolved Hide resolved
@Yadunund
Copy link
Member

Yadunund commented Sep 8, 2021

Apart from @aaronchongth 's comments, the changes look okay. I would be cool to have a full control ackermann vehicle in rmf_demos in the future. Right now if I try to start up a full control fleet adapter to control the ackermann steered vechile, the PathRequest msg submitted by the fleet adapter will contain in-place rotations which are not filtered out on the slotcar end. We could implement some filtering in the future or better yet update rmf_traffic to interpolate waypoints for such vehicles such that the waypoints in the PathRequest respect the ackermann constraints. I've opened a ticket for that open-rmf/rmf_traffic#42

Signed-off-by: Luca Della Vedova <[email protected]>
@luca-della-vedova
Copy link
Member Author

Addressed all the changes! I also found a few areas for small cleanups.

Apart from @aaronchongth 's comments, the changes look okay. I would be cool to have a full control ackermann vehicle in rmf_demos in the future. Right now if I try to start up a full control fleet adapter to control the ackermann steered vechile, the PathRequest msg submitted by the fleet adapter will contain in-place rotations which are not filtered out on the slotcar end. We could implement some filtering in the future or better yet update rmf_traffic to interpolate waypoints for such vehicles such that the waypoints in the PathRequest respect the ackermann constraints. I've opened a ticket for that open-rmf/rmf_traffic#42

Agreed! I think it would be a great new feature to have. For our specific scenario we are not too concerned with this issue yet so I think it's fine to take time to do a good implementation on the rmf_traffic side rather than a quick patch on slotcar to filter waypoints.

Copy link
Member

@Yadunund Yadunund left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@aaronchongth aaronchongth left a comment

Choose a reason for hiding this comment

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

Thanks for the changes, LGTM

@luca-della-vedova luca-della-vedova merged commit eb1ecca into main Sep 9, 2021
@luca-della-vedova luca-della-vedova deleted the feataure/nonholonomic_state branch September 9, 2021 01:26
luca-della-vedova added a commit that referenced this pull request Mar 8, 2022
…tandardized with RMF stack (#49)

* Nonholonomic vehicles now report their state

Signed-off-by: Luca Della Vedova <[email protected]>

* Cleanup and change nonholonomic to ackermann

Signed-off-by: Luca Della Vedova <[email protected]>

* Minor cleanup, style

Signed-off-by: Luca Della Vedova <[email protected]>

* Address feedback

Signed-off-by: Luca Della Vedova <[email protected]>

Co-authored-by: ddengster <[email protected]>
Signed-off-by: Luca Della Vedova <[email protected]>
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.

Ackermann vehicles don't report their state Unify ackermann and diff_drive plugins to be compatible with RMF
4 participants