diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CHANGELOG.rst b/CHANGELOG.rst old mode 100644 new mode 100755 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.rst b/README.rst old mode 100644 new mode 100755 diff --git a/intera_examples/.gitignore b/intera_examples/.gitignore old mode 100644 new mode 100755 diff --git a/intera_examples/CHANGELOG.rst b/intera_examples/CHANGELOG.rst old mode 100644 new mode 100755 diff --git a/intera_examples/CMakeLists.txt b/intera_examples/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/intera_examples/LICENSE b/intera_examples/LICENSE old mode 100644 new mode 100755 diff --git a/intera_examples/README.rst b/intera_examples/README.rst old mode 100644 new mode 100755 diff --git a/intera_examples/launch/gripper_joystick.launch b/intera_examples/launch/gripper_joystick.launch old mode 100644 new mode 100755 diff --git a/intera_examples/launch/joint_position_joystick.launch b/intera_examples/launch/joint_position_joystick.launch old mode 100644 new mode 100755 diff --git a/intera_examples/launch/joint_trajectory_client.launch b/intera_examples/launch/joint_trajectory_client.launch old mode 100644 new mode 100755 diff --git a/intera_examples/launch/joint_trajectory_file_playback.launch b/intera_examples/launch/joint_trajectory_file_playback.launch old mode 100644 new mode 100755 diff --git a/intera_examples/package.xml b/intera_examples/package.xml old mode 100644 new mode 100755 diff --git a/intera_examples/setup.py b/intera_examples/setup.py old mode 100644 new mode 100755 diff --git a/intera_examples/share/images/sawyer_and_baxter.png b/intera_examples/share/images/sawyer_and_baxter.png old mode 100644 new mode 100755 diff --git a/intera_examples/share/images/sawyer_sdk_research.png b/intera_examples/share/images/sawyer_sdk_research.png old mode 100644 new mode 100755 diff --git a/intera_examples/src/intera_examples/__init__.py b/intera_examples/src/intera_examples/__init__.py old mode 100644 new mode 100755 diff --git a/intera_examples/src/intera_examples/recorder.py b/intera_examples/src/intera_examples/recorder.py old mode 100644 new mode 100755 diff --git a/intera_examples/src/intera_external_devices/__init__.py b/intera_examples/src/intera_external_devices/__init__.py old mode 100644 new mode 100755 diff --git a/intera_examples/src/intera_external_devices/getch.py b/intera_examples/src/intera_external_devices/getch.py old mode 100644 new mode 100755 diff --git a/intera_examples/src/intera_external_devices/joystick.py b/intera_examples/src/intera_external_devices/joystick.py old mode 100644 new mode 100755 diff --git a/intera_interface/.gitignore b/intera_interface/.gitignore old mode 100644 new mode 100755 diff --git a/intera_interface/CHANGELOG.rst b/intera_interface/CHANGELOG.rst old mode 100644 new mode 100755 diff --git a/intera_interface/CMakeLists.txt b/intera_interface/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/intera_interface/LICENSE b/intera_interface/LICENSE old mode 100644 new mode 100755 diff --git a/intera_interface/README.rst b/intera_interface/README.rst old mode 100644 new mode 100755 diff --git a/intera_interface/epydoc.config b/intera_interface/epydoc.config old mode 100644 new mode 100755 diff --git a/intera_interface/package.xml b/intera_interface/package.xml old mode 100644 new mode 100755 diff --git a/intera_interface/rosdoc.yaml b/intera_interface/rosdoc.yaml old mode 100644 new mode 100755 diff --git a/intera_interface/scripts/send_urdf_fragment.py b/intera_interface/scripts/send_urdf_fragment.py index 197fe71..86f3855 100755 --- a/intera_interface/scripts/send_urdf_fragment.py +++ b/intera_interface/scripts/send_urdf_fragment.py @@ -19,15 +19,15 @@ import argparse import rospy -import xacro_jade +import xacro from intera_core_msgs.msg import ( URDFConfiguration, ) def xacro_parse(filename): - doc = xacro_jade.parse(None, filename) - xacro_jade.process_doc(doc, in_order=True) + doc = xacro.parse(None, filename) + xacro.process_doc(doc, in_order=True) return doc.toprettyxml(indent=' ') def send_urdf(parent_link, root_joint, urdf_filename, duration): diff --git a/intera_interface/setup.py b/intera_interface/setup.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_control/__init__.py b/intera_interface/src/intera_control/__init__.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_control/pid.py b/intera_interface/src/intera_control/pid.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_dataflow/__init__.py b/intera_interface/src/intera_dataflow/__init__.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_dataflow/signals.py b/intera_interface/src/intera_dataflow/signals.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_dataflow/wait_for.py b/intera_interface/src/intera_dataflow/wait_for.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_dataflow/weakrefset.py b/intera_interface/src/intera_dataflow/weakrefset.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/__init__.py b/intera_interface/src/intera_interface/__init__.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/camera.py b/intera_interface/src/intera_interface/camera.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/clicksmart_plate.py b/intera_interface/src/intera_interface/clicksmart_plate.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/cuff.py b/intera_interface/src/intera_interface/cuff.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/digital_io.py b/intera_interface/src/intera_interface/digital_io.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/gripper.py b/intera_interface/src/intera_interface/gripper.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/gripper_factory.py b/intera_interface/src/intera_interface/gripper_factory.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/head.py b/intera_interface/src/intera_interface/head.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/head_display.py b/intera_interface/src/intera_interface/head_display.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/joint_limits.py b/intera_interface/src/intera_interface/joint_limits.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/lights.py b/intera_interface/src/intera_interface/lights.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/limb.py b/intera_interface/src/intera_interface/limb.py old mode 100644 new mode 100755 index d6d0f47..ddf79ea --- a/intera_interface/src/intera_interface/limb.py +++ b/intera_interface/src/intera_interface/limb.py @@ -163,21 +163,21 @@ def __init__(self, limb="right", synchronous_pub=False): ns_pkn = "ExternalTools/" + limb + "/PositionKinematicsNode/" self._iksvc = rospy.ServiceProxy(ns_pkn + 'IKService', SolvePositionIK) self._fksvc = rospy.ServiceProxy(ns_pkn + 'FKService', SolvePositionFK) - rospy.wait_for_service(ns_pkn + 'IKService', 5.0) - rospy.wait_for_service(ns_pkn + 'FKService', 5.0) + rospy.wait_for_service(ns_pkn + 'IKService', 25.0) + rospy.wait_for_service(ns_pkn + 'FKService', 25.0) err_msg = ("%s limb init failed to get current joint_states " "from %s") % (self.name.capitalize(), joint_state_topic) intera_dataflow.wait_for(lambda: len(self._joint_angle.keys()) > 0, - timeout_msg=err_msg, timeout=5.0) + timeout_msg=err_msg, timeout=25.0) err_msg = ("%s limb init failed to get current endpoint_state " "from %s") % (self.name.capitalize(), ns + 'endpoint_state') intera_dataflow.wait_for(lambda: len(self._cartesian_pose.keys()) > 0, - timeout_msg=err_msg, timeout=5.0) + timeout_msg=err_msg, timeout=25.0) err_msg = ("%s limb init failed to get current tip_states " "from %s") % (self.name.capitalize(), ns + 'tip_states') intera_dataflow.wait_for(lambda: self._tip_states is not None, - timeout_msg=err_msg, timeout=5.0) + timeout_msg=err_msg, timeout=25.0) def _on_joint_states(self, msg): for idx, name in enumerate(msg.name): diff --git a/intera_interface/src/intera_interface/navigator.py b/intera_interface/src/intera_interface/navigator.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/robot_enable.py b/intera_interface/src/intera_interface/robot_enable.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/robot_params.py b/intera_interface/src/intera_interface/robot_params.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_interface/settings.py b/intera_interface/src/intera_interface/settings.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_io/__init__.py b/intera_interface/src/intera_io/__init__.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_io/io_command.py b/intera_interface/src/intera_io/io_command.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_io/io_interface.py b/intera_interface/src/intera_io/io_interface.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_joint_trajectory_action/__init__.py b/intera_interface/src/intera_joint_trajectory_action/__init__.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_joint_trajectory_action/bezier.py b/intera_interface/src/intera_joint_trajectory_action/bezier.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_joint_trajectory_action/joint_trajectory_action.py b/intera_interface/src/intera_joint_trajectory_action/joint_trajectory_action.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_joint_trajectory_action/minjerk.py b/intera_interface/src/intera_joint_trajectory_action/minjerk.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/__init__.py b/intera_interface/src/intera_motion_interface/__init__.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/interaction_options.py b/intera_interface/src/intera_motion_interface/interaction_options.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/motion_controller_action_client.py b/intera_interface/src/intera_motion_interface/motion_controller_action_client.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/motion_trajectory.py b/intera_interface/src/intera_motion_interface/motion_trajectory.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/motion_waypoint.py b/intera_interface/src/intera_motion_interface/motion_waypoint.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/motion_waypoint_options.py b/intera_interface/src/intera_motion_interface/motion_waypoint_options.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/random_walk.py b/intera_interface/src/intera_motion_interface/random_walk.py old mode 100644 new mode 100755 diff --git a/intera_interface/src/intera_motion_interface/utility_functions.py b/intera_interface/src/intera_motion_interface/utility_functions.py old mode 100644 new mode 100755 diff --git a/intera_sdk/CHANGELOG.rst b/intera_sdk/CHANGELOG.rst old mode 100644 new mode 100755 diff --git a/intera_sdk/CMakeLists.txt b/intera_sdk/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/intera_sdk/package.xml b/intera_sdk/package.xml old mode 100644 new mode 100755