From cbe4c86e48b696af3e14b105ae8cbb4af0eb16d7 Mon Sep 17 00:00:00 2001
From: gavanderhoorn <g.a.vanderhoorn@tudelft.nl>
Date: Thu, 18 Jun 2020 14:04:05 +0200
Subject: [PATCH] gazebo: use new arg names for joint limits.

Renamed in ur_description, so use the new names here as well and pass the right values.
---
 ur_gazebo/urdf/ur_robot.urdf.xacro         | 4 ++--
 ur_gazebo/urdf/ur_robot_gazebo.macro.xacro | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ur_gazebo/urdf/ur_robot.urdf.xacro b/ur_gazebo/urdf/ur_robot.urdf.xacro
index 8c509a5e9..07a99e1e2 100644
--- a/ur_gazebo/urdf/ur_robot.urdf.xacro
+++ b/ur_gazebo/urdf/ur_robot.urdf.xacro
@@ -3,7 +3,7 @@
        name="ur" >
 
    <!-- common stuff -->
-   <xacro:arg name="joints_limits_params" default="$(find ur_description)/config/ur3/joint_limits.yaml"/>
+   <xacro:arg name="joint_limit_params" default="$(find ur_description)/config/ur3/joint_limits.yaml"/>
    <xacro:arg name="physical_params" default="$(find ur_description)/config/ur3/physical_parameters.yaml"/>
    <xacro:arg name="kinematics_params" default="$(find ur_description)/config/ur3/default_kinematics.yaml"/>
    <xacro:arg name="visual_params" default="$(find ur_description)/config/ur3/visual_parameters.yaml"/>
@@ -17,7 +17,7 @@
    <xacro:include filename="$(find ur_gazebo)/urdf/common.gazebo.xacro"/>
 
    <!-- arm -->
-   <xacro:ur_gazebo_robot prefix="" joints_limits_parameters_file="${load_yaml('$(arg joints_limits_params)')}" 
+   <xacro:ur_gazebo_robot prefix="" joint_limits_parameters_file="${load_yaml('$(arg joint_limit_params)')}" 
                              kinematics_parameters_file="${load_yaml('$(arg kinematics_params)')}" 
                              physical_parameters_file="${load_yaml('$(arg physical_params)')}" 
                              visual_parameters_file="${load_yaml('$(arg visual_params)')}"
diff --git a/ur_gazebo/urdf/ur_robot_gazebo.macro.xacro b/ur_gazebo/urdf/ur_robot_gazebo.macro.xacro
index fce5c83b6..7b851b1f4 100644
--- a/ur_gazebo/urdf/ur_robot_gazebo.macro.xacro
+++ b/ur_gazebo/urdf/ur_robot_gazebo.macro.xacro
@@ -7,11 +7,11 @@
 
  <xacro:include filename="$(find ur_description)/urdf/ur_macro.xacro"/>
 
- <xacro:macro name="ur_gazebo_robot" params="prefix joints_limits_parameters_file kinematics_parameters_file physical_parameters_file visual_parameters_file 
+ <xacro:macro name="ur_gazebo_robot" params="prefix joint_limits_parameters_file kinematics_parameters_file physical_parameters_file visual_parameters_file 
                   transmission_hw_interface:=hardware_interface/PositionJointInterface
                   safety_limits:=false safety_pos_margin:=0.15 safety_k_position:=20">
 
-    <xacro:ur_robot prefix="${prefix}" joints_limits_parameters_file="${joints_limits_parameters_file}"
+    <xacro:ur_robot prefix="${prefix}" joint_limits_parameters_file="${joint_limits_parameters_file}"
                     kinematics_parameters_file="${kinematics_parameters_file}"
                     physical_parameters_file="${physical_parameters_file}"
                     visual_parameters_file="${visual_parameters_file}"