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

standalone assisted teleop #2904

Merged

Conversation

jwallace42
Copy link
Contributor

@jwallace42 jwallace42 commented Apr 9, 2022


Basic Info

Info Please fill out this column
Ticket(s) this addresses #2888 #2226
Primary OS tested on Ubuntu
Robotic platform tested on Gazebo

Description of contribution in a few bullet points

This pr adds a standalone node and core class for assisted teleop.

Description of documentation updates required from your changes

Add documentation for a new node


Future work that may be required in bullet points

  • Use the core package to create a new TimedBehavior

For Maintainers:

  • Check that any new parameters added are updated in navigation.ros.org
  • Check that any significant change is added to the migration guide
  • Check that any new features OR changes to existing behaviors are reflected in the tuning guide
  • Check that any new functions have Doxygen added
  • Check that any new features have test coverage
  • Check that any new plugins is added to the plugins page
  • If BT Node, Additionally: add to BT's XML index of nodes for groot, BT package's readme table, and BT library lists

@mergify
Copy link
Contributor

mergify bot commented Apr 9, 2022

@jwallace42, please properly fill in PR template in the future. @SteveMacenski, use this instead.

  • Check that any new parameters added are updated in navigation.ros.org
  • Check that any significant change is added to the migration guide
  • Check that any new features OR changes to existing behaviors are reflected in the tuning guide
  • Check that any new functions have Doxygen added
  • Check that any new features have test coverage
  • Check that any new plugins is added to the plugins page
  • If BT Node, Additionally: add to BT's XML index of nodes for groot, BT package's readme table, and BT library lists

@mergify
Copy link
Contributor

mergify bot commented Apr 9, 2022

@jwallace42, your PR has failed to build. Please check CI outputs and resolve issues.
You may need to rebase or pull in main due to API changes (or your contribution genuinely fails).

@SteveMacenski
Copy link
Member

By the way, CI failed because there is no teleop action in this PR

@jwallace42
Copy link
Contributor Author

Yep, I forgot to add that back in.

Copy link
Member

@SteveMacenski SteveMacenski left a comment

Choose a reason for hiding this comment

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

Overall not a bad go at it.

Looking at the "core" of what this is doing though, I think its similar to what we're talking about in the collision monitor, one of the reasons I wanted to hold off on this. @AlexeyMerzlyakov is working on adding a collision monitor that checks based on raw sensor data and ensures that we're always N seconds from collision. Alexey, please review this PR as well and give us your thoughts

I think this does a similar thing but instead based on the costmaps for general use rather than safety use. I think there's some code that could be shared between them but this looks reasonable. We can work through abstracting common code later.

I think though from looking at this, this belongs as a behavior plugin in the new behavior server you renamed rather than as a stand alone entity. This is using a TF buffer + costmap subscriber which are heavy and the primary reason for the behavior server to exist as a central location anyway. So that would involve removing the standalone server & making it a behavior plugin.

nav2_assisted_teleop/package.xml Outdated Show resolved Hide resolved
nav2_assisted_teleop/package.xml Outdated Show resolved Hide resolved
nav2_assisted_teleop/src/main.cpp Outdated Show resolved Hide resolved
nav2_assisted_teleop/CMakeLists.txt Outdated Show resolved Hide resolved
nav2_assisted_teleop/src/nav2_assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_assisted_teleop/src/nav2_assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_assisted_teleop/src/nav2_assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_assisted_teleop/src/nav2_assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_assisted_teleop/src/nav2_assisted_teleop.cpp Outdated Show resolved Hide resolved
@jwallace42
Copy link
Contributor Author

I think though from looking at this, this belongs as a behavior plugin in the new behavior server you renamed rather than as a stand alone entity.

I though we wanted the ability to run a standalone assisted teleop? #2226 The core library would be used to create the behavior.

@SteveMacenski
Copy link
Member

That predates the idea of the recovery server being a generic behavior server. The generic behavior server meets all the intended needs, I believe.

@jwallace42
Copy link
Contributor Author

That predates the idea of the recovery server being a generic behavior server. The generic behavior server meets all the intended needs, I believe.

So I guess the thing we would be missing is if it was implemented as a TimedBehavior. Ideally would want the ability to drive without worrying about a time out.

So maybe we have a TimedBehavior for recovery calls and a normal behavior for just running?

@SteveMacenski
Copy link
Member

SteveMacenski commented Apr 12, 2022

I think it could make sense to be a timed behavior, correct.

We should probably introduce some timeout parameter though (e.g. if no new cmd vel within N seconds, stop).

Also, maybe the action request should have a timeout (e.g. only do assisted teleop for 10 seconds, then exit) that way a caller can exit, otherwise, there's not really a clear way to end the assisted teleop session.

We also need a CancelAssistedTeleop BT XML node, similar to CancelControl / CancelBackup / etc. Its trivial, there's a base cancel node that should do all of it for you

That would give then users 2 ways of exiting: a timeout and a cancellation after a task is done. That seems good to me

@jwallace42
Copy link
Contributor Author

jwallace42 commented Apr 12, 2022

I think it could make sense to be a timed behavior, correct.

We should probably introduce some timeout parameter though (e.g. if no new cmd vel within N seconds, stop).

Also, maybe the action request should have a timeout (e.g. only do assisted teleop for 10 seconds, then exit) that way a caller can exit, otherwise, there's not really a clear way to end the assisted teleop session.

We also need a CancelAssistedTeleop BT XML node, similar to CancelControl / CancelBackup / etc. Its trivial, there's a base cancel node that should do all of it for you

That would give then users 2 ways of exiting: a timeout and a cancellation after a task is done. That seems good to me

Is there a case where we would just want to drive around in assisted teleop and not have a time out?

@SteveMacenski
Copy link
Member

Is there a case where we would just want to drive around in assisted teleop and not have a time out?

If the main task of the robot is assisted teleop hah (if you mean timeout for using the behavior; not timeout on velocity commands incoming). I think the default would be no-timeout, but it would be good to have the temporary option that returns after N seconds itself.

@jwallace42
Copy link
Contributor Author

Alright, I will add in the assistedTeleop timed behavior.

@SteveMacenski
Copy link
Member

There are still a few un-answered comments above that are not resolved, but I'll review again in the plugin form! Thanks, back from PTO sorry for the delay

nav2_bringup/params/nav2_params.yaml Show resolved Hide resolved
nav2_bt_navigator/src/bt_navigator.cpp Show resolved Hide resolved
nav2_behavior_tree/nav2_tree_nodes.xml Show resolved Hide resolved
nav2_behaviors/plugins/assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_behaviors/plugins/assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_behaviors/plugins/assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_behaviors/plugins/assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_behaviors/plugins/assisted_teleop.cpp Outdated Show resolved Hide resolved
nav2_behaviors/plugins/assisted_teleop.cpp Show resolved Hide resolved
@mergify
Copy link
Contributor

mergify bot commented May 4, 2022

This pull request is in conflict. Could you fix it @jwallace42?

@jwallace42
Copy link
Contributor Author

@SteveMacenski Just finished this up

@mergify
Copy link
Contributor

mergify bot commented Jun 12, 2022

This pull request is in conflict. Could you fix it @jwallace42?

@mergify
Copy link
Contributor

mergify bot commented Jun 13, 2022

@jwallace42, your PR has failed to build. Please check CI outputs and resolve issues.
You may need to rebase or pull in main due to API changes (or your contribution genuinely fails).

@mergify
Copy link
Contributor

mergify bot commented Jun 16, 2022

This pull request is in conflict. Could you fix it @jwallace42?

@mergify
Copy link
Contributor

mergify bot commented Aug 17, 2022

This pull request is in conflict. Could you fix it @jwallace42?

@SteveMacenski
Copy link
Member

SteveMacenski commented Aug 23, 2022

Check CI, there are some errors, particularly libnav2_assisted_teleop_cancel_bt_nodenav2_wait_cancel_bt_node.so (somewhere missing a comma) + linting if you scroll up a bit.

The only 2 open comments from pre-vacation were on removing or limiting sleeps in the tests as much as possible. Is that done?

What's the story on the docs PR for this? I really don't remember 😆 I imagine I asked for a short tutorial given the newnest of the feature?

@jwallace42
Copy link
Contributor Author

Yeah,

I reduced the sleeps as much as a could a while back. I still need to add a tutorial for the feature as you mentioned:). If the check pass I will take a look at that later in the week.

@SteveMacenski
Copy link
Member

Could not load library: libnav2_assisted_teleop_cancel_bt_nodenav2_wait_cancel_bt_node.so: cannot open shared object file

@SteveMacenski
Copy link
Member

SteveMacenski commented Aug 24, 2022

OK CI looks good other than a linting error (which I just fixed in main)

@jwallace42
Copy link
Contributor Author

jwallace42 commented Aug 25, 2022

I found the docs we merged a while back. ros-navigation/docs.nav2.org#318. So I think we should be good to go :).

@SteveMacenski SteveMacenski merged commit a7d9c9b into ros-navigation:main Aug 25, 2022
SteveMacenski added a commit that referenced this pull request Nov 8, 2022
* standalone assisted teleop

* added in action message

* code review

* moved to behavior server

* added assisted teleop bt node

* revert

* added bt node for assisted teleop

* lint fix

* added cancel assisted teleop node

* code review

* working

* cleanup

* updated feeback

* code review

* update compute velocity

* cleanup

* lint fixes

* cleanup

* test fix

* starting to add tests for assisted teleop

* fixed tests

* undo

* fixed test

* is_recovery

* adjust abort result based on recovery or not

* code review

* added preempt velocity

* working preempt assisted teleop test

* completed assisted teleop tests

* code review

* undo

* code review

* remove sleep

* topic rename

* missing comma

* added comma :(

* added comma

Co-authored-by: Steve Macenski <[email protected]>
SteveMacenski added a commit that referenced this pull request Nov 8, 2022
* standalone assisted teleop (#2904)

* standalone assisted teleop

* added in action message

* code review

* moved to behavior server

* added assisted teleop bt node

* revert

* added bt node for assisted teleop

* lint fix

* added cancel assisted teleop node

* code review

* working

* cleanup

* updated feeback

* code review

* update compute velocity

* cleanup

* lint fixes

* cleanup

* test fix

* starting to add tests for assisted teleop

* fixed tests

* undo

* fixed test

* is_recovery

* adjust abort result based on recovery or not

* code review

* added preempt velocity

* working preempt assisted teleop test

* completed assisted teleop tests

* code review

* undo

* code review

* remove sleep

* topic rename

* missing comma

* added comma :(

* added comma

Co-authored-by: Steve Macenski <[email protected]>

* Add the support of range sensors to Collision Monitor (#3099)

* Support range sensors in Collision Monitor

* Adjust README.md

* Meet review fixes

* Fix #3152: Costmap extend did not include Y component (#3153)

* missing nodes added to nav2_tree_nodes.xml (#3155)

* Change deprecated ceres function (#3158)

* Change deprecated function

* Update smoother_cost_function.hpp

* remove camera_rgb_joint since child frame does not exist (#3162)

* bugfix (#3109) deadlock when costmap receives new map (#3145)

* bugfix (#3109) deadlock when costmap receives new map

Signed-off-by: Daisuke Sato <[email protected]>

* introduce map_received_in_update_bounds_ flag to make sure processMap will not be called between updateBounds and updateCosts

Signed-off-by: Daisuke Sato <[email protected]>

Signed-off-by: Daisuke Sato <[email protected]>

* simple command costmap api - first few functions (#3159)

* initial commit costmap_2d template

Signed-off-by: Stevedan Omodolor <[email protected]>

* finish task A and tested

* lint

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

Co-authored-by: Steve Macenski <[email protected]>

* fix trailing underscores

Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* Fix missing dependency on nav2_collision_monitor (#3175)

* fixed start (#3168)

* fixed start

* return true

* fix tests

* Fix velocities comparison for rotation at place case (#3177)

* Fix velocities comparison for rotation at place case

* Meet review item

* Remove unnecessary header

* Change the comment

* set a empty path on halt (#3178)

* set a empty path on halt

* fixed issues

* remove path reset

* fixing

* reverting

* revert

* revert

* fixed lint

* test fix

* uncrusify fix

* simple command costmap api - update few functions (#3169)

* * add aditional function to costmap_2d.py

Signed-off-by: Stevedan Omodolor <[email protected]>

Updated-by: Jaehun Kim <[email protected]>

* finish task B

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

* Update method docs

* Remove underscores at parameters and split getCost into getCostXY and getCostIdx

* Update method docstrings

* lint code & update docstring, remove default value of getCostXY

* lint code with pep257 & flake8

* clear names for bt nodes (#3183)

* [Smac] check if a node exists before creating (#3195)

* check if a node exists before creating

* invert logic to group like with like

* Update a_star.cpp

* fixing benchmarkign for planners (#3202)

* [Smac] Robin hood data structure improves performance by 10-15%! (#3201)

* adding robin_hood unordered_map

* using robin_hood node map

* ignore robin_hood file

* linting

* linting cont. for triple pointers

* linting cont. for uncrustify

* [RPP] Add parameter to enable/disable collision detection (#3204)

* [RPP] Add parameter to enable/disable collision detection

* [RPP] Update README

* Update waffle.model

* add benchmark launch file + instructions (#3218)

* removing hypotf from smac planner heuristic computation (#3217)

* removing hypotf

* swapping to node2d sqrt

* complete smac planner tolerances (#3219)

* Disable Output Buffering (#3220)

To ensure await asyncio prints [Processing: %s]' every 30s as expected

* fix majority of python linting errors introduced in python costmap API additions to get CI turning over again (#3223)

* fix majority of python linting errors

* finish linting

* Assisted teleop simple commander (#3198)

* add assisted teleop to python api

* cleanup

* assisted teleop demo

* rename

* lint

* code review

* trigger build

* flake8 fix

* break cashe

* moved all v11 to v12

* lint fix

* remove package dep

* change default time allowance

* Costmap Filter enabling service (#3229)

* Add enabling service to costmap filters

* Add service testcase

* Fix comment

* Use toggle_filter service name

* Add binary flip costmap filter (#3228)

* Add binary flip costmap filter

* Move transformPose, worldToMask, getMaskData to CostmapFilter

* Added default parametrized binary filter state

* Switched to std_msgs/msg/Bool.msg

* Use arbitrary filter values

* Update waffle.model

* Update waffle.model

* Update test_actions.cpp

* odom alpha restriction to avoid overflow caused by user-misconfiguration (#3238)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* Update controller server goal checker (#3240)

* [FIX] Update controller server goal checker

* [FIX] Autoformat code

* [FIX] Misplaced tabs.

Co-authored-by: Pedro Alejandro González <[email protected]>

* map-size restriction to avoid overflow and nullptr caused by user-misconfiguration (#3242)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* map-size restriction

* map-size code style

* map-size rejection

* map-size codestyle

* map-size return false

* Add Path Smoothers Benchmarking suite (#3236)

* Add Path Smoothers Benchmarking suite

* Meet review items

* Update tools/smoother_benchmarking/README.md

Co-authored-by: Steve Macenski <[email protected]>

* Move optional performance patch to the end of README

* Fix README

Co-authored-by: Steve Macenski <[email protected]>

* Fix typo (#3262)

* Adding new Nav2 Smoother: Savitzky-Golay Smoother (#3264)

* initial prototype of the Savitzky Golay Filter Path Smoother

* fixed indexing issue - tested working

* updates for filter

* adding unit tests for SG-filter smoother

* adding lifecycle transitions

* Added Line Iterator (#3197)

* Added Line Iterator

* Updated Line Iterator to a new iteration method

* Added the resolution as a parameter/ fixed linting

* Added the resolution as a parameter/ fixed linting

* Added unittests for the line iterator

* Added unittests based on "unittest" package

* Fixed __init__.py and rephrased some docstrings

* Fixed linting errors

* Fixed Linting Errors

* Added some unittests and removed some methods

* Dummy commit for CircleCI Issue

Co-authored-by: Afif Swaidan <[email protected]>

* bumping to 1.1.3 for release

Signed-off-by: Daisuke Sato <[email protected]>
Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Joshua Wallace <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: Abdullah Enes BEDİR <[email protected]>
Co-authored-by: Tobias Fischer <[email protected]>
Co-authored-by: Tejas Kumar Shastha <[email protected]>
Co-authored-by: Daisuke Sato <[email protected]>
Co-authored-by: Stevedan Ogochukwu Omodolor <[email protected]>
Co-authored-by: Lukas Fanta <[email protected]>
Co-authored-by: Jackson9 <[email protected]>
Co-authored-by: Ruffin <[email protected]>
Co-authored-by: Hao-Xuan Song <[email protected]>
Co-authored-by: Nicolas Rocha Pacheco <[email protected]>
Co-authored-by: Pedro Alejandro González <[email protected]>
Co-authored-by: jaeminSHIN <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
hyunseok-yang pushed a commit to lge-ros2/navigation2 that referenced this pull request Nov 23, 2022
* standalone assisted teleop (ros-navigation#2904)

* standalone assisted teleop

* added in action message

* code review

* moved to behavior server

* added assisted teleop bt node

* revert

* added bt node for assisted teleop

* lint fix

* added cancel assisted teleop node

* code review

* working

* cleanup

* updated feeback

* code review

* update compute velocity

* cleanup

* lint fixes

* cleanup

* test fix

* starting to add tests for assisted teleop

* fixed tests

* undo

* fixed test

* is_recovery

* adjust abort result based on recovery or not

* code review

* added preempt velocity

* working preempt assisted teleop test

* completed assisted teleop tests

* code review

* undo

* code review

* remove sleep

* topic rename

* missing comma

* added comma :(

* added comma

Co-authored-by: Steve Macenski <[email protected]>

* Add the support of range sensors to Collision Monitor (ros-navigation#3099)

* Support range sensors in Collision Monitor

* Adjust README.md

* Meet review fixes

* Fix ros-navigation#3152: Costmap extend did not include Y component (ros-navigation#3153)

* missing nodes added to nav2_tree_nodes.xml (ros-navigation#3155)

* Change deprecated ceres function (ros-navigation#3158)

* Change deprecated function

* Update smoother_cost_function.hpp

* remove camera_rgb_joint since child frame does not exist (ros-navigation#3162)

* bugfix (ros-navigation#3109) deadlock when costmap receives new map (ros-navigation#3145)

* bugfix (ros-navigation#3109) deadlock when costmap receives new map

Signed-off-by: Daisuke Sato <[email protected]>

* introduce map_received_in_update_bounds_ flag to make sure processMap will not be called between updateBounds and updateCosts

Signed-off-by: Daisuke Sato <[email protected]>

Signed-off-by: Daisuke Sato <[email protected]>

* simple command costmap api - first few functions (ros-navigation#3159)

* initial commit costmap_2d template

Signed-off-by: Stevedan Omodolor <[email protected]>

* finish task A and tested

* lint

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

Co-authored-by: Steve Macenski <[email protected]>

* fix trailing underscores

Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* Fix missing dependency on nav2_collision_monitor (ros-navigation#3175)

* fixed start (ros-navigation#3168)

* fixed start

* return true

* fix tests

* Fix velocities comparison for rotation at place case (ros-navigation#3177)

* Fix velocities comparison for rotation at place case

* Meet review item

* Remove unnecessary header

* Change the comment

* set a empty path on halt (ros-navigation#3178)

* set a empty path on halt

* fixed issues

* remove path reset

* fixing

* reverting

* revert

* revert

* fixed lint

* test fix

* uncrusify fix

* simple command costmap api - update few functions (ros-navigation#3169)

* * add aditional function to costmap_2d.py

Signed-off-by: Stevedan Omodolor <[email protected]>

Updated-by: Jaehun Kim <[email protected]>

* finish task B

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

* Update method docs

* Remove underscores at parameters and split getCost into getCostXY and getCostIdx

* Update method docstrings

* lint code & update docstring, remove default value of getCostXY

* lint code with pep257 & flake8

* clear names for bt nodes (ros-navigation#3183)

* [Smac] check if a node exists before creating (ros-navigation#3195)

* check if a node exists before creating

* invert logic to group like with like

* Update a_star.cpp

* fixing benchmarkign for planners (ros-navigation#3202)

* [Smac] Robin hood data structure improves performance by 10-15%! (ros-navigation#3201)

* adding robin_hood unordered_map

* using robin_hood node map

* ignore robin_hood file

* linting

* linting cont. for triple pointers

* linting cont. for uncrustify

* [RPP] Add parameter to enable/disable collision detection (ros-navigation#3204)

* [RPP] Add parameter to enable/disable collision detection

* [RPP] Update README

* Update waffle.model

* add benchmark launch file + instructions (ros-navigation#3218)

* removing hypotf from smac planner heuristic computation (ros-navigation#3217)

* removing hypotf

* swapping to node2d sqrt

* complete smac planner tolerances (ros-navigation#3219)

* Disable Output Buffering (ros-navigation#3220)

To ensure await asyncio prints [Processing: %s]' every 30s as expected

* fix majority of python linting errors introduced in python costmap API additions to get CI turning over again (ros-navigation#3223)

* fix majority of python linting errors

* finish linting

* Assisted teleop simple commander (ros-navigation#3198)

* add assisted teleop to python api

* cleanup

* assisted teleop demo

* rename

* lint

* code review

* trigger build

* flake8 fix

* break cashe

* moved all v11 to v12

* lint fix

* remove package dep

* change default time allowance

* Costmap Filter enabling service (ros-navigation#3229)

* Add enabling service to costmap filters

* Add service testcase

* Fix comment

* Use toggle_filter service name

* Add binary flip costmap filter (ros-navigation#3228)

* Add binary flip costmap filter

* Move transformPose, worldToMask, getMaskData to CostmapFilter

* Added default parametrized binary filter state

* Switched to std_msgs/msg/Bool.msg

* Use arbitrary filter values

* Update waffle.model

* Update waffle.model

* Update test_actions.cpp

* odom alpha restriction to avoid overflow caused by user-misconfiguration (ros-navigation#3238)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* Update controller server goal checker (ros-navigation#3240)

* [FIX] Update controller server goal checker

* [FIX] Autoformat code

* [FIX] Misplaced tabs.

Co-authored-by: Pedro Alejandro González <[email protected]>

* map-size restriction to avoid overflow and nullptr caused by user-misconfiguration (ros-navigation#3242)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* map-size restriction

* map-size code style

* map-size rejection

* map-size codestyle

* map-size return false

* Add Path Smoothers Benchmarking suite (ros-navigation#3236)

* Add Path Smoothers Benchmarking suite

* Meet review items

* Update tools/smoother_benchmarking/README.md

Co-authored-by: Steve Macenski <[email protected]>

* Move optional performance patch to the end of README

* Fix README

Co-authored-by: Steve Macenski <[email protected]>

* Fix typo (ros-navigation#3262)

* Adding new Nav2 Smoother: Savitzky-Golay Smoother (ros-navigation#3264)

* initial prototype of the Savitzky Golay Filter Path Smoother

* fixed indexing issue - tested working

* updates for filter

* adding unit tests for SG-filter smoother

* adding lifecycle transitions

* Added Line Iterator (ros-navigation#3197)

* Added Line Iterator

* Updated Line Iterator to a new iteration method

* Added the resolution as a parameter/ fixed linting

* Added the resolution as a parameter/ fixed linting

* Added unittests for the line iterator

* Added unittests based on "unittest" package

* Fixed __init__.py and rephrased some docstrings

* Fixed linting errors

* Fixed Linting Errors

* Added some unittests and removed some methods

* Dummy commit for CircleCI Issue

Co-authored-by: Afif Swaidan <[email protected]>

* bumping to 1.1.3 for release

Signed-off-by: Daisuke Sato <[email protected]>
Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Joshua Wallace <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: Abdullah Enes BEDİR <[email protected]>
Co-authored-by: Tobias Fischer <[email protected]>
Co-authored-by: Tejas Kumar Shastha <[email protected]>
Co-authored-by: Daisuke Sato <[email protected]>
Co-authored-by: Stevedan Ogochukwu Omodolor <[email protected]>
Co-authored-by: Lukas Fanta <[email protected]>
Co-authored-by: Jackson9 <[email protected]>
Co-authored-by: Ruffin <[email protected]>
Co-authored-by: Hao-Xuan Song <[email protected]>
Co-authored-by: Nicolas Rocha Pacheco <[email protected]>
Co-authored-by: Pedro Alejandro González <[email protected]>
Co-authored-by: jaeminSHIN <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
jwallace42 added a commit to jwallace42/navigation2 that referenced this pull request Dec 14, 2022
* standalone assisted teleop

* added in action message

* code review

* moved to behavior server

* added assisted teleop bt node

* revert

* added bt node for assisted teleop

* lint fix

* added cancel assisted teleop node

* code review

* working

* cleanup

* updated feeback

* code review

* update compute velocity

* cleanup

* lint fixes

* cleanup

* test fix

* starting to add tests for assisted teleop

* fixed tests

* undo

* fixed test

* is_recovery

* adjust abort result based on recovery or not

* code review

* added preempt velocity

* working preempt assisted teleop test

* completed assisted teleop tests

* code review

* undo

* code review

* remove sleep

* topic rename

* missing comma

* added comma :(

* added comma

Co-authored-by: Steve Macenski <[email protected]>
shrijitsingh99 pushed a commit to moss-ag/navigation2 that referenced this pull request Mar 4, 2023
* standalone assisted teleop (ros-navigation#2904)

* standalone assisted teleop

* added in action message

* code review

* moved to behavior server

* added assisted teleop bt node

* revert

* added bt node for assisted teleop

* lint fix

* added cancel assisted teleop node

* code review

* working

* cleanup

* updated feeback

* code review

* update compute velocity

* cleanup

* lint fixes

* cleanup

* test fix

* starting to add tests for assisted teleop

* fixed tests

* undo

* fixed test

* is_recovery

* adjust abort result based on recovery or not

* code review

* added preempt velocity

* working preempt assisted teleop test

* completed assisted teleop tests

* code review

* undo

* code review

* remove sleep

* topic rename

* missing comma

* added comma :(

* added comma

Co-authored-by: Steve Macenski <[email protected]>

* Add the support of range sensors to Collision Monitor (ros-navigation#3099)

* Support range sensors in Collision Monitor

* Adjust README.md

* Meet review fixes

* Fix ros-navigation#3152: Costmap extend did not include Y component (ros-navigation#3153)

* missing nodes added to nav2_tree_nodes.xml (ros-navigation#3155)

* Change deprecated ceres function (ros-navigation#3158)

* Change deprecated function

* Update smoother_cost_function.hpp

* remove camera_rgb_joint since child frame does not exist (ros-navigation#3162)

* bugfix (ros-navigation#3109) deadlock when costmap receives new map (ros-navigation#3145)

* bugfix (ros-navigation#3109) deadlock when costmap receives new map

Signed-off-by: Daisuke Sato <[email protected]>

* introduce map_received_in_update_bounds_ flag to make sure processMap will not be called between updateBounds and updateCosts

Signed-off-by: Daisuke Sato <[email protected]>

Signed-off-by: Daisuke Sato <[email protected]>

* simple command costmap api - first few functions (ros-navigation#3159)

* initial commit costmap_2d template

Signed-off-by: Stevedan Omodolor <[email protected]>

* finish task A and tested

* lint

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

Co-authored-by: Steve Macenski <[email protected]>

* fix trailing underscores

Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* Fix missing dependency on nav2_collision_monitor (ros-navigation#3175)

* fixed start (ros-navigation#3168)

* fixed start

* return true

* fix tests

* Fix velocities comparison for rotation at place case (ros-navigation#3177)

* Fix velocities comparison for rotation at place case

* Meet review item

* Remove unnecessary header

* Change the comment

* set a empty path on halt (ros-navigation#3178)

* set a empty path on halt

* fixed issues

* remove path reset

* fixing

* reverting

* revert

* revert

* fixed lint

* test fix

* uncrusify fix

* simple command costmap api - update few functions (ros-navigation#3169)

* * add aditional function to costmap_2d.py

Signed-off-by: Stevedan Omodolor <[email protected]>

Updated-by: Jaehun Kim <[email protected]>

* finish task B

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

* Update method docs

* Remove underscores at parameters and split getCost into getCostXY and getCostIdx

* Update method docstrings

* lint code & update docstring, remove default value of getCostXY

* lint code with pep257 & flake8

* clear names for bt nodes (ros-navigation#3183)

* [Smac] check if a node exists before creating (ros-navigation#3195)

* check if a node exists before creating

* invert logic to group like with like

* Update a_star.cpp

* fixing benchmarkign for planners (ros-navigation#3202)

* [Smac] Robin hood data structure improves performance by 10-15%! (ros-navigation#3201)

* adding robin_hood unordered_map

* using robin_hood node map

* ignore robin_hood file

* linting

* linting cont. for triple pointers

* linting cont. for uncrustify

* [RPP] Add parameter to enable/disable collision detection (ros-navigation#3204)

* [RPP] Add parameter to enable/disable collision detection

* [RPP] Update README

* Update waffle.model

* add benchmark launch file + instructions (ros-navigation#3218)

* removing hypotf from smac planner heuristic computation (ros-navigation#3217)

* removing hypotf

* swapping to node2d sqrt

* complete smac planner tolerances (ros-navigation#3219)

* Disable Output Buffering (ros-navigation#3220)

To ensure await asyncio prints [Processing: %s]' every 30s as expected

* fix majority of python linting errors introduced in python costmap API additions to get CI turning over again (ros-navigation#3223)

* fix majority of python linting errors

* finish linting

* Assisted teleop simple commander (ros-navigation#3198)

* add assisted teleop to python api

* cleanup

* assisted teleop demo

* rename

* lint

* code review

* trigger build

* flake8 fix

* break cashe

* moved all v11 to v12

* lint fix

* remove package dep

* change default time allowance

* Costmap Filter enabling service (ros-navigation#3229)

* Add enabling service to costmap filters

* Add service testcase

* Fix comment

* Use toggle_filter service name

* Add binary flip costmap filter (ros-navigation#3228)

* Add binary flip costmap filter

* Move transformPose, worldToMask, getMaskData to CostmapFilter

* Added default parametrized binary filter state

* Switched to std_msgs/msg/Bool.msg

* Use arbitrary filter values

* Update waffle.model

* Update waffle.model

* Update test_actions.cpp

* odom alpha restriction to avoid overflow caused by user-misconfiguration (ros-navigation#3238)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* Update controller server goal checker (ros-navigation#3240)

* [FIX] Update controller server goal checker

* [FIX] Autoformat code

* [FIX] Misplaced tabs.

Co-authored-by: Pedro Alejandro González <[email protected]>

* map-size restriction to avoid overflow and nullptr caused by user-misconfiguration (ros-navigation#3242)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* map-size restriction

* map-size code style

* map-size rejection

* map-size codestyle

* map-size return false

* Add Path Smoothers Benchmarking suite (ros-navigation#3236)

* Add Path Smoothers Benchmarking suite

* Meet review items

* Update tools/smoother_benchmarking/README.md

Co-authored-by: Steve Macenski <[email protected]>

* Move optional performance patch to the end of README

* Fix README

Co-authored-by: Steve Macenski <[email protected]>

* Fix typo (ros-navigation#3262)

* Adding new Nav2 Smoother: Savitzky-Golay Smoother (ros-navigation#3264)

* initial prototype of the Savitzky Golay Filter Path Smoother

* fixed indexing issue - tested working

* updates for filter

* adding unit tests for SG-filter smoother

* adding lifecycle transitions

* Added Line Iterator (ros-navigation#3197)

* Added Line Iterator

* Updated Line Iterator to a new iteration method

* Added the resolution as a parameter/ fixed linting

* Added the resolution as a parameter/ fixed linting

* Added unittests for the line iterator

* Added unittests based on "unittest" package

* Fixed __init__.py and rephrased some docstrings

* Fixed linting errors

* Fixed Linting Errors

* Added some unittests and removed some methods

* Dummy commit for CircleCI Issue

Co-authored-by: Afif Swaidan <[email protected]>

* bumping to 1.1.3 for release

Signed-off-by: Daisuke Sato <[email protected]>
Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Joshua Wallace <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: Abdullah Enes BEDİR <[email protected]>
Co-authored-by: Tobias Fischer <[email protected]>
Co-authored-by: Tejas Kumar Shastha <[email protected]>
Co-authored-by: Daisuke Sato <[email protected]>
Co-authored-by: Stevedan Ogochukwu Omodolor <[email protected]>
Co-authored-by: Lukas Fanta <[email protected]>
Co-authored-by: Jackson9 <[email protected]>
Co-authored-by: Ruffin <[email protected]>
Co-authored-by: Hao-Xuan Song <[email protected]>
Co-authored-by: Nicolas Rocha Pacheco <[email protected]>
Co-authored-by: Pedro Alejandro González <[email protected]>
Co-authored-by: jaeminSHIN <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
shrijitsingh99 pushed a commit to moss-ag/navigation2 that referenced this pull request Mar 4, 2023
* standalone assisted teleop (ros-navigation#2904)

* standalone assisted teleop

* added in action message

* code review

* moved to behavior server

* added assisted teleop bt node

* revert

* added bt node for assisted teleop

* lint fix

* added cancel assisted teleop node

* code review

* working

* cleanup

* updated feeback

* code review

* update compute velocity

* cleanup

* lint fixes

* cleanup

* test fix

* starting to add tests for assisted teleop

* fixed tests

* undo

* fixed test

* is_recovery

* adjust abort result based on recovery or not

* code review

* added preempt velocity

* working preempt assisted teleop test

* completed assisted teleop tests

* code review

* undo

* code review

* remove sleep

* topic rename

* missing comma

* added comma :(

* added comma

Co-authored-by: Steve Macenski <[email protected]>

* Add the support of range sensors to Collision Monitor (ros-navigation#3099)

* Support range sensors in Collision Monitor

* Adjust README.md

* Meet review fixes

* Fix ros-navigation#3152: Costmap extend did not include Y component (ros-navigation#3153)

* missing nodes added to nav2_tree_nodes.xml (ros-navigation#3155)

* Change deprecated ceres function (ros-navigation#3158)

* Change deprecated function

* Update smoother_cost_function.hpp

* remove camera_rgb_joint since child frame does not exist (ros-navigation#3162)

* bugfix (ros-navigation#3109) deadlock when costmap receives new map (ros-navigation#3145)

* bugfix (ros-navigation#3109) deadlock when costmap receives new map

Signed-off-by: Daisuke Sato <[email protected]>

* introduce map_received_in_update_bounds_ flag to make sure processMap will not be called between updateBounds and updateCosts

Signed-off-by: Daisuke Sato <[email protected]>

Signed-off-by: Daisuke Sato <[email protected]>

* simple command costmap api - first few functions (ros-navigation#3159)

* initial commit costmap_2d template

Signed-off-by: Stevedan Omodolor <[email protected]>

* finish task A and tested

* lint

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

Co-authored-by: Steve Macenski <[email protected]>

* fix trailing underscores

Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* Fix missing dependency on nav2_collision_monitor (ros-navigation#3175)

* fixed start (ros-navigation#3168)

* fixed start

* return true

* fix tests

* Fix velocities comparison for rotation at place case (ros-navigation#3177)

* Fix velocities comparison for rotation at place case

* Meet review item

* Remove unnecessary header

* Change the comment

* set a empty path on halt (ros-navigation#3178)

* set a empty path on halt

* fixed issues

* remove path reset

* fixing

* reverting

* revert

* revert

* fixed lint

* test fix

* uncrusify fix

* simple command costmap api - update few functions (ros-navigation#3169)

* * add aditional function to costmap_2d.py

Signed-off-by: Stevedan Omodolor <[email protected]>

Updated-by: Jaehun Kim <[email protected]>

* finish task B

* Update nav2_simple_commander/nav2_simple_commander/costmap_2d.py

* Update method docs

* Remove underscores at parameters and split getCost into getCostXY and getCostIdx

* Update method docstrings

* lint code & update docstring, remove default value of getCostXY

* lint code with pep257 & flake8

* clear names for bt nodes (ros-navigation#3183)

* [Smac] check if a node exists before creating (ros-navigation#3195)

* check if a node exists before creating

* invert logic to group like with like

* Update a_star.cpp

* fixing benchmarkign for planners (ros-navigation#3202)

* [Smac] Robin hood data structure improves performance by 10-15%! (ros-navigation#3201)

* adding robin_hood unordered_map

* using robin_hood node map

* ignore robin_hood file

* linting

* linting cont. for triple pointers

* linting cont. for uncrustify

* [RPP] Add parameter to enable/disable collision detection (ros-navigation#3204)

* [RPP] Add parameter to enable/disable collision detection

* [RPP] Update README

* Update waffle.model

* add benchmark launch file + instructions (ros-navigation#3218)

* removing hypotf from smac planner heuristic computation (ros-navigation#3217)

* removing hypotf

* swapping to node2d sqrt

* complete smac planner tolerances (ros-navigation#3219)

* Disable Output Buffering (ros-navigation#3220)

To ensure await asyncio prints [Processing: %s]' every 30s as expected

* fix majority of python linting errors introduced in python costmap API additions to get CI turning over again (ros-navigation#3223)

* fix majority of python linting errors

* finish linting

* Assisted teleop simple commander (ros-navigation#3198)

* add assisted teleop to python api

* cleanup

* assisted teleop demo

* rename

* lint

* code review

* trigger build

* flake8 fix

* break cashe

* moved all v11 to v12

* lint fix

* remove package dep

* change default time allowance

* Costmap Filter enabling service (ros-navigation#3229)

* Add enabling service to costmap filters

* Add service testcase

* Fix comment

* Use toggle_filter service name

* Add binary flip costmap filter (ros-navigation#3228)

* Add binary flip costmap filter

* Move transformPose, worldToMask, getMaskData to CostmapFilter

* Added default parametrized binary filter state

* Switched to std_msgs/msg/Bool.msg

* Use arbitrary filter values

* Update waffle.model

* Update waffle.model

* Update test_actions.cpp

* odom alpha restriction to avoid overflow caused by user-misconfiguration (ros-navigation#3238)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* Update controller server goal checker (ros-navigation#3240)

* [FIX] Update controller server goal checker

* [FIX] Autoformat code

* [FIX] Misplaced tabs.

Co-authored-by: Pedro Alejandro González <[email protected]>

* map-size restriction to avoid overflow and nullptr caused by user-misconfiguration (ros-navigation#3242)

* odom alpha restriction

* odom alpha code style

* odom alpha code style

* odom alpha code style

* map-size restriction

* map-size code style

* map-size rejection

* map-size codestyle

* map-size return false

* Add Path Smoothers Benchmarking suite (ros-navigation#3236)

* Add Path Smoothers Benchmarking suite

* Meet review items

* Update tools/smoother_benchmarking/README.md

Co-authored-by: Steve Macenski <[email protected]>

* Move optional performance patch to the end of README

* Fix README

Co-authored-by: Steve Macenski <[email protected]>

* Fix typo (ros-navigation#3262)

* Adding new Nav2 Smoother: Savitzky-Golay Smoother (ros-navigation#3264)

* initial prototype of the Savitzky Golay Filter Path Smoother

* fixed indexing issue - tested working

* updates for filter

* adding unit tests for SG-filter smoother

* adding lifecycle transitions

* Added Line Iterator (ros-navigation#3197)

* Added Line Iterator

* Updated Line Iterator to a new iteration method

* Added the resolution as a parameter/ fixed linting

* Added the resolution as a parameter/ fixed linting

* Added unittests for the line iterator

* Added unittests based on "unittest" package

* Fixed __init__.py and rephrased some docstrings

* Fixed linting errors

* Fixed Linting Errors

* Added some unittests and removed some methods

* Dummy commit for CircleCI Issue

Co-authored-by: Afif Swaidan <[email protected]>

* bumping to 1.1.3 for release

Signed-off-by: Daisuke Sato <[email protected]>
Signed-off-by: Stevedan Omodolor <[email protected]>
Co-authored-by: Joshua Wallace <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: Abdullah Enes BEDİR <[email protected]>
Co-authored-by: Tobias Fischer <[email protected]>
Co-authored-by: Tejas Kumar Shastha <[email protected]>
Co-authored-by: Daisuke Sato <[email protected]>
Co-authored-by: Stevedan Ogochukwu Omodolor <[email protected]>
Co-authored-by: Lukas Fanta <[email protected]>
Co-authored-by: Jackson9 <[email protected]>
Co-authored-by: Ruffin <[email protected]>
Co-authored-by: Hao-Xuan Song <[email protected]>
Co-authored-by: Nicolas Rocha Pacheco <[email protected]>
Co-authored-by: Pedro Alejandro González <[email protected]>
Co-authored-by: jaeminSHIN <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
Co-authored-by: Afif Swaidan <[email protected]>
savalena pushed a commit to savalena/navigation2 that referenced this pull request Jul 5, 2024
* standalone assisted teleop

* added in action message

* code review

* moved to behavior server

* added assisted teleop bt node

* revert

* added bt node for assisted teleop

* lint fix

* added cancel assisted teleop node

* code review

* working

* cleanup

* updated feeback

* code review

* update compute velocity

* cleanup

* lint fixes

* cleanup

* test fix

* starting to add tests for assisted teleop

* fixed tests

* undo

* fixed test

* is_recovery

* adjust abort result based on recovery or not

* code review

* added preempt velocity

* working preempt assisted teleop test

* completed assisted teleop tests

* code review

* undo

* code review

* remove sleep

* topic rename

* missing comma

* added comma :(

* added comma

Co-authored-by: Steve Macenski <[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.

2 participants