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

fixed rcl_wait return error when timer cancelled (backport #1003) #1006

Merged
merged 1 commit into from
Sep 6, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 5, 2022

This is an automatic backport of pull request #1003 done by Mergify.


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.com

* add error msg in rcl wait

Signed-off-by: kevin <kevin@floatic.io>

* error not set reason changed

Signed-off-by: kevin <kevin@floatic.io>

* change error msg

Signed-off-by: kevin <kevin@floatic.io>

* change error msg

Signed-off-by: kevin <kevin@floatic.io>

* rcl wait bug when timer is cancelled

Signed-off-by: kevin <kevin@floatic.io>

* change step of check timer cancelled

Signed-off-by: kevin <kevin@floatic.io>

* fixed rcl_wait when timer cancelled

Signed-off-by: kevin <kevin@floatic.io>

* removed empty line

Signed-off-by: ladianchad <qhrejddlvltm@gmail.com>

Signed-off-by: kevin <kevin@floatic.io>
Signed-off-by: ladianchad <qhrejddlvltm@gmail.com>
Co-authored-by: kevin <kevin@floatic.io>
(cherry picked from commit 4b125b1)
@fujitatomoya
Copy link
Collaborator

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@fujitatomoya
Copy link
Collaborator

I don't think windows warning is related, merging.

@fujitatomoya fujitatomoya merged commit b7cf928 into humble Sep 6, 2022
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1003 branch September 6, 2022 16:45
@ros-discourse
Copy link

This pull request has been mentioned on ROS Discourse. There might be relevant details there:

https://discourse.ros.org/t/preparing-for-humble-sync-2022-09-09/27240/2

@doisyg
Copy link

doisyg commented Sep 7, 2022

Great! Can you tag/release it so it is included in the next sync ? https://discourse.ros.org/t/preparing-for-humble-sync-2022-09-09/27240/2

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.

4 participants