Skip to content
Snippets Groups Projects

Improve armar7 platform movement

Merged Tobias Gröger requested to merge feature/improve-armar7-platform-movement into master
All threads resolved!
Compare and Show latest version
1 file
+ 7
1
Compare changes
  • Side-by-side
  • Inline
@@ -64,6 +64,7 @@ namespace armarx
data.velocityX = velX;
data.velocityY = velY;
data.velocityRotation = velRot;
data.commandTimestamp = IceUtil::Time::now();
setControlStruct(data);
// reinitTripleBuffer(data);
}
@@ -136,9 +137,14 @@ namespace armarx
float posFactor = posDelta.norm() / maxPositionAcceleration / dt;
factor = std::max(factor, posFactor);
float oriFactor = std::abs(delta(3)) / maxOrientationAcceleration / dt;
float oriFactor = std::abs(delta(2)) / maxOrientationAcceleration / dt;
factor = std::max(factor, oriFactor);
if (factor < 0)
{
throw LocalException("Error factor negative!");
}
state += delta / factor;
return state;
}
Loading