Merge remote-tracking branch 'origin/develop' into lower-rotational-gains-cartesian-impedance

CHANGELOG.md

 # CHANGELOG
 
+## 0.2.1 - UNRELEASED
+
+Requires `libfranka` >= 0.2.0
+
+  * Added missing dependency to `franka_example_controllers`
+
 ## 0.2.0 - 2018-01-29
 
 Requires `libfranka` >= 0.2.0

franka_control/CMakeLists.txt

@@ -21,7 +21,7 @@ find_package(catkin REQUIRED COMPONENTS
   tf2_msgs
 )
 
-find_package(Franka REQUIRED)
+find_package(Franka 0.2.0 REQUIRED)
 
 add_service_files(FILES
   SetCartesianImpedance.srv

franka_control/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_control</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>franka_control provides a hardware node to control a Franka Emika research robot</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_description/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_description</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>franka_description contains URDF files and meshes of Franka Emika robots</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_example_controllers/CMakeLists.txt

@@ -17,6 +17,7 @@ find_package(catkin REQUIRED COMPONENTS
 )
 
 find_package(Eigen3 REQUIRED)
+find_package(Franka 0.2.0 REQUIRED)
 
 add_message_files(FILES
   JointTorqueComparison.msg
@@ -33,6 +34,7 @@ catkin_package(
   INCLUDE_DIRS include
   LIBRARIES franka_example_controllers
   CATKIN_DEPENDS controller_interface franka_hw pluginlib
+  DEPENDS Franka
 )
 
 include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS})
@@ -56,7 +58,10 @@ add_dependencies(franka_example_controllers
   ${PROJECT_NAME}_gencfg
 )
 
-target_link_libraries(franka_example_controllers ${catkin_LIBRARIES})
+target_link_libraries(franka_example_controllers
+  ${catkin_LIBRARIES}
+  Franka::Franka
+)
 
 ## Installation
 install(TARGETS franka_example_controllers

franka_example_controllers/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_example_controllers</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>franka_example_controllers provides example code for controlling Franka Emika research robots with ros_control</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>
@@ -20,6 +20,7 @@
 
   <depend>controller_interface</depend>
   <depend>franka_hw</depend>
+  <depend>libfranka</depend>
   <depend>pluginlib</depend>
   <depend>realtime_tools</depend>
 

franka_gripper/CMakeLists.txt

@@ -14,7 +14,7 @@ find_package(catkin REQUIRED COMPONENTS
   actionlib_msgs
 )
 
-find_package(Franka REQUIRED)
+find_package(Franka 0.2.0 REQUIRED)
 
 add_action_files(
   DIRECTORY action

franka_gripper/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_gripper</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>This package implements the franka gripper of type Franka Hand for the use in ros</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_hw/CMakeLists.txt

@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
   roscpp
 )
 
-find_package(Franka REQUIRED)
+find_package(Franka 0.2.0 REQUIRED)
 
 catkin_package(
   INCLUDE_DIRS include

franka_hw/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_hw</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>franka_hw provides hardware interfaces for using Franka Emika research robots with ros_control</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_msgs/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_msgs</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>franka_msgs provides messages specific to Franka Emika research robots</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_ros/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_ros</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>franka_ros is a metapackage for all Franka Emika ROS packages</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_visualization/CMakeLists.txt

@@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS
   roscpp
 )
 
-find_package(Franka REQUIRED)
+find_package(Franka 0.2.0 REQUIRED)
 
 catkin_package(CATKIN_DEPENDS sensor_msgs roscpp)
 

franka_visualization/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_visualization</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description>This package contains visualization tools for Franka Emika.</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

panda_moveit_config/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>panda_moveit_config</name>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
   <description> A partly automatically generated package with all the configuration and launch files for using Panda research with MoveIt!</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>