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

Add read_only_blockade adapter #110

Merged
merged 29 commits into from
Sep 1, 2021
Merged

Add read_only_blockade adapter #110

merged 29 commits into from
Sep 1, 2021

Conversation

mxgrey
Copy link
Contributor

@mxgrey mxgrey commented Aug 31, 2021

This PR introduces the read_only_blockade fleet adapter which is an improved version of the old read_only adapter. The API for integrating with read_only_blockade is different from the API for integrating with read_only so I'm keeping them as separate adapters for the sake of backwards compatibility.

This PR also includes a few tweaks that made performance and behavior more reliable for DP3.

mxgrey added 22 commits July 29, 2021 18:31
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
…robots

Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
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.

Left a couple of minor comments.
Should we also update the descriptions in the launch file to let users know of the read_only_blocade node?

<arg name="control_type" description="Fleet adapter type: full_control or read_only"/>
<arg name="fleet_name" description="Name of the fleet that this adapter will interface with"/>
<!-- Note: We give a blank default to nav_graph_file because it is not required for read_only
mode. However it is still required for full_control mode.
TODO(MXG): Investigate if there is a better way to handle conditionally required arguments. -->
<arg name="nav_graph_file" default="" description="The file path of this fleet's navigation graph"/>

Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
@mxgrey
Copy link
Contributor Author

mxgrey commented Sep 1, 2021

Should we also update the descriptions in the launch file to let users know of the read_only_blocade node?

Great point! Added: 68b8bcd

Signed-off-by: Michael X. Grey <grey@openrobotics.org>
@mxgrey
Copy link
Contributor Author

mxgrey commented Sep 1, 2021

Good catch! Fixed: 06c0faa

Yadunund
Yadunund previously approved these changes Sep 1, 2021
@Yadunund
Copy link
Member

Yadunund commented Sep 1, 2021

uncrustify failing 💀

Signed-off-by: Michael X. Grey <grey@openrobotics.org>
@codecov
Copy link

codecov bot commented Sep 1, 2021

Codecov Report

Merging #110 (e2ea83f) into main (0a4fd20) will decrease coverage by 0.51%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #110      +/-   ##
==========================================
- Coverage   21.97%   21.46%   -0.52%     
==========================================
  Files         414      840     +426     
  Lines       33086    67760   +34674     
  Branches    16022    32252   +16230     
==========================================
+ Hits         7271    14542    +7271     
- Misses      18008    37554   +19546     
- Partials     7807    15664    +7857     
Flag Coverage Δ
tests 21.46% <ø> (-0.52%) ⬇️

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

Impacted Files Coverage Δ
...-4.1.0/Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp
...apter/src/rmf_fleet_adapter/phases/RxOperators.hpp
...er/src/rmf_fleet_adapter/phases/ResponsiveWait.cpp
...-4.1.0/Rx/v2/src/rxcpp/operators/rx-start_with.hpp
...2/rmf_fleet_adapter_python/src/planner/planner.cpp
.../rmf_ros2/rmf_fleet_adapter/src/read_only/main.cpp
.../rmf_fleet_adapter/rmf_rxcpp/examples/PlanPath.cpp
..._adapter/src/rmf_fleet_adapter/phases/DoorOpen.cpp
...er/src/rmf_fleet_adapter/phases/ResponsiveWait.hpp
...leet_adapter/test/mock/MockTrafficLightCommand.hpp
... and 1244 more

@mxgrey mxgrey merged commit dd150e0 into main Sep 1, 2021
@mxgrey mxgrey deleted the test/add_margins branch September 1, 2021 14:56
arjo129 pushed a commit that referenced this pull request Oct 12, 2021
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
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.

None yet

2 participants