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
+ 19
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,10 +137,27 @@ 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 < 1)
{
throw LocalException("Error factor negative!");
}
Eigen::Vector3f oldState = state;
state += delta / factor;
if (target == Eigen::Vector3f(0, 0, 0))
{
std::cout << "Tar is zero" << std::endl;
if (state.norm() >= oldState.norm())
{
throw LocalException("haeee");
}
}
return state;
}
Loading