Merge pull request #46 in SWDEV/franka_ros from launchfile-fixes to master

* commit '5e19aedea992198c73598f4f131f89da435e866e':
  Correct include path for franka_control

franka_example_controllers/launch/cartesian_pose_example_controller.launch

@@ -3,7 +3,7 @@
   <arg name="robot_ip" default="robot.franka.de" />
   <arg name="arm_id" value="franka_emika" />
   <arg name="load_gripper" default="true" />
-  <include file="$(find franka_hw)/launch/franka_hw.launch" >
+  <include file="$(find franka_control)/launch/franka_control.launch" >
     <arg name="robot_ip" value="$(arg robot_ip)" />
     <arg name="arm_id" value="$(arg arm_id)" />
     <arg name="load_gripper" value="$(arg load_gripper)" />

franka_example_controllers/launch/cartesian_velocity_example_controller.launch

@@ -3,7 +3,7 @@
   <arg name="robot_ip" default="robot.franka.de" />
   <arg name="arm_id" value="franka_emika" />
   <arg name="load_gripper" default="true" />
-  <include file="$(find franka_hw)/launch/franka_hw.launch" >
+  <include file="$(find franka_control)/launch/franka_control.launch" >
     <arg name="robot_ip" value="$(arg robot_ip)" />
     <arg name="arm_id" value="$(arg arm_id)" />
     <arg name="load_gripper" value="$(arg load_gripper)" />

franka_example_controllers/launch/joint_impedance_example_controller.launch

@@ -3,7 +3,7 @@
   <arg name="robot_ip" default="robot.franka.de" />
   <arg name="arm_id" value="franka_emika" />
   <arg name="load_gripper" default="true" />
-  <include file="$(find franka_hw)/launch/franka_hw.launch" >
+  <include file="$(find franka_control)/launch/franka_control.launch" >
     <arg name="robot_ip" value="$(arg robot_ip)" />
     <arg name="arm_id" value="$(arg arm_id)" />
     <arg name="load_gripper" value="$(arg load_gripper)" />

franka_example_controllers/launch/joint_position_example_controller.launch

@@ -3,7 +3,7 @@
   <arg name="robot_ip" default="robot.franka.de" />
   <arg name="arm_id" value="franka_emika" />
   <arg name="load_gripper" default="true" />
-  <include file="$(find franka_hw)/launch/franka_hw.launch" >
+  <include file="$(find franka_control)/launch/franka_control.launch" >
     <arg name="robot_ip" value="$(arg robot_ip)" />
     <arg name="arm_id" value="$(arg arm_id)" />
     <arg name="load_gripper" value="$(arg load_gripper)" />

franka_example_controllers/launch/joint_velocity_example_controller.launch

@@ -3,7 +3,7 @@
   <arg name="robot_ip" default="robot.franka.de" />
   <arg name="arm_id" value="franka_emika" />
   <arg name="load_gripper" default="true" />
-  <include file="$(find franka_hw)/launch/franka_hw.launch" >
+  <include file="$(find franka_control)/launch/franka_control.launch" >
     <arg name="robot_ip" value="$(arg robot_ip)" />
     <arg name="arm_id" value="$(arg arm_id)" />
     <arg name="load_gripper" value="$(arg load_gripper)" />

franka_example_controllers/launch/model_example_controller.launch

@@ -3,7 +3,7 @@
   <arg name="robot_ip" default="robot.franka.de" />
   <arg name="arm_id" value="franka_emika" />
   <arg name="load_gripper" default="true" />
-  <include file="$(find franka_hw)/launch/franka_hw.launch" >
+  <include file="$(find franka_control)/launch/franka_control.launch" >
     <arg name="robot_ip" value="$(arg robot_ip)" />
     <arg name="arm_id" value="$(arg arm_id)" />
     <arg name="load_gripper" value="$(arg load_gripper)" />