EmbodiedAI
/
unitree_mujoco
mirror of https://github.com/unitreerobotics/unitree_mujoco.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug in ubuntu22

This commit is contained in:
kanonwy 2024-09-04 09:46:37 +08:00
parent 9f60255eb8
commit 703c108496
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
simulate/src/joystick/jstest.cc
View File

@ -2,6 +2,7 @@
#include <iostream> #include <iostream>
#include <map> #include <map>
#include "joystick.h" #include "joystick.h"
#include <cstdint>
#define GAMEPAD_TYPE 1 // 1: XBOX, 0: SWITCH #define GAMEPAD_TYPE 1 // 1: XBOX, 0: SWITCH
#define MAX_AXES_VALUE 32768 #define MAX_AXES_VALUE 32768

8
simulate/src/mujoco/simulate.cc
View File

@ -745,8 +745,8 @@ namespace
{mjITEM_EDITNUM, "LS Tol", 2, &(opt->ls_tolerance), "1 0 0.1"}, {mjITEM_EDITNUM, "LS Tol", 2, &(opt->ls_tolerance), "1 0 0.1"},
{mjITEM_EDITINT, "Noslip Iter", 2, &(opt->noslip_iterations), "1 0 1000"}, {mjITEM_EDITINT, "Noslip Iter", 2, &(opt->noslip_iterations), "1 0 1000"},
{mjITEM_EDITNUM, "Noslip Tol", 2, &(opt->noslip_tolerance), "1 0 1"}, {mjITEM_EDITNUM, "Noslip Tol", 2, &(opt->noslip_tolerance), "1 0 1"},
{mjITEM_EDITINT, "MPR Iter", 2, &(opt->mpr_iterations), "1 0 1000"}, {mjITEM_EDITINT, "MPR Iter", 2, &(opt->ls_iterations), "1 0 1000"},
{mjITEM_EDITNUM, "MPR Tol", 2, &(opt->mpr_tolerance), "1 0 1"}, {mjITEM_EDITNUM, "MPR Tol", 2, &(opt->ls_tolerance), "1 0 1"},
{mjITEM_EDITNUM, "API Rate", 2, &(opt->apirate), "1 0 1000"}, {mjITEM_EDITNUM, "API Rate", 2, &(opt->apirate), "1 0 1000"},
{mjITEM_EDITINT, "SDF Iter", 2, &(opt->sdf_iterations), "1 1 20"}, {mjITEM_EDITINT, "SDF Iter", 2, &(opt->sdf_iterations), "1 1 20"},
{mjITEM_EDITINT, "SDF Init", 2, &(opt->sdf_initpoints), "1 1 100"}, {mjITEM_EDITINT, "SDF Init", 2, &(opt->sdf_initpoints), "1 1 100"},
@ -2108,7 +2108,7 @@ namespace mujoco
X(impratio); X(impratio);
X(tolerance); X(tolerance);
X(noslip_tolerance); X(noslip_tolerance);
X(mpr_tolerance); X(ls_tolerance);
X(gravity); X(gravity);
X(wind); X(wind);
X(magnetic); X(magnetic);
@ -2124,7 +2124,7 @@ namespace mujoco
X(solver); X(solver);
X(iterations); X(iterations);
X(noslip_iterations); X(noslip_iterations);
X(mpr_iterations); X(ls_iterations);
X(disableflags); X(disableflags);
X(enableflags); X(enableflags);
X(disableactuator); X(disableactuator);