Revert "correct merge"

This reverts commit 7f605f27a1.
This commit is contained in:
Splinter1984 2022-03-21 23:19:30 +08:00
parent 7f605f27a1
commit f18ccccd7e
75 changed files with 3558 additions and 1983 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -41,7 +41,7 @@
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh filename="package://rasmt_support/meshes/collision/Base_Link.stl" />
<mesh filename="package://rasmt_support/meshes/collision/Base_Link.STL" />
</geometry>
</collision>
</link>
@ -75,7 +75,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Fork_1.stl" />
filename="package://rasmt_support/meshes/collision/Fork_1.STL" />
</geometry>
</collision>
</link>
@ -135,7 +135,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Link_1.stl" />
filename="package://rasmt_support/meshes/collision/Link_1.STL" />
</geometry>
</collision>
</link>
@ -195,7 +195,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Fork_2.stl" />
filename="package://rasmt_support/meshes/collision/Fork_2.STL" />
</geometry>
</collision>
</link>
@ -255,7 +255,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Link_2.stl" />
filename="package://rasmt_support/meshes/collision/Link_2.STL" />
</geometry>
</collision>
</link>
@ -315,7 +315,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Fork_3.stl" />
filename="package://rasmt_support/meshes/collision/Fork_3.STL" />
</geometry>
</collision>
</link>
@ -375,7 +375,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Dock_Link.stl" />
filename="package://rasmt_support/meshes/collision/Dock_Link.STL" />
</geometry>
</collision>
</link>

View file

@ -42,7 +42,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Grip_Body.stl" />
filename="package://rasmt_support/meshes/collision/Grip_Body.STL" />
</geometry>
</collision>
</link>
@ -97,7 +97,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Grip_L.stl" />
filename="package://rasmt_support/meshes/collision/Grip_L.STL" />
</geometry>
</collision>
</link>
@ -157,7 +157,7 @@
rpy="0 0 0" />
<geometry>
<mesh
filename="package://rasmt_support/meshes/collision/Grip_R.stl" />
filename="package://rasmt_support/meshes/collision/Grip_R.STL" />
</geometry>
</collision>
</link>