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

Rebased and updated version of PR145 (robot_status msg publishing) #168

Merged

Conversation

gavanderhoorn
Copy link
Member

As per subject.

All the hard work done by @yamokosk and @keerthanamanivannan in #145.

yamokosk and others added 6 commits May 24, 2019 16:32
Four spaces was used more frequently for indentation throughout the Rapid code. Tabs were converted to spaces and in a few places extra spaces were added or removed.
motion_possible depends on ctrlr state and state of ROS motion task. Only when motion task (not motion server!) is running can motions be executed.
Otherwise, set it to zero.
@gavanderhoorn gavanderhoorn marked this pull request as ready for review May 24, 2019 14:37
@gavanderhoorn
Copy link
Member Author

Sigh GH<->Travis.

@gavanderhoorn
Copy link
Member Author

Let's wait for Travis and then merge.

@gavanderhoorn
Copy link
Member Author

And of course a review from someone else, as this is my own PR ..

@gavanderhoorn
Copy link
Member Author

Note: this should not be squash-merged.

@gavanderhoorn
Copy link
Member Author

@ros-industrial/ros-i-reviewers: could any of you take a look here?

@gavanderhoorn
Copy link
Member Author

I would like to get this in so we can push a new release of ros-industrial/abb.

@Levi-Armstrong Levi-Armstrong merged commit 556be0a into ros-industrial:kinetic-devel Jun 30, 2019
@gavanderhoorn
Copy link
Member Author

Thanks @Levi-Armstrong.

Did you have "rebase and merge" selected? That should not have been necessary.

@gavanderhoorn gavanderhoorn deleted the update_pr145 branch June 30, 2019 14:42
@gavanderhoorn
Copy link
Member Author

And a big thanks to @keerthanamanivannan and @yamokosk for all the work on this PR. I only did some management and testing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants