Merge pull request #746 from erwincoumans/master

bugfix: in torque control mode, torque index starts at 6.
This commit is contained in:
erwincoumans 2016-08-18 16:11:46 -07:00 committed by GitHub
commit aee6b35382
2 changed files with 2 additions and 2 deletions

View File

@ -1418,7 +1418,7 @@ bool PhysicsServerCommandProcessor::processCommand(const struct SharedMemoryComm
b3Printf("Using CONTROL_MODE_TORQUE");
}
// mb->clearForcesAndTorques();
int torqueIndex = 0;
int torqueIndex = 6;
if ((clientCmd.m_updateFlags&SIM_DESIRED_STATE_HAS_MAX_FORCE)!=0)
{
for (int link=0;link<mb->getNumLinks();link++)

View File

@ -239,7 +239,7 @@ void b3Clock::usleep(int microSeconds)
Sleep(millis);
#else
usleep(microSeconds);
::usleep(microSeconds);
//struct timeval tv;
//tv.tv_sec = microSeconds/1000000L;
//tv.tv_usec = microSeconds%1000000L;