Merge pull request ros-industrial-attic#130 from jproberge/kinetic-devel

kinetic-devel release & update

Author: jproberge

.gitignore

@@ -35,6 +35,7 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+*.autosave
 
 CATKIN_IGNORE
 *.user

.travis.yml

@@ -1,28 +1,19 @@
 sudo: required 
-dist: trusty 
+dist: xenial 
 language: generic 
 compiler:
   - gcc
 notifications:
   email:
-    on_success: always
-    on_failure: always
-#    recipients:
-#      - jane@doe
+    on_success: never
+    on_failure: never
 env:
-  matrix:
-    - USE_DEB=true  ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - USE_DEB=true  ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-    - USE_DEB=true  ROS_DISTRO="jade"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - USE_DEB=true  ROS_DISTRO="jade"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
+  global:
     - ROS_DISTRO=kinetic
-matrix:
-  allow_failures:
-    - env: USE_DEB=true  ROS_DISTRO="jade"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - env: USE_DEB=true  ROS_DISTRO="jade"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-    - env: ROS_DISTRO=kinetic
+  matrix:
+    - ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
+    - ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script: 
   - source .ci_config/travis.sh
-#  - source ./travis.sh  # Enable this when you have a package-local script 

robotiq/package.xml

@@ -1,17 +1,18 @@
-<package>
+<?xml version="1.0"?>
+<package format="2">
   <name>robotiq</name>
   <version>1.0.0</version>
   <description>ROS drivers for Robotiq Adaptive Grippers and Robotiq Force Torque Sensor</description>
-  <maintainer email="[email protected]">Shaun Edwards</maintainer>
+  <maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
   <license>BSD</license>
-  <url type="website">http://ros.org/wiki/motoman</url>
+  <url type="website">http://ros.org/wiki/robotiq</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>robotiq_s_model_visualization</run_depend>
-  <run_depend>robotiq_modbus_tcp</run_depend>
-  <run_depend>robotiq_s_model_control</run_depend>
-  <run_depend>robotiq_c_model_control</run_depend>
-  <run_depend>robotiq_force_torque_sensor</run_depend>
+  <exec_depend>robotiq_3f_gripper_visualization</exec_depend>
+  <exec_depend>robotiq_modbus_tcp</exec_depend>
+  <exec_depend>robotiq_3f_gripper_control</exec_depend>
+  <exec_depend>robotiq_2f_gripper_control</exec_depend>
+  <exec_depend>robotiq_ft_sensor</exec_depend>
 
   <export>
     <metapackage/>

robotiq_arg2f_model_visualization/CMakeLists.txt renamed to robotiq_2f_140_gripper_visualization/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(robotiq_arg2f_model_visualization)
+project(robotiq_2f_140_gripper_visualization)
 find_package(catkin REQUIRED)
 catkin_package()
 

robotiq_arg2f_model_visualization/launch/test_robotiq_arg_2f_140_model.launch renamed to robotiq_2f_140_gripper_visualization/launch/test_robotiq_arg_2f_140_model.launch

@@ -2,9 +2,9 @@
 
 <launch>
   <arg name="gui" default="True" />
-  <param name="robot_description" command="$(find xacro)/xacro $(find robotiq_arg2f_model_visualization)/urdf/robotiq_arg2f_140_model.xacro" />
+  <param name="robot_description" command="$(find xacro)/xacro $(find robotiq_2f_140_gripper_visualization)/urdf/robotiq_arg2f_140_model.xacro" />
   <param name="use_gui" value="$(arg gui)"/>
   <node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" />
   <node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
-  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find robotiq_arg2f_model_visualization)/visualize.rviz" required="true" />
+  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find robotiq_2f_140_gripper_visualization)/visualize.rviz" required="true" />
 </launch>

robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_140_inner_finger.stl renamed to robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_140_inner_finger.stl

@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <package format="2">
-  <name>robotiq_arg2f_model_visualization</name>
+  <name>robotiq_2f_140_gripper_visualization</name>
   <version>1.0.0</version>
   <description>Robotiq ARG 2-Finger 140mm model</description>
   <license>BSD</license>
   <url type="website">http://ros.org/wiki/robotiq</url>
   <author email="[email protected]">Ryan Sinnet</author>
-  <maintainer email="ryan@rwsinnet.com">Ryan Sinnet</maintainer>
+  <maintainer email="j-p.roberge@robotiq.com">Jean-Philippe Roberge</maintainer>
 
   <buildtool_depend>catkin</buildtool_depend>
+
   <exec_depend>urdf</exec_depend>
 
-  <export/>
 </package>

robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_140_inner_knuckle.stl renamed to robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_140_inner_knuckle.stl

@@ -10,7 +10,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_base_link_fine.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_base_link_fine.stl" />
         </geometry>
         <material name="">
           <color rgba="0.1 0.1 0.1 1" />
@@ -19,7 +19,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 ${pi / 2}" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_base_link_coarse.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_base_link_coarse.stl" />
         </geometry>
       </collision>
     </link>

robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_140_outer_finger.stl renamed to robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_140_outer_finger.stl

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <robot name="robotiq_arg2f_140_model" xmlns:xacro="http://ros.org/wiki/xacro">
-  <xacro:include filename="$(find robotiq_arg2f_model_visualization)/urdf/robotiq_arg2f_140_model_macro.xacro" />
+  <xacro:include filename="$(find robotiq_2f_140_gripper_visualization)/urdf/robotiq_arg2f_140_model_macro.xacro" />
   <xacro:robotiq_arg2f_140 prefix=""/>
 </robot>

robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_140_outer_knuckle.stl renamed to robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_140_outer_knuckle.stl

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <robot xmlns:xacro="http://ros.org/wiki/xacro">
-  <xacro:include filename="$(find robotiq_arg2f_model_visualization)/urdf/robotiq_arg2f_transmission.xacro" />
+  <xacro:include filename="$(find robotiq_2f_140_gripper_visualization)/urdf/robotiq_arg2f_transmission.xacro" />
 
   <xacro:macro name="outer_knuckle" params="prefix fingerprefix stroke">
     <link name="${prefix}${fingerprefix}_outer_knuckle">
@@ -18,7 +18,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_outer_knuckle.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_outer_knuckle.stl" />
         </geometry>
         <material name="">
           <color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
@@ -27,7 +27,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_outer_knuckle.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_outer_knuckle.stl" />
         </geometry>
       </collision>
     </link>
@@ -49,7 +49,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_outer_finger.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_outer_finger.stl" />
         </geometry>
         <material name="">
           <color rgba="0.1 0.1 0.1 1" />
@@ -58,7 +58,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_outer_finger.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_outer_finger.stl" />
         </geometry>
       </collision>
     </link>
@@ -80,7 +80,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_inner_knuckle.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_inner_knuckle.stl" />
         </geometry>
         <material name="">
           <color rgba="0.1 0.1 0.1 1" />
@@ -89,7 +89,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_inner_knuckle.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_inner_knuckle.stl" />
         </geometry>
       </collision>
     </link>
@@ -111,7 +111,7 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_inner_finger.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_inner_finger.stl" />
         </geometry>
         <material name="">
           <color rgba="0.1 0.1 0.1 1" />
@@ -120,7 +120,7 @@
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_${stroke}_inner_finger.stl" />
+          <mesh filename="package://robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_${stroke}_inner_finger.stl" />
         </geometry>
       </collision>
     </link>
@@ -157,7 +157,7 @@
     </joint>
   </xacro:macro>
 
-  <xacro:include filename="$(find robotiq_arg2f_model_visualization)/urdf/robotiq_arg2f.xacro" />
+  <xacro:include filename="$(find robotiq_2f_140_gripper_visualization)/urdf/robotiq_arg2f.xacro" />
 
   <xacro:macro name="finger_joint" params="prefix">
     <joint name="${prefix}finger_joint" type="revolute">

robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_base_link_coarse.stl renamed to robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_base_link_coarse.stl

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(robotiq_c2_model_visualization)
+project(robotiq_2f_c2_gripper_visualization)
 
 find_package(catkin REQUIRED)
 

robotiq_arg2f_model_visualization/meshes/robotiq_arg2f_base_link_fine.stl renamed to robotiq_2f_140_gripper_visualization/meshes/robotiq_arg2f_base_link_fine.stl

@@ -2,9 +2,9 @@
 
 <launch>
   <arg name="gui" default="True" />
-  <param name="robot_description" command="$(find xacro)/xacro $(find robotiq_c2_model_visualization)/urdf/robotiq_c2_model.xacro" />
+  <param name="robot_description" command="$(find xacro)/xacro $(find robotiq_2f_c2_gripper_visualization)/urdf/robotiq_c2_model.xacro" />
   <param name="use_gui" value="$(arg gui)"/>
   <node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" />
   <node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
-  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find robotiq_c2_model_visualization)/visualize.rviz" required="true" />
+  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find robotiq_2f_c2_gripper_visualization)/visualize.rviz" required="true" />
 </launch>

robotiq_arg2f_model_visualization/package.xml renamed to robotiq_2f_140_gripper_visualization/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<package>
-  <name>robotiq_c2_model_visualization</name>
+<package format="2">
+  <name>robotiq_2f_c2_gripper_visualization</name>
   <version>1.0.0</version>
   <description>
     <p>
@@ -10,14 +10,12 @@
     </p>
   </description>
 
-  <maintainer email="[email protected]">Jonathan Meyer</maintainer>
+  <maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
   <author>Kel Guerin </author>
-
-  <license>BSD</license>
-
   <url type="website">http://ros.org/wiki/robotiq</url>
+  <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>xacro</run_depend>
+  <exec_depend>xacro</exec_depend>
 
 </package>