Browse Source

Decouple swappable joints from stop/runstop services

pull/53/head
Binit Shah 2 years ago
parent
commit
701cc7f139
1 changed files with 8 additions and 10 deletions
  1. +8
    -10
      stretch_core/nodes/stretch_driver

+ 8
- 10
stretch_core/nodes/stretch_driver View File

@ -277,11 +277,10 @@ class StretchBodyNode:
self.robot.lift.move_by(0.0)
self.robot.push_command()
self.robot.head.move_by('head_pan', 0.0)
self.robot.head.move_by('head_tilt', 0.0)
self.robot.end_of_arm.move_by('wrist_yaw', 0.0)
self.robot.end_of_arm.move_by('stretch_gripper', 0.0)
self.robot.push_command()
for joint in self.robot.head.joints:
self.robot.head.move_by(joint, 0.0)
for joint in self.robot.end_of_arm.joints:
self.robot.end_of_arm.move_by(joint, 0.0)
rospy.loginfo('Received stop_the_robot service call, so commanded all actuators to stop.')
return TriggerResponse(
@ -321,11 +320,10 @@ class StretchBodyNode:
self.robot.lift.move_by(0.0)
self.robot.push_command()
self.robot.head.move_by('head_pan', 0.0)
self.robot.head.move_by('head_tilt', 0.0)
self.robot.end_of_arm.move_by('wrist_yaw', 0.0)
self.robot.end_of_arm.move_by('stretch_gripper', 0.0)
self.robot.push_command()
for joint in self.robot.head.joints:
self.robot.head.move_by(joint, 0.0)
for joint in self.robot.end_of_arm.joints:
self.robot.end_of_arm.move_by(joint, 0.0)
self.robot.pimu.runstop_event_trigger()
else:

Loading…
Cancel
Save