Skip to content

Uncommited changes before MSV2018 #4

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

Open
xBambusekD wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Uncommited changes before MSV2018 #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32d0f1d
Uncommited changes before MSV2018
artable-dev Nov 7, 2018
a3cd1ba
Merge branch 'master' into master
ZdenekM Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions art_pr2_interface/src/art_pr2_interface/art_pr2_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ def select_arm_for_drill(self, obj_to_drill, objects_frame_id, tf_listener):
else:
return self.LEFT_ARM

def select_arm_for_visual_inspection(self):
return self.RIGHT_ARM

def select_free_arm(self):
left_arm = self.get_arm_by_id(self.LEFT_ARM) if self.gripper_usage in [self.BOTH_ARM,
self.LEFT_ARM] else None # type: ArtGripper
Expand Down