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.

Sign up for GitHub

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

Jump to bottom

Also require primary deadman for arm teleop #92

Merged
merged 2 commits into from
Oct 25, 2018
Merged

Also require primary deadman for arm teleop #92

merged 2 commits into from
Oct 25, 2018

Conversation

erelson
Copy link
Collaborator

@erelson erelson commented Aug 27, 2018 •
edited
Loading

Not tested yet.

Will also likely backport to indigo-devel too.

@erelson erelson self-assigned this Aug 27, 2018
@erelson
Copy link
Collaborator Author

erelson commented Aug 27, 2018

@moriarty Did you want this same logic with the head teleop?

@erelson erelson requested a review from moriarty August 30, 2018 23:30
@erelson
Copy link
Collaborator Author

erelson commented Aug 30, 2018

Tested and verified this works with Fetch3! Ready for review @moriarty

Offline we discussed the head teleop, and agreed it was not a safety concern like the arm is.

I cherry picked my change onto the branch that was checked out (but made a new branch off that, namely: https://github.com/erelson/fetch_ros/tree/tf2-nav-melodic-devel_with-safer-teleop). The robot is still set up in this manner.

moriarty
moriarty approved these changes Oct 25, 2018
View reviewed changes
Copy link
Contributor

@moriarty moriarty left a comment

Choose a reason for hiding this comment

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

I was surprised the arm was safer today 👍

@moriarty moriarty merged commit da2b701 into melodic-devel Oct 25, 2018
@moriarty
Copy link
Contributor

@erelson That's strange... this was an open PR, so I preformed a squash-and-merge and just adjusted your commit message... and I now see the two original commits were already in melodic-devel?

@moriarty
Copy link
Contributor

#61 was merged into : 0.7.14 0.7.13 0.7.12 0.7.11

Should this be back-ported to indigo?

@erelson
Copy link
Collaborator Author

erelson commented Oct 25, 2018

I have no idea what happened there. My local melodic-devel didn't have the commits so I'm pretty sure I didn't force push them 😬 . Making backport.

@erelson
Copy link
Collaborator Author

erelson commented Oct 25, 2018

I believe of the above releases, only 0.7.14 is one we released, but I didn't check.

moriarty pushed a commit that referenced this pull request Oct 25, 2018
@erelson @moriarty
[teleop] Safer arm teleop (#95) (backport #92)
b285ca6 
* Require primary dead-man for arm teleop, along with with the angular
  or linear selector button.
@erelson erelson deleted the arm_teleop_safer branch February 1, 2019 06:43
@mikeferguson mikeferguson mentioned this pull request Mar 14, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moriarty moriarty moriarty approved these changes

Assignees

@erelson erelson

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@erelson @moriarty