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

Handle hardware errors in Resource Manager (backport #805) #abi-breaking #837

Merged
merged 4 commits into from
Dec 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2022

This is an automatic backport of pull request #805 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

@destogl destogl changed the title Handle hardware errors in Resource Manager (backport #805) Handle hardware errors in Resource Manager (backport #805) #abi-breaking Oct 15, 2022
Copy link

@anfemosa anfemosa left a comment

Choose a reason for hiding this comment

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

Looks good for me

@destogl destogl enabled auto-merge (squash) November 17, 2022 19:32
destogl
destogl previously approved these changes Nov 17, 2022
@Benjamin-Tan
Copy link

Any concerns/thoughts on this PR from the reviewers? Apart from the known ABI breaking

Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

Could this mean that current behavior of a setup changes, because the hardware_components' read/write methods had already a return type, which was just ignored before?

virtual return_type write(const rclcpp::Time & time, const rclcpp::Duration & period) = 0;

@destogl
Copy link
Member

destogl commented Aug 9, 2023

@bmagyar can we merge this?

* Add code for deactivating controller when hardware gets an error on read and write.

(cherry picked from commit e748824)
@destogl destogl force-pushed the mergify/bp/humble/pr-805 branch from e59a7a3 to 126c647 Compare August 9, 2023 17:41
@bmagyar bmagyar added the humble label Nov 3, 2023
Copy link
Contributor Author

mergify bot commented Nov 14, 2023

This pull request is in conflict. Could you fix it @mergify[bot]?

@Benjamin-Tan
Copy link

Benjamin-Tan commented Dec 1, 2023

Can this PR be merged with breaking ABI? Similarly to other backport PR. These seem to be preventing the humble branch from upgrading to the new release, keeping it at version 2 where as the main branch has gone to version 4 now.

@christophfroehlich
Copy link
Contributor

Can this PR be merged with breaking ABI? Similarly to other backport PR. These seem to be preventing the humble branch from upgrading to the new release, keeping it at version 2 where as the main branch has gone to version 4 now.

fyi the first number of the version number stands for the respective ROS distro (2.. humble, 3.. iron, 4.. rolling).

@bmagyar
Copy link
Member

bmagyar commented Dec 4, 2023

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Dec 4, 2023

rebase

☑️ Nothing to do

  • -conflict [:pushpin: rebase requirement]
  • -closed [:pushpin: rebase requirement]

Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

looks fine now! Just for completeness once again: User's hardware-components might explode now if they already returned ERROR.

@destogl destogl merged commit d7f9bd5 into humble Dec 10, 2023
11 of 12 checks passed
@destogl destogl deleted the mergify/bp/humble/pr-805 branch December 10, 2023 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants