Merge branch 'master' of github.com:matthias-mayr/Cartesian-Impedance…

…-Controller

README.md

@@ -66,7 +66,7 @@ cd catkin_ws
 git clone https://github.com/matthias-mayr/Cartesian-Impedance-Controller src/Cartesian-Impedance-Controller
 src/Cartesian-Impedance-Controller/scripts/install_dependencies.sh
 rosdep install --from-paths src --ignore-src --rosdistro=${ROS_DISTRO} -y
-catkin build # or catkin_make
+catkin_make # or 'catkin build'
 source devel/setup.bash
 ```
 
@@ -318,4 +318,4 @@ When starting the controller, this message appears:
 
  ### Controller crashes
 
- Most likely this happens because some parts of the stack like `iiwa_ros` or `RBDyn` were built with `SIMD`/`march=native` being turned on and other parts are not. Everything needs to be built with or without this option in order to have working alignment. This package builds without, because it is otherwise cumbersome for people to ensure that this happens across the whole stack.
+ Most likely this happens because some parts of the stack like `iiwa_ros` or `RBDyn` were built with `SIMD`/`march=native` being turned on and other parts are not. Everything needs to be built with or without this option in order to have working alignment. This package builds without, because it is otherwise cumbersome for people to ensure that this happens across the whole stack.

package.xml

@@ -51,6 +51,7 @@
   <exec_depend>tf</exec_depend>
   <exec_depend>tf_conversions</exec_depend>
   <exec_depend>trajectory_msgs</exec_depend>
+  <exec_depend>yaml-cpp</exec_depend>
 
   <export>
     <!-- Other tools can request additional information be placed here -->
@@ -64,4 +65,5 @@
   <test_depend>geometry_msgs</test_depend>
   <test_depend>std_msgs</test_depend>
   <test_depend>dynamic_reconfigure</test_depend>
+  <test_depend>yaml-cpp</test_depend>
 </package>

scripts/install_dependencies.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+sudo apt install python3-rosdep
 if [ ! -d "src" ]
 then
     print "This script should be run in a catkin workspace. Exiting."
@@ -43,4 +43,4 @@ sudo make install
 cd ../..
 
 # Rebuild the library cache
-sudo ldconfig
+sudo ldconfig