Skip to content

Commit

Permalink
Merge pull request #997 from tue-robotics/fix/reduce_errors_at_startup
Browse files Browse the repository at this point in the history
Fix/reduce errors at startup
  • Loading branch information
jlunenburg committed Feb 1, 2020
2 parents 92c4488 + 77a4e1c commit bf9bef7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
7 changes: 3 additions & 4 deletions robot_skills/src/robot_skills/hero.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ def __init__(self, wait_services=False):
self.parts['leftArm'].joint_names = self.parts['leftArm'].load_param('skills/arm/joint_names')

# These don't work for HSR because (then) Toyota's diagnostics aggregator makes the robot go into error somehow
for arm in self._arms.itervalues():
arm.unsubscribe_hardware_status()
for arm in self._arms.itervalues():
arm._operational = True
for part in self.parts.itervalues():
part.unsubscribe_hardware_status()
part._operational = True

# verify joint goal required for posing
assert 'arm_out_of_way' in self.parts['leftArm'].default_configurations,\
Expand Down
3 changes: 1 addition & 2 deletions robot_skills/src/robot_skills/robot_part.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ def wait_for_connections(self, timeout, log_failing_connections=True):
try:
connection.wait_for_service(timeout=0.01)
connected = True
except Exception as e:
rospy.logerr(e)
except Exception:
connected = False
elif isinstance(connection, rospy.Subscriber):
connected = connection.get_num_connections() >= 1
Expand Down

0 comments on commit bf9bef7

Please sign in to comment.