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

Add major alarm as separate MotionNotReadyCode value #23

Merged
merged 1 commit into from
Sep 10, 2024

Conversation

jimmy-mcelwain
Copy link
Collaborator

Prerequisite for motoros2 pr to be merged (as is)

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.

Will merge with Yaskawa-Global/motoros2#298

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.

Just noticed that this conflicts with #17. We'll need to rebase after merging that.

msg/MotionReadyEnum.msg Outdated Show resolved Hide resolved
@gavanderhoorn
Copy link
Collaborator

@ted-miller wrote:

conflict with #17

while this is true, I'd suggest we merge this one first, as it's a relatively simple change and the corresponding Yaskawa-Global/motoros2#298 was just merged.

@jimmy-mcelwain jimmy-mcelwain force-pushed the MajorAlarm_MotionNotReady_Addition branch from bc7716e to fc41380 Compare September 10, 2024 15:25
@ted-miller
Copy link
Collaborator

Merging at Jimmy's request. He implemented the change requested by gavanderhoorn.

@ted-miller ted-miller merged commit 45b3cf2 into main Sep 10, 2024
1 check passed
@ted-miller ted-miller deleted the MajorAlarm_MotionNotReady_Addition branch September 10, 2024 15:30
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