Skip to content

Commit 74cc3aa

Browse files
authored
RST-13476 rename variable in 335Le URDF (#6)
This PR makes a minor change renaming the prefix variable to "name"
1 parent ba39c63 commit 74cc3aa

File tree

1 file changed

+46
-46
lines changed

1 file changed

+46
-46
lines changed

orbbec_description/urdf/gemini335Le_macro.urdf.xacro

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44

55
<xacro:macro name="gemini_335Le" params="
66
parent
7-
prefix:='camera'
7+
name:='camera'
88
*origin
99
sim_gazebo:=false
1010
gz_fps:='5'
1111
gz_image_width:='848'
1212
gz_image_height:='530'">
1313

1414
<!-- The original link started with camera_link -->
15-
<joint name="${prefix}_gemini_mount_fixed_joint" type="fixed">
15+
<joint name="${name}_gemini_mount_fixed_joint" type="fixed">
1616
<parent link="${parent}" />
17-
<child link="${prefix}_link" />
17+
<child link="${name}_link" />
1818
<xacro:insert_block name="origin"/>
1919
</joint>
2020

2121
<link
22-
name="${prefix}_link">
22+
name="${name}_link">
2323
<inertial>
2424
<origin
2525
xyz="0.01235 -0.0020872 0.013243"
@@ -54,147 +54,147 @@
5454
</collision>
5555
</link>
5656

57-
<link name="${prefix}_bottom_screw_frame" />
57+
<link name="${name}_bottom_screw_frame" />
5858
<joint
59-
name="${prefix}_bottom_screw_frame_joint"
59+
name="${name}_bottom_screw_frame_joint"
6060
type="fixed">
6161
<origin
6262
xyz="0 0 0"
6363
rpy="0 0 0" />
6464
<parent
65-
link="${prefix}_link" />
65+
link="${name}_link" />
6666
<child
67-
link="${prefix}_bottom_screw_frame" />
67+
link="${name}_bottom_screw_frame" />
6868
<axis
6969
xyz="0 0 0" />
7070
</joint>
7171

72-
<link name="${prefix}_infra2_frame" />
72+
<link name="${name}_infra2_frame" />
7373
<joint
74-
name="${prefix}_infra2_frame_joint"
74+
name="${name}_infra2_frame_joint"
7575
type="fixed">
7676
<origin
7777
xyz="0.034005 -0.0475 0.014048"
7878
rpy="0 0 0" />
7979
<parent
80-
link="${prefix}_link" />
80+
link="${name}_link" />
8181
<child
82-
link="${prefix}_infra2_frame" />
82+
link="${name}_infra2_frame" />
8383
<axis
8484
xyz="0 0 0" />
8585
</joint>
8686

87-
<link name="${prefix}_infra2_optical_frame" />
87+
<link name="${name}_infra2_optical_frame" />
8888
<joint
89-
name="${prefix}_infra2_optical_frame_joint"
89+
name="${name}_infra2_optical_frame_joint"
9090
type="fixed">
9191
<origin
9292
xyz="0 0 0"
9393
rpy="-1.5708 0 -1.5708" />
9494
<parent
95-
link="${prefix}_infra2_frame" />
95+
link="${name}_infra2_frame" />
9696
<child
97-
link="${prefix}_infra2_optical_frame" />
97+
link="${name}_infra2_optical_frame" />
9898
<axis
9999
xyz="0 0 0" />
100100
</joint>
101101

102102

103-
<link name="${prefix}_infra1_frame" />
103+
<link name="${name}_infra1_frame" />
104104
<joint
105-
name="${prefix}_infra1_frame_joint"
105+
name="${name}_infra1_frame_joint"
106106
type="fixed">
107107
<origin
108108
xyz="0.034005 0.0475 0.014048"
109109
rpy="0 0 0" />
110110
<parent
111-
link="${prefix}_link" />
111+
link="${name}_link" />
112112
<child
113-
link="${prefix}_infra1_frame" />
113+
link="${name}_infra1_frame" />
114114
<axis
115115
xyz="0 0 0" />
116116
</joint>
117117

118-
<link name="${prefix}_infra1_optical_frame" />
118+
<link name="${name}_infra1_optical_frame" />
119119
<joint
120-
name="${prefix}_infra1_optical_frame_joint"
120+
name="${name}_infra1_optical_frame_joint"
121121
type="fixed">
122122
<origin
123123
xyz="0 0 0"
124124
rpy="-1.5708 0 -1.5708" />
125125
<parent
126-
link="${prefix}_infra1_frame" />
126+
link="${name}_infra1_frame" />
127127
<child
128-
link="${prefix}_infra1_optical_frame" />
128+
link="${name}_infra1_optical_frame" />
129129
<axis
130130
xyz="0 0 0" />
131131
</joint>
132132

133-
<link name="${prefix}_depth_frame" />
133+
<link name="${name}_depth_frame" />
134134
<joint
135-
name="${prefix}_depth_frame_joint"
135+
name="${name}_depth_frame_joint"
136136
type="fixed">
137137
<parent
138-
link="${prefix}_infra1_frame" />
138+
link="${name}_infra1_frame" />
139139
<child
140-
link="${prefix}_depth_frame" />
140+
link="${name}_depth_frame" />
141141
<axis
142142
xyz="0 0 0" />
143143
</joint>
144144

145-
<link name="${prefix}_depth_optical_frame" />
145+
<link name="${name}_depth_optical_frame" />
146146
<joint
147-
name="${prefix}_depth_optical_frame_joint"
147+
name="${name}_depth_optical_frame_joint"
148148
type="fixed">
149149
<parent
150-
link="${prefix}_infra1_optical_frame" />
150+
link="${name}_infra1_optical_frame" />
151151
<child
152-
link="${prefix}_depth_optical_frame" />
152+
link="${name}_depth_optical_frame" />
153153
<axis
154154
xyz="0 0 0" />
155155
</joint>
156156

157-
<link name="${prefix}_color_frame" />
157+
<link name="${name}_color_frame" />
158158
<joint
159-
name="${prefix}_frame_frame_joint"
159+
name="${name}_frame_frame_joint"
160160
type="fixed">
161161
<origin
162162
xyz="0.034014 0.02375 0.014048"
163163
rpy="0 0 0" />
164164
<parent
165-
link="${prefix}_link" />
165+
link="${name}_link" />
166166
<child
167-
link="${prefix}_color_frame" />
167+
link="${name}_color_frame" />
168168
<axis
169169
xyz="0 0 0" />
170170
</joint>
171171

172-
<link name="${prefix}_color_optical_frame" />
172+
<link name="${name}_color_optical_frame" />
173173
<joint
174-
name="${prefix}_color_optical_frame_joint"
174+
name="${name}_color_optical_frame_joint"
175175
type="fixed">
176176
<origin
177177
xyz="0 0 0"
178178
rpy="-1.5708 0 -1.5708" />
179179
<parent
180-
link="${prefix}_color_frame" />
180+
link="${name}_color_frame" />
181181
<child
182-
link="${prefix}_color_optical_frame" />
182+
link="${name}_color_optical_frame" />
183183
<axis
184184
xyz="0 0 0" />
185185
</joint>
186186

187-
<link name="${prefix}_imu_frame" />
187+
<link name="${name}_imu_frame" />
188188
<joint
189-
name="${prefix}_imu_frame_joint"
189+
name="${name}_imu_frame_joint"
190190
type="fixed">
191191
<origin
192192
xyz="0.019757 0.03619 0.013358"
193193
rpy="0 0 0" />
194194
<parent
195-
link="${prefix}_link" />
195+
link="${name}_link" />
196196
<child
197-
link="${prefix}_imu_frame" />
197+
link="${name}_imu_frame" />
198198
<axis
199199
xyz="0 0 0" />
200200
</joint>
@@ -204,8 +204,8 @@
204204
<xacro:include filename="$(find realsense2_gz_description)/urdf/rgbd_camera.gazebo.xacro" />
205205
<!-- TODO: Upstream changes required for a triggered RBGD camera -->
206206
<xacro:gazebo_rgbd
207-
name="${prefix}"
208-
gz_topic_name="${prefix}"
207+
name="${name}"
208+
gz_topic_name="${name}"
209209
fps="${gz_fps}"
210210
image_width="${gz_image_width}"
211211
image_height="${gz_image_height}"

0 commit comments

Comments
 (0)