search

ros-controls / ros2_control

Generic and simple controls framework for ROS 2
https://control.ros.org
Apache License 2.0
479 stars 293 forks source link

Handle on waiting #1562

Closed bmagyar closed 1 month ago

bmagyar commented 4 months ago

Conflict resolved from https://github.com/ros-controls/ros2_control/pull/1483

mergify[bot] commented 3 months ago

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

wittenator commented 3 months ago

We tested this PR (adding back in line 228 in controller_manager/controller_manager/spawner.py) and we were able to run ros2_control over a FastDDS discovery server.

bmagyar commented 2 months ago

I think I've touched up everything immediately needed. @fmauch , @wittenator could you guys please give me another round of feedback?

mergify[bot] commented 1 month ago

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

christophfroehlich commented 1 month ago

As written in different comments I think this needs some points to be addressed. I've updated thinks on my fork for cherry-picking.

If you create a PR to fix/spawner-interrupt, we could directly merge them in.

fmauch commented 1 month ago

As written in different comments I think this needs some points to be addressed. I've updated thinks on my fork for cherry-picking.

If you create a PR to fix/spawner-interrupt, we could directly merge them in.

Done in #1666

christophfroehlich commented 1 month ago

Note for myself: squash + merge from a PR with merge commits into another PR is not a good idea.

codecov[bot] commented 1 month ago

Codecov Report

Attention: Patch coverage is 2.12766% with 46 lines in your changes missing coverage. Please review.

Project coverage is 84.60%. Comparing base (07fb4f3) to head (921c106). Report is 2 commits behind head on master.

Files Patch % Lines
.../controller_manager/controller_manager_services.py 0.00% 18 Missing :warning:
...ler_manager/controller_manager/hardware_spawner.py 0.00% 13 Missing :warning:
controller_manager/controller_manager/spawner.py 0.00% 9 Missing :warning:
controller_manager/controller_manager/unspawner.py 0.00% 6 Missing :warning:
Additional details and impacted files ```diff @@ Coverage Diff @@ ## master #1562 +/- ## ======================================= Coverage 84.59% 84.60% ======================================= Files 115 115 Lines 10537 10459 -78 Branches 972 965 -7 ======================================= - Hits 8914 8849 -65 + Misses 1295 1284 -11 + Partials 328 326 -2 ``` | [Flag](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls) | `84.60% <2.12%> (+<0.01%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#carryforward-flags-in-the-pull-request-comment) to find out more. | [Files](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls) | Coverage Δ | | |---|---|---| | [controller\_manager/test/test\_spawner\_unspawner.cpp](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562?src=pr&el=tree&filepath=controller_manager%2Ftest%2Ftest_spawner_unspawner.cpp&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#diff-Y29udHJvbGxlcl9tYW5hZ2VyL3Rlc3QvdGVzdF9zcGF3bmVyX3Vuc3Bhd25lci5jcHA=) | `100.00% <100.00%> (+1.01%)` | :arrow_up: | | [controller\_manager/controller\_manager/unspawner.py](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562?src=pr&el=tree&filepath=controller_manager%2Fcontroller_manager%2Funspawner.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#diff-Y29udHJvbGxlcl9tYW5hZ2VyL2NvbnRyb2xsZXJfbWFuYWdlci91bnNwYXduZXIucHk=) | `0.00% <0.00%> (ø)` | | | [controller\_manager/controller\_manager/spawner.py](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562?src=pr&el=tree&filepath=controller_manager%2Fcontroller_manager%2Fspawner.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#diff-Y29udHJvbGxlcl9tYW5hZ2VyL2NvbnRyb2xsZXJfbWFuYWdlci9zcGF3bmVyLnB5) | `0.00% <0.00%> (ø)` | | | [...ler\_manager/controller\_manager/hardware\_spawner.py](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562?src=pr&el=tree&filepath=controller_manager%2Fcontroller_manager%2Fhardware_spawner.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#diff-Y29udHJvbGxlcl9tYW5hZ2VyL2NvbnRyb2xsZXJfbWFuYWdlci9oYXJkd2FyZV9zcGF3bmVyLnB5) | `0.00% <0.00%> (ø)` | | | [.../controller\_manager/controller\_manager\_services.py](https://app.codecov.io/gh/ros-controls/ros2_control/pull/1562?src=pr&el=tree&filepath=controller_manager%2Fcontroller_manager%2Fcontroller_manager_services.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#diff-Y29udHJvbGxlcl9tYW5hZ2VyL2NvbnRyb2xsZXJfbWFuYWdlci9jb250cm9sbGVyX21hbmFnZXJfc2VydmljZXMucHk=) | `0.00% <0.00%> (ø)` | |