Skip to content

Commit 8b95eb3

Browse files
committed
Add support to connect UR arm to parent platform.
Signed-off-by: Jelmer de Wolde <jelmer.de.wolde@alliander.com>
1 parent da02cda commit 8b95eb3

8 files changed

Lines changed: 861 additions & 33 deletions

File tree

.devcontainer/dev/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"twxs.cmake",
3131
"kylinideteam.cmake-intellisence",
3232
"redhat.vscode-yaml",
33+
"redhat.vscode-xml",
3334
"github.vscode-pull-request-github"
3435
]
3536
}

alliander_core/src/alliander_description/ur/urdf/adapted/ur_gz.urdf.xacro

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ https://code.visualstudio.com/docs/editing/codebasics#_compare-files
1010
<!-- robot name parameter -->
1111
<xacro:arg name="name" default="ur"/>
1212
<!-- import main macro -->
13-
<xacro:include filename="$(find ur_description)/urdf/ur_macro.xacro"/>
13+
<xacro:include filename="$(find alliander_description)/ur/urdf/adapted/ur_macro.xacro"/>
1414

1515
<xacro:include filename="$(find alliander_description)/ur/urdf/adapted/ur_gz.ros2_control.xacro" />
1616

@@ -31,39 +31,13 @@ https://code.visualstudio.com/docs/editing/codebasics#_compare-files
3131

3232
<xacro:arg name="simulation_controllers" default="" />
3333
<xacro:arg name="ros_namespace" default="" />
34-
35-
<!-- create link fixed to the "world" -->
36-
<link name="world" />
37-
38-
<link name="ground_plane">
39-
<visual>
40-
<origin rpy="0 0 0" xyz="0 0 0"/>
41-
<geometry>
42-
<box size="5 5 0"/>
43-
</geometry>
44-
<material name="ground_white">
45-
<color rgba="1 1 1 0.5"/>
46-
</material>
47-
</visual>
48-
<collision>
49-
<origin rpy="0 0 0" xyz="0 0 0"/>
50-
<geometry>
51-
<box size="5 5 0"/>
52-
</geometry>
53-
</collision>
54-
</link>
55-
56-
<joint name="ground_plane_joint" type="fixed">
57-
<origin xyz="0 0 -0.01" rpy="0 0 0"/>
58-
<parent link="world"/>
59-
<child link="ground_plane"/>
60-
</joint>
34+
<xacro:arg name="parent" default="world" />
6135

6236
<!-- arm -->
6337
<xacro:ur_robot
6438
name="$(arg name)"
6539
tf_prefix="$(arg tf_prefix)"
66-
parent="world"
40+
parent="$(arg parent)"
6741
joint_limits_parameters_file="$(arg joint_limit_params)"
6842
kinematics_parameters_file="$(arg kinematics_params)"
6943
physical_parameters_file="$(arg physical_params)"

0 commit comments

Comments
 (0)