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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate Beluga, Nav2 and TurtleBot 3 #7

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

Alondruck
Copy link
Collaborator

@Alondruck Alondruck commented Jun 11, 2024

Proposed changes

Related to Ekumen-OS/beluga#307. The idea is to create a package with all the necessary files to launch a simulation using Beluga and Nav2 on the TurtleBot 3.

Type of change

  • 馃悰 Bugfix (change which fixes an issue)
  • 馃殌 Feature (change which adds functionality)
  • 馃摎 Documentation (change which fixes or extends documentation)

Checklist

  • Lint and unit tests (if any) pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)
  • All commits have been signed for DCO

Additional comments

This PR depends on issue #6 being resolved.

Signed-off-by: Alon Druck <alon.druck@ekumenlabs.com>
Signed-off-by: Alon Druck <alon.druck@ekumenlabs.com>
Signed-off-by: Alon Druck <alon.druck@ekumenlabs.com>
Signed-off-by: Alon Druck <alon.druck@ekumenlabs.com>
@Alondruck Alondruck added the enhancement New feature or request label Jun 11, 2024
@Alondruck Alondruck self-assigned this Jun 11, 2024
Signed-off-by: Alon Druck <alon.druck@ekumenlabs.com>
@Alondruck Alondruck marked this pull request as ready for review June 18, 2024 14:12
@@ -0,0 +1,173 @@
# Copyright 2024 Ekumen, Inc.
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Alondruck is beluga_demo_nav2_launch.py a duplicate of beluga_demo_nav2.launch.py?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Apparently I forgot to delete beluga_demo_nav2.launch.py

# limitations under the License.

"""
This is all-in-one launch script intended for use by nav2 developers.
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Alondruck is this inspired or a verbatim copy? Nav2 has its own copyrights and licenses we have to be mindful about.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, is a copy with some changes. What do I need to do is this cases?

<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>beluga_demo_nav2</name>
<version>0.0.0</version>
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Alondruck nit: needs a version.

collapsed: true
Width: 1545
X: 186
Y: 117
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Alondruck meta: why two .rviz configurations?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

You right, I'll remove the nav2_namespaced_view.rviz file.

@@ -0,0 +1,54 @@
<?xml version="1.0"?>
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Alondruck meta: do we need all these things here when available upstream?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I wanted to copy this file to avoid depending on updates from other repositories for this tutorial, since the only important thing here is the integration of beluga_amcl. I don't think we need to worry about updates to other resources in this tutorial, but I'm open to suggestions.

# Add the actions to launch all of the navigation nodes
ld.add_action(load_composable_nodes)

return ld
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Alondruck meta: why not simplify the launchfiles hierarchy a bit? Do we need waypoint following support to show Beluga can successfully fill in for Nav2 AMCL?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I agree that I can remove waypoint following from here. Anyway, I'm not too concerned about this file because the focus of the tutorial is on localization_launch.py where we configure to use beluga_amcl. The rest is literally a simplified copy of nav2 because it is assumed that if someone has reached this tutorial, they have previously completed the getting started tutorial for nav2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants