Skip to content

fix bug in ubuntu22 #21

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix bug in ubuntu22 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions simulate/src/joystick/jstest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <iostream>
#include <map>
#include "joystick.h"
#include <cstdint>

#define GAMEPAD_TYPE 1 // 1: XBOX, 0: SWITCH
#define MAX_AXES_VALUE 32768
Expand Down
8 changes: 4 additions & 4 deletions simulate/src/mujoco/simulate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,8 +745,8 @@ namespace
{mjITEM_EDITNUM, "LS Tol", 2, &(opt->ls_tolerance), "1 0 0.1"},
{mjITEM_EDITINT, "Noslip Iter", 2, &(opt->noslip_iterations), "1 0 1000"},
{mjITEM_EDITNUM, "Noslip Tol", 2, &(opt->noslip_tolerance), "1 0 1"},
{mjITEM_EDITINT, "MPR Iter", 2, &(opt->mpr_iterations), "1 0 1000"},
{mjITEM_EDITNUM, "MPR Tol", 2, &(opt->mpr_tolerance), "1 0 1"},
{mjITEM_EDITINT, "MPR Iter", 2, &(opt->ls_iterations), "1 0 1000"},
{mjITEM_EDITNUM, "MPR Tol", 2, &(opt->ls_tolerance), "1 0 1"},
{mjITEM_EDITNUM, "API Rate", 2, &(opt->apirate), "1 0 1000"},
{mjITEM_EDITINT, "SDF Iter", 2, &(opt->sdf_iterations), "1 1 20"},
{mjITEM_EDITINT, "SDF Init", 2, &(opt->sdf_initpoints), "1 1 100"},
Expand Down Expand Up @@ -2108,7 +2108,7 @@ namespace mujoco
X(impratio);
X(tolerance);
X(noslip_tolerance);
X(mpr_tolerance);
X(ls_tolerance);
X(gravity);
X(wind);
X(magnetic);
Expand All @@ -2124,7 +2124,7 @@ namespace mujoco
X(solver);
X(iterations);
X(noslip_iterations);
X(mpr_iterations);
X(ls_iterations);
X(disableflags);
X(enableflags);
X(disableactuator);
Expand Down