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

Understandable message for /reset_error if major alarm is active #298

Merged
merged 1 commit into from
Sep 10, 2024

Conversation

jimmy-mcelwain
Copy link
Collaborator

In reference to #181. Now if a major alarm is active upon calling /reset_error, motoros2 will not make any effort to reset alarms, and it will give a better response message. I also added a MotionNotReadyCode for major alarms, separating it from minor alarms.

@jimmy-mcelwain
Copy link
Collaborator Author

Here is the necessary motoros2_interfaces pr

src/ServiceResetError.c Outdated Show resolved Hide resolved
@ted-miller
Copy link
Collaborator

@jimmy-mcelwain I just restructured a bit for consistency with the rest of the code.

ted-miller
ted-miller previously approved these changes Sep 5, 2024
Copy link
Collaborator

@ted-miller ted-miller left a comment

Choose a reason for hiding this comment

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

@jimmy-mcelwain Let me know if you have any issue with my changes. Otherwise, I think it's good

src/ControllerStatusIO.c Outdated Show resolved Hide resolved
src/ServiceResetError.c Show resolved Hide resolved
src/ServiceResetError.c Outdated Show resolved Hide resolved
@gavanderhoorn
Copy link
Collaborator

as a final request: @jimmy-mcelwain: could you maybe squash your commits (and @ted-miller's fixup)? This change doesn't seem to need 4 commits :)

…or, and add MotionNotReady code for major alarm to differentiate from minor alarms
@gavanderhoorn
Copy link
Collaborator

Thanks @jimmy-mcelwain 👍

@gavanderhoorn gavanderhoorn merged commit 7bac007 into main Sep 10, 2024
5 of 14 checks passed
@gavanderhoorn gavanderhoorn deleted the MajorAlarmMessage branch September 10, 2024 14:07
@gavanderhoorn
Copy link
Collaborator

We'll need to fix CI after Yaskawa-Global/motoros2_interfaces#23 is merged.

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.

3 participants