Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2021

This is an automatic backport of pull request #51 done by Mergify.
Cherry-pick of 865b02b has failed:

On branch mergify/bp/foxy/pr-51
Your branch is up to date with 'origin/foxy'.

You are currently cherry-picking commit 865b02b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   rclc/CMakeLists.txt
	modified:   rclc_examples/src/example_client_node.c
	modified:   rclc_examples/src/example_lifecycle_node.c
	modified:   rclc_examples/src/example_service_node.c
	modified:   rclc_lifecycle/CMakeLists.txt
	modified:   rclc_lifecycle/README.md
	modified:   rclc_lifecycle/include/rclc_lifecycle/rclc_lifecycle.h
	modified:   rclc_lifecycle/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclc_lifecycle/src/rclc_lifecycle/rclc_lifecycle.c
	both modified:   rclc_lifecycle/test/test_lifecycle.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* Adds service callback with service context

Adds an additional callback type and handling that allows passing
additional service context (void *) to a service callback.

#35

Signed-off-by: Arne Nordmann <[email protected]>

* Fixed service callback handling

Signed-off-by: Arne Nordmann <[email protected]>

* Adds user API and tests

* Adds user API to add service with additional context
* Tests (copied and adapted from service with request id tests)

Signed-off-by: Arne Nordmann <[email protected]>

* Proper tear-down of msgs

Signed-off-by: Arne Nordmann <[email protected]>

* Fixes service call with context tests

Signed-off-by: Arne Nordmann <[email protected]>

* Adds service callbacks to lifecycle node

Declares service callbacks for lifecycle services: get state and get available states

micro-ROS#40

Signed-off-by: Arne Nordmann <[email protected]>

* Adds callback for GetState service

micro-ROS#40

Signed-off-by: Arne Nordmann <[email protected]>

* Provide GetAvailableStates service

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* Example lifecycle node proides services

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* Implemented ChangeState service

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* Linting, documentation, example

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* commnted out check for received sequence id - error in build-job for rolling https://build.ros2.org/job/Rpr__rclc__ubuntu_focal_amd64/72/ see also PR #46 and issue #49

* Cmake linting

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* Adds missing declaration of callbacks

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* Pre-initialize all strings

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* Lifecycle services working

* Functions to initialize lifecycle services for nodes
* Exemplary lifecycle nodes with services

micro-ROS#40

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* Tests for service initialization

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* commnted out check for received sequence id - error in build-job for rolling https://build.ros2.org/job/Rpr__rclc__ubuntu_focal_amd64/72/ see also PR #46 and issue #49

Signed-off-by: Jan Staschulat <[email protected]>

* commnted out check for received sequence id - error in build-job for rolling https://build.ros2.org/job/Rpr__rclc__ubuntu_focal_amd64/72/ see also PR #46 and issue #49

Signed-off-by: Jan Staschulat <[email protected]>

* Ignoring unsuccessful SERVICE_TAKE (#175)

* resolved bug by ignoring RCL_RET_SERVICE_TAKE_FAILED

Signed-off-by: Jan Staschulat <[email protected]>

* data_available has to be reset to false, if rcl_take fails - this needs to be updated for subscriptions as well.

Signed-off-by: Jan Staschulat <[email protected]>

* Fixes init and cleanup

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

* commnted out check for received sequence id - error in build-job for rolling https://build.ros2.org/job/Rpr__rclc__ubuntu_focal_amd64/72/ see also PR #46 and issue #49

Signed-off-by: Jan Staschulat <[email protected]>

Co-authored-by: Jan Staschulat <[email protected]>
(cherry picked from commit 865b02b)

# Conflicts:
#	rclc_lifecycle/src/rclc_lifecycle/rclc_lifecycle.c
#	rclc_lifecycle/test/test_lifecycle.cpp
@codecov-commenter
Copy link

Codecov Report

Merging #192 (865b02b) into foxy (5e9846b) will increase coverage by 1.01%.
The diff coverage is 64.08%.

❗ Current head 865b02b differs from pull request most recent head 5c88249. Consider uploading reports for the commit 5c88249 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             foxy     #192      +/-   ##
==========================================
+ Coverage   59.94%   60.95%   +1.01%     
==========================================
  Files          11       13       +2     
  Lines        1016     1493     +477     
  Branches      331      444     +113     
==========================================
+ Hits          609      910     +301     
- Misses        275      377     +102     
- Partials      132      206      +74     
Impacted Files Coverage Δ
rclc_lifecycle/src/rclc_lifecycle/rclc_lifecycle.c 48.80% <44.95%> (+0.37%) ⬆️
...clc_parameter/src/rclc_parameter/parameter_utils.c 56.09% <56.09%> (ø)
rclc/src/rclc/executor_handle.c 69.86% <66.66%> (ø)
...lc_parameter/src/rclc_parameter/parameter_server.c 66.86% <66.86%> (ø)
rclc/src/rclc/executor.c 56.45% <67.24%> (+0.68%) ⬆️
rclc/src/rclc/client.c 89.47% <100.00%> (ø)
rclc/src/rclc/publisher.c 88.23% <100.00%> (ø)
rclc/src/rclc/service.c 89.47% <100.00%> (ø)
rclc/src/rclc/sleep.c 100.00% <100.00%> (ø)
rclc/src/rclc/subscription.c 88.23% <100.00%> (ø)
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5e9846b...5c88249. Read the comment docs.

@norro
Copy link
Collaborator

norro commented Aug 20, 2021

@JanStaschulat AFAIR, this PR would break API/ABI, conflicting with the quality declaration.
E.g., the enable_communication_interface parameter in rclc_make_node_a_lifecycle_node(), which is required for services, though. So I suggest to not backport this feature to foxy.

@JanStaschulat
Copy link
Contributor

I agree.

@JanStaschulat
Copy link
Contributor

Pull request is not backported because API break.

@mergify mergify bot deleted the mergify/bp/foxy/pr-51 branch August 20, 2021 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants