Skip to content

Commit b60e031

Browse files
committed
cob_apps
1 parent 9242bd8 commit b60e031

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

cob_bringup/ros/launch/sim.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<include file="$(find cob_gazebo_worlds)/ros/launch/$(env ROBOT_ENV).launch" />
99
<include file="$(find cob_gazebo)/ros/launch/robot.launch" />
1010

11+
<rosparam command="load" ns="arm_controller" file="$(find cob_arm)/ros/launch/$(env ROBOT).yaml"/>
1112
<include file="$(find cob_base)/ros/launch/sim.launch" />
1213

1314
<!-- start nodelet manager -->
@@ -17,7 +18,6 @@
1718
<node pkg="cob_manipulator" type="cob_ik_solver_kdl" name="cob_ik_solver" ns="arm_controller" cwd="node" respawn="false" output="screen"/>
1819

1920
<!-- start cartesian interface -->
20-
<rosparam command="load" ns="arm_controller" file="$(find cob_arm)/ros/launch/$(env ROBOT).yaml"/>
2121
<node pkg="cob_manipulator" type="move_cart.py" name="move_cart" ns="arm_controller" cwd="node" respawn="false" output="screen"/>
2222

2323
<!-- provides get_fk, get_ik_solver_info WITH limits -->

cob_script_server/src/simple_script_server.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,7 @@ def move_cart_rel(self, component_name, parameter_name=[[0.0, 0.0, 0.0],[0.0, 0.
712712
# convert to Pose message
713713
pose = PoseStamped()
714714
pose.header.stamp = rospy.Time.now()
715-
pose.header.frame_id = "/arm_6_link"
716-
#pose.header.frame_id = "/sdh_palm_link"
715+
pose.header.frame_id = "/arm_7_link"
717716
pose.pose.position.x = param[0][0]
718717
pose.pose.position.y = param[0][1]
719718
pose.pose.position.z = param[0][2]

cob_teleop/ros/launch/cob3-1.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ arm: {
2424
}
2525

2626
sdh: {
27-
joint_names: ['sdh_finger_11_joint', 'sdh_finger_12_joint', 'sdh_finger_13_joint', 'sdh_finger_21_joint', 'sdh_finger_22_joint', 'sdh_finger_23_joint', 'sdh_thumb_2_joint', 'sdh_thumb_3_joint'],
28-
joint_step: [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0]
27+
joint_names: ['sdh_knuckle_joint', 'sdh_finger_12_joint', 'sdh_finger_13_joint', 'sdh_finger_22_joint', 'sdh_finger_23_joint', 'sdh_thumb_2_joint', 'sdh_thumb_3_joint'],
28+
joint_step: [0.0,0.0,0.0,0.0,0.0,0.0,0.0]
2929
}

cob_teleop/ros/launch/cob3-2.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ arm: {
2424
}
2525

2626
sdh: {
27-
joint_names: ['sdh_finger_11_joint', 'sdh_finger_12_joint', 'sdh_finger_13_joint', 'sdh_finger_21_joint', 'sdh_finger_22_joint', 'sdh_finger_23_joint', 'sdh_thumb_2_joint', 'sdh_thumb_3_joint'],
28-
joint_step: [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0]
27+
joint_names: ['sdh_knuckle_joint', 'sdh_finger_12_joint', 'sdh_finger_13_joint', 'sdh_finger_22_joint', 'sdh_finger_23_joint', 'sdh_thumb_2_joint', 'sdh_thumb_3_joint'],
28+
joint_step: [0.0,0.0,0.0,0.0,0.0,0.0,0.0]
2929
}

cob_teleop/ros/launch/cob3-3.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ arm: {
2424
}
2525

2626
sdh: {
27-
joint_names: ['sdh_finger_11_joint', 'sdh_finger_12_joint', 'sdh_finger_13_joint', 'sdh_finger_21_joint', 'sdh_finger_22_joint', 'sdh_finger_23_joint', 'sdh_thumb_2_joint', 'sdh_thumb_3_joint'],
28-
joint_step: [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0]
27+
joint_names: ['sdh_knuckle_joint', 'sdh_finger_12_joint', 'sdh_finger_13_joint', 'sdh_finger_22_joint', 'sdh_finger_23_joint', 'sdh_thumb_2_joint', 'sdh_thumb_3_joint'],
28+
joint_step: [0.0,0.0,0.0,0.0,0.0,0.0,0.0]
2929
}

0 commit comments

Comments
 (0)