Skip to content

Commit 1c644c2

Browse files
davetcolemanclaude
andcommitted
Add lab desk objects, adjust collision wall/tray positions, and clean up lab_sim
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 6a1c79a commit 1c644c2

15 files changed

Lines changed: 2038 additions & 715 deletions

src/lab_sim/config/control/picknik_ur.ros2_control.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,25 @@ joint_trajectory_controller:
6464
stopped_velocity_tolerance: 0.0
6565
goal_time: 0.0
6666
linear_rail_joint:
67+
trajectory: 0.5
6768
goal: 0.05
6869
shoulder_pan_joint:
70+
trajectory: 0.5
6971
goal: 0.05
7072
shoulder_lift_joint:
73+
trajectory: 0.5
7174
goal: 0.05
7275
elbow_joint:
76+
trajectory: 0.5
7377
goal: 0.05
7478
wrist_1_joint:
79+
trajectory: 0.5
7580
goal: 0.05
7681
wrist_2_joint:
82+
trajectory: 0.5
7783
goal: 0.05
7884
wrist_3_joint:
85+
trajectory: 0.5
7986
goal: 0.05
8087
acceleration_limits:
8188
linear_rail_joint: 10.0
@@ -91,8 +98,8 @@ robotiq_gripper_controller:
9198
default: true
9299
joint: robotiq_85_left_knuckle_joint
93100
allow_stalling: true
94-
stall_timeout: 0.05
95-
goal_tolerance: 0.02
101+
stall_timeout: 0.3
102+
goal_tolerance: 0.3
96103

97104
force_torque_sensor_broadcaster:
98105
ros__parameters:
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/lab_sim/description/picknik_ur.xacro

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@
663663
<visual>
664664
<origin rpy="0 0 0" xyz="0 0 0" />
665665
<geometry>
666-
<box size="5.0 0.6 0.30" />
666+
<box size="5.0 0.2 0.30" />
667667
</geometry>
668668
<material name="grey">
669669
<color rgba="0.1 0.1 0.1 1.0" />
@@ -672,7 +672,7 @@
672672
<visual>
673673
<origin rpy="0 0 0" xyz="0 0.14 0.125" />
674674
<geometry>
675-
<box size="5.0 0.2 0.5" />
675+
<box size="5.0 0.12 0.5" />
676676
</geometry>
677677
<material name="grey">
678678
<color rgba="0.1 0.1 0.1 1.0" />
@@ -681,7 +681,7 @@
681681
<visual>
682682
<origin rpy="0 0 0" xyz="0 -0.22 0.125" />
683683
<geometry>
684-
<box size="5.0 0.12 0.5" />
684+
<box size="5.0 0.08 0.5" />
685685
</geometry>
686686
<material name="grey">
687687
<color rgba="0.1 0.1 0.1 1.0" />
@@ -690,7 +690,7 @@
690690
<collision>
691691
<origin rpy="0 0 0" xyz="0 0 0" />
692692
<geometry>
693-
<box size="5.0 0.6 0.3" />
693+
<box size="5.0 0.2 0.3" />
694694
</geometry>
695695
<material name="grey">
696696
<color rgba="0.1 0.1 0.1 1.0" />
@@ -699,7 +699,7 @@
699699
<collision>
700700
<origin rpy="0 0 0" xyz="0 0.14 0.125" />
701701
<geometry>
702-
<box size="5.0 0.2 0.5" />
702+
<box size="5.0 0.12 0.5" />
703703
</geometry>
704704
<material name="grey">
705705
<color rgba="0.1 0.1 0.1 1.0" />
@@ -708,7 +708,7 @@
708708
<collision>
709709
<origin rpy="0 0 0" xyz="0 -0.22 0.125" />
710710
<geometry>
711-
<box size="5.0 0.12 0.5" />
711+
<box size="5.0 0.08 0.5" />
712712
</geometry>
713713
<material name="grey">
714714
<color rgba="0.1 0.1 0.1 1.0" />

0 commit comments

Comments
 (0)