-
Notifications
You must be signed in to change notification settings - Fork 51
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
andino_apps package created and andino_navigation package updated #235
andino_apps package created and andino_navigation package updated #235
Conversation
Signed-off-by: JesusSilvaUtrera <[email protected]>
@agalbachicar FYI. Also some topics to discuss with @francocipollone along with the ones that we mentioned earlier:
Thanks in advance for the time! |
Risking some answers here, but let's wait for @francocipollone to give the final thumbs up or down:
I think we can move forward with it for now within this repository as it will integrate the packages present within this repository. Anything that go beyond that, e.g. a demostration of the navigation stack using the O3DE simulation, shall leave in another package/repository.
This is a good question. I think we should keep things related together, meaning that if the RViz configuration file has been created for the purpose of the integration application we should have that within the andino_apps package. When it is a generic, application independent configuration, then it should be a top level package. Probably, an andino_visualization package to that end.
IMO, yes. We need to have these world, map and other configuration files that serve the purpose of an integration application within this new andino_apps package. That will help to keep related assets together. As soon as we find a use case for sharing those assets across multiple packages we can create a new structure that serves the pupose, but I would refrain from doing an early segmentation without a use case. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PTAL
Signed-off-by: JesusSilvaUtrera <[email protected]>
…lvaUtrera/andino into jesus/#228_simulation_dependency
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking better! PTAL
Signed-off-by: JesusSilvaUtrera <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One final thing before approving. Look at https://github.com/Ekumen-OS/andino/blob/humble/.github/workflows/ci.yml#L32, you need to add andino_apps to the list of packages.
Signed-off-by: JesusSilvaUtrera <[email protected]>
@agalbachicar sorry, I am not really used it CI/CD and I forgot about it, I already changed that, thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I think you can a proper PR now (remove the draft state). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the contribution! Looks good. Some minor comments to go
andino_apps/package.xml
Outdated
<exec_depend>ros2launch</exec_depend> | ||
<exec_depend>andino_gz_classic</exec_depend> | ||
<exec_depend>nav2_bringup</exec_depend> | ||
<exec_depend>turtlebot3_gazebo</exec_depend> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to be explicit about turtlebot3_gazebo. IIRC nav2_bringup manages that dependency.
We are not directly using any turtlebot_gazebo asset. (If we use the world we use it via nav2_bringup)
andino_navigation/README.md
Outdated
@@ -4,44 +4,29 @@ We rely on [Nav2](https://github.com/ros-planning/navigation2) stack in order to | |||
|
|||
# Usage | |||
|
|||
## Real Robot | |||
## Prerequisites | |||
1. Run the mobility stack in a real Andino robot or a simulated one: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Extra space?
1. Run the mobility stack in a real Andino robot or a simulated one: | |
1. Run the mobility stack in a real Andino robot or a simulated one: |
andino_navigation/README.md
Outdated
|
||
2. We need a previously recorded map in order to navigate on. | ||
Refer to [andino_slam](../andino_slam/README.md) to learn how to record a map with Andino. | ||
2. Provide a recorded map. Refer to [andino_slam](https://github.com/JesusSilvaUtrera/andino/blob/jesus/%23228_simulation_dependency/andino_slam/README.md) to learn how to record a map with Andino. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are using a link from your fork. Use a relative path to that.
Signed-off-by: JesusSilvaUtrera <[email protected]>
@francocipollone minor issues fixed. Also, do you think it is a good idea to keep the |
I think that for now we can keep it here |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One extra thing I just noticed: Please add the andino_apps to the list of packages if you can see in the root README file
Signed-off-by: JesusSilvaUtrera <[email protected]>
Already done, sorry I didn't notice that earlier either. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@francocipollone Javi told me he was leaving the decision up to you, so you can merge this now if you don't want to review anything else. Thanks! |
Sorry, I am a bit impatient ;) |
* Improves andino_navigation package. (#224) Signed-off-by: Franco Cipollone <[email protected]> Signed-off-by: JesusSilvaUtrera <[email protected]> * Add basic Platform IO instructions (#229) Signed-off-by: Gary Servin <[email protected]> Signed-off-by: JesusSilvaUtrera <[email protected]> * Modify Shell class API to allow dependency injection (#221) Signed-off-by: Javier Balloffet <[email protected]> Signed-off-by: JesusSilvaUtrera <[email protected]> * Fixed wheel diameter in URDF (#93) Signed-off-by: JesusSilvaUtrera <[email protected]> * Added YAML file for default camera intrinsics (#169) Signed-off-by: JesusSilvaUtrera <[email protected]> * Adds references to o3de and isaac_sim simulations. (#232) Signed-off-by: Franco Cipollone <[email protected]> Signed-off-by: JesusSilvaUtrera <[email protected]> * Added README for andino_bringup (#233) Signed-off-by: JesusSilvaUtrera <[email protected]> * Added binaries installation docs (#234) Signed-off-by: JesusSilvaUtrera <[email protected]> * andino_apps package created and andino_navigation package updated (#235) * andino_apps package created and andino_navigation package updated Signed-off-by: JesusSilvaUtrera <[email protected]> * Minor changes from the PR Signed-off-by: JesusSilvaUtrera <[email protected]> * Update andino_navigation README with changes from PR Signed-off-by: JesusSilvaUtrera <[email protected]> * Add andino_apps package to ci.yaml Signed-off-by: JesusSilvaUtrera <[email protected]> * Fixed minor issues from the PR Signed-off-by: JesusSilvaUtrera <[email protected]> * Added 'andino_apps' to the general README Signed-off-by: JesusSilvaUtrera <[email protected]> --------- Signed-off-by: JesusSilvaUtrera <[email protected]> * Minimal change to test launch file Signed-off-by: JesusSilvaUtrera <[email protected]> * Added webcam.yaml file and intrinsics are now publishing Signed-off-by: JesusSilvaUtrera <[email protected]> * Added raspicam.yaml with camera intrinsics and updated instructions in andino_hardware/README Signed-off-by: JesusSilvaUtrera <[email protected]> * Changed the 'camera_info_url' to be relative path Signed-off-by: JesusSilvaUtrera <[email protected]> --------- Signed-off-by: Franco Cipollone <[email protected]> Signed-off-by: JesusSilvaUtrera <[email protected]> Signed-off-by: Gary Servin <[email protected]> Signed-off-by: Javier Balloffet <[email protected]> Co-authored-by: Franco Cipollone <[email protected]> Co-authored-by: Gary Servin <[email protected]> Co-authored-by: Javier Balloffet <[email protected]>
🦟 Bug fix
Fixes #228
Summary
I have created a new
andino_apps
package, where I moved theandino_simulation_navigation
launch file fromandino_navigation
. This makes theandino_navigation
independent of the simulation packages.Test it
Build the workspace and follow the new README.md from
andino_apps
to test the launch file and see that the functionality remains the same.Checklist
Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.