Fixing errors

shadow-robot · Sep 10, 2017 · 33b3a38 · 33b3a38
1 parent cf52d88
commit 33b3a38
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 101 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,4 @@ sr_multi_moveit/sr_multi_moveit_config/config/controllers.yaml
 sr_multi_moveit/sr_multi_moveit_config/config/joint_limits.yaml
 sr_multi_moveit/sr_multi_moveit_config/config/kinematics.yaml
 sr_multi_moveit/sr_multi_moveit_config/config/ompl_planning.yaml
+sr_multi_moveit/sr_multi_moveit_config/config/fake_controllers.yaml
diff --git a/sr_multi_moveit/sr_moveit_planner_benchmarking/README.md b/sr_multi_moveit/sr_moveit_planner_benchmarking/README.md
@@ -8,7 +8,7 @@ Different scenes can be found in the **data/inactive_tests** folder. To include
 To run all the benchmarkings, simply launch:
 
 ```
-roslaunch sr_moveit_planner_benchmarking test_bench.py
+roslaunch sr_moveit_planner_benchmarking test_bench.launch
 ```
 To visualise the tests in Rviz, set the visualisation argument in launch/benchmarking.launch to 'True'.
 

diff --git a/sr_multi_moveit/sr_moveit_planner_benchmarking/data/test/scene_1_2.yaml b/sr_multi_moveit/sr_moveit_planner_benchmarking/data/test/scene_1_2.yaml
diff --git a/sr_multi_moveit/sr_moveit_planner_benchmarking/data/test/scene_1_3.yaml b/sr_multi_moveit/sr_moveit_planner_benchmarking/data/test/scene_1_3.yaml
diff --git a/sr_multi_moveit/sr_moveit_planner_benchmarking/data/test/scene_1_4.yaml b/sr_multi_moveit/sr_moveit_planner_benchmarking/data/test/scene_1_4.yaml
diff --git a/sr_multi_moveit/sr_moveit_planner_benchmarking/package.xml b/sr_multi_moveit/sr_moveit_planner_benchmarking/package.xml
@@ -12,6 +12,7 @@
 
   <build_depend>sr_multi_description</build_depend>
   <build_depend>sr_benchmarking</build_depend>
+  <build_depend>python-tabulate</build_depend>
 
   <run_depend>moveit_ros_move_group</run_depend>
   <run_depend>moveit_planners_ompl</run_depend>
@@ -22,6 +23,7 @@
   <run_depend>xacro</run_depend>
   <run_depend>sr_multi_description</run_depend>
   <run_depend>sr_benchmarking</run_depend>
+  <run_depend>python-tabulate</run_depend>
 
   <buildtool_depend>catkin</buildtool_depend>
 

diff --git a/sr_multi_moveit/sr_multi_moveit_config/launch/demo.launch b/sr_multi_moveit/sr_multi_moveit_config/launch/demo.launch
@@ -16,7 +16,7 @@
   <arg name="robot_description" default="'$(find sr_multi_description)/urdf/right_srhand_ur10_joint_limited.urdf.xacro'"/>
 
   <!-- Kinematics file for the arm -->
-  <arg name="kinematics_file_name" default="kinematics.yaml"/>
+  <arg name="arm_kinematics_file_name" default="kinematics.yaml"/>
 
   <!-- Load the URDF, SRDF and other .yaml configuration files on the param server -->
   <include file="$(find sr_multi_moveit_config)/launch/planning_context.launch">