Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix diff_drive_skid test #357

Merged
merged 3 commits into from
Sep 17, 2020
Merged

Fix diff_drive_skid test #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
909de83
Fix diff_drive_skid test
azeey Sep 17, 2020
345de03
Merge branch 'ign-gazebo2' into fix_diff_drive_test
azeey Sep 17, 2020
f9d82ca
Update the required ign-physics version
azeey Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ign_find_package(ignition-physics1
mesh
sdf
REQUIRED
VERSION 1.7)
VERSION 1.9)
set(IGN_PHYSICS_VER ${ignition-physics1_VERSION_MAJOR})

#--------------------------------------
Expand Down
16 changes: 12 additions & 4 deletions examples/worlds/diff_drive_skid.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@
<surface>
<friction>
<ode>
<mu>0.01</mu>
<mu>0.5</mu>
<mu2>1.0</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -183,7 +185,9 @@
<surface>
<friction>
<ode>
<mu>5</mu>
<mu>0.5</mu>
<mu2>1.0</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -224,7 +228,9 @@
<surface>
<friction>
<ode>
<mu>0.01</mu>
<mu>0.5</mu>
<mu2>1.0</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
Expand Down Expand Up @@ -265,7 +271,9 @@
<surface>
<friction>
<ode>
<mu>5</mu>
<mu>0.5</mu>
<mu2>1.0</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
Expand Down
36 changes: 36 additions & 0 deletions test/worlds/diff_drive_skid.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@
<radius>0.3</radius>
</sphere>
</geometry>
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
</collision>
</link>

Expand Down Expand Up @@ -153,6 +162,15 @@
<radius>0.3</radius>
</sphere>
</geometry>
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
</collision>
</link>

Expand Down Expand Up @@ -187,6 +205,15 @@
<radius>0.3</radius>
</sphere>
</geometry>
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
</collision>
</link>

Expand Down Expand Up @@ -221,6 +248,15 @@
<radius>0.3</radius>
</sphere>
</geometry>
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1</mu2>
<fdir1>0 0 1</fdir1>
</ode>
</friction>
</surface>
</collision>
</link>

Expand Down