ros2_control
ros2_control copied to clipboard
Handle on waiting
Conflict resolved from https://github.com/ros-controls/ros2_control/pull/1483
This pull request is in conflict. Could you fix it @bmagyar?
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.
I think I've touched up everything immediately needed. @fmauch , @wittenator could you guys please give me another round of feedback?
This pull request is in conflict. Could you fix it @bmagyar?
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.
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
Note for myself: squash + merge from a PR with merge commits into another PR is not a good idea.
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.
Additional details and impacted files
@@ 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 | Coverage Δ | |
|---|---|---|
| unittests | 84.60% <2.12%> (+<0.01%) |
:arrow_up: |
Flags with carried forward coverage won't be shown. Click here to find out more.
| Files | Coverage Δ | |
|---|---|---|
| controller_manager/test/test_spawner_unspawner.cpp | 100.00% <100.00%> (+1.01%) |
:arrow_up: |
| controller_manager/controller_manager/unspawner.py | 0.00% <0.00%> (ø) |
|
| controller_manager/controller_manager/spawner.py | 0.00% <0.00%> (ø) |
|
| ...ler_manager/controller_manager/hardware_spawner.py | 0.00% <0.00%> (ø) |
|
| .../controller_manager/controller_manager_services.py | 0.00% <0.00%> (ø) |