Skip to content

Commit 57693f5

Browse files
authored
Merge pull request #14 from ROBOTIS-GIT/develop
Develop
2 parents 03d31c4 + f3263c5 commit 57693f5

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
gripper_position:
22
type: effort_controllers/JointPositionController
33
joint: gripper
4-
pid: {p: 10.0, i: 0.0, d: 0.1}
5-
4+
pid: {p: 100, i: 0, d: 0}
65
gripper_sub_position:
76
type: effort_controllers/JointPositionController
87
joint: gripper_sub
9-
pid: {p: 10.0, i: 0.0, d: 0.1}
8+
pid: {p: 100, i: 0, d: 0}

open_manipulator_gazebo/launch/open_manipulator_controller.launch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
<!-- load the controllers -->
77
<node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false"
8-
output="screen" args="joint_state_controller
9-
joint1_position
8+
output="screen" args="joint1_position
109
joint2_position
1110
joint3_position
1211
joint4_position

open_manipulator_gazebo/launch/open_manipulator_gazebo.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<!-- Run a python script to the send a service call to gazebo_ros to spawn a URDF robot -->
1919
<node name="urdf_spawner" pkg="gazebo_ros" type="spawn_model" respawn="false" output="screen"
20-
args="-urdf -model open_manipulator -z 0.0 -param robot_description"/>
20+
args="-urdf -model open_manipulator -z 0.0 -J gripper_sub 0.005 -param robot_description"/>
2121

2222
<!-- Run controller utils -->
2323
<include file="$(find open_manipulator_gazebo)/launch/controller_utils.launch"/>

0 commit comments

Comments
 (0)