Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ctu-mrs/mrs_uav_gazebo_simulation
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Feb 3, 2024
2 parents 05ab2f7 + c67016c commit a5bf679
Showing 1 changed file with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,12 @@ limitations under the License.
</cylinder>
</geometry>
<surface>
<ode>
<kp>1000000.0</kp>
<kd>1.0</kd>
<mu1>0.8</mu1>
<mu2>0.8</mu2>
<min_depth>0.001</min_depth>
<max_vel>0.0</max_vel>
</ode>
<contact>
<ode>
<min_depth>0.01</min_depth>
<max_vel>0.0</max_vel>
</ode>
</contact>
<friction>
<ode/>
</friction>
Expand Down

0 comments on commit a5bf679

Please sign in to comment.