Skip to content

Commit 0b904ab

Browse files
committed
Address comments
1 parent 0e5e0fb commit 0b904ab

File tree

8 files changed

+5
-41
lines changed

8 files changed

+5
-41
lines changed

ar4_description/urdf/ar4.urdf.xacro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<robot name="ar4" xmlns:xacro="http://www.ros.org/wiki/xacro">
33
<xacro:property name="package_name" value="ar4_description"/>
44

5-
<xacro:arg name="include_gripper" default="true"/>
6-
75
<xacro:include filename="$(find ${package_name})/urdf/include/common_macros.urdf.xacro" />
86
<xacro:property name="robot_properties_yaml_dir" value="$(find ${package_name})/config/link_properties.yaml" />
97
<xacro:property name="robot_properties" value="${xacro.load_yaml(robot_properties_yaml_dir)}"/>

ar4_gazebo_sim/urdf/gz_ar4.urdf.xacro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<xacro:include filename="$(find ar4_gazebo_sim)/urdf/includes/ros2_control.xacro" />
1212

1313
<!-- ros2_control gripper extensions -->
14-
<xacro:include filename="$(find ar4_gazebo_sim)/urdf/includes/ar_gripper.ros2_control.xacro" />
14+
<xacro:include filename="$(find ar4_gazebo_sim)/urdf/includes/gripper.ros2_control.xacro" />
1515

1616
</robot>

ar4_gazebo_sim/urdf/includes/ar_gripper.ros2_control.xacro renamed to ar4_gazebo_sim/urdf/includes/gripper.ros2_control.xacro

File renamed without changes.

ar4_hardware_interface/launch/main.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from launch_ros.parameter_descriptions import ParameterFile
44
from launch_ros.substitutions import FindPackageShare
55

6-
# from launch.conditions import IfCondition
6+
from launch.conditions import IfCondition
77
from launch import LaunchDescription
88
from launch.actions import DeclareLaunchArgument
99
from launch.substitutions import LaunchConfiguration

ar4_moveit_config/.setup_assistant

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ moveit_setup_assistant_config:
77
package_settings:
88
author_name: Santiago Lopez
99
author_email: santiago.mendez@creativa77.com.ar
10-
generated_timestamp: 1738948185
10+
generated_timestamp: 1738012897
1111
control_xacro:
1212
command:
1313
- position
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
arm:
22
kinematics_solver: kdl_kinematics_plugin/KDLKinematicsPlugin
3-
kinematics_solver_search_resolution: 0.005
4-
kinematics_solver_timeout: 0.005
5-
kinematics_solver_attempts: 3
3+
kinematics_solver_search_resolution: 0.0050000000000000001
4+
kinematics_solver_timeout: 0.0050000000000000001

ar4_moveit_config/config/ros2_controllers.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ controller_manager:
88
gripper_controller:
99
type: position_controllers/GripperActionController
1010

11-
# gripper_controller:
12-
# type: joint_trajectory_controller/GripperActionController
13-
14-
1511
joint_state_broadcaster:
1612
type: joint_state_broadcaster/JointStateBroadcaster
1713

@@ -40,10 +36,6 @@ arm_controller:
4036
joint_5: { trajectory: 0.3, goal: 0.03 }
4137
joint_6: { trajectory: 0.3, goal: 0.03 }
4238

43-
# gripper_controller:
44-
# ros__parameters:
45-
# joint: finger_joint_1
46-
4739
gripper_controller:
4840
ros__parameters:
4941
joint: finger_joint_1

ar4_moveit_config/config/sensors_3d.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)