← Back to branch summary

~shadowrobot/sr-ros-interface-ethercat/friction_comp_tests

« back to all changes in this revision

Viewing changes to sr_robot_lib/python_lib/etherCAT_hand_lib.py

  • Committer: Ugo Cupcic
  • Date: 2012-02-27 11:48:44 UTC
  • mfrom: (534.1.1 shadow_robot_ethercat)
  • Revision ID: ugo@shadowrobot.com-20120227114844-78pldz5v95pic6xt
Fixed bug. Now we don't read Torque from MOTOR_DATA_SLOW_MISC packets.
Fixed an error in the last merged version of etherCAT_hand_lib.py as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sr_robot_lib/python_lib/etherCAT_hand_lib.py
211
211
        #check if something is being published to this topic, otherwise
212
212
        # return false (the library is not activated)
213
213
        try:
214
 
            rospy.wait_for_message("/gazebo/joint_states", JointState, timeout = 0.2)
 
214
            rospy.wait_for_message("/joint_states", JointState, timeout = 0.2)
215
215
        except:
216
216
            return False
217
217
 
218
 
        self.joint_state_subscriber = rospy.Subscriber("/gazebo/joint_states", JointState, self.joint_state_callback)
 
218
        self.joint_state_subscriber = rospy.Subscriber("/joint_states", JointState, self.joint_state_callback)
219
219
        return True
220
220
 
221
221
    def on_close(self):