Skip to content
Snippets Groups Projects
Commit 9d8defd6 authored by Tobias Gröger's avatar Tobias Gröger
Browse files

asd

parent ff292ee5
No related branches found
No related tags found
No related merge requests found
Pipeline #19037 passed
......@@ -92,10 +92,20 @@ namespace armarx
rtGetControlStruct().velocityY,
rtGetControlStruct().velocityRotation);
Eigen::VectorXf result = ramp.update(x, timeSinceLastIteration.toSecondsDouble());
target->velocityX = result(0);
target->velocityY = result(1);
target->velocityRotation = result(2);
if (x == Eigen::Vector3f::Zero())
{
target->velocityX = 0;
target->velocityY = 0;
target->velocityRotation = 0;
}
else
{
Eigen::VectorXf result = ramp.update(x, timeSinceLastIteration.toSecondsDouble());
target->velocityX = result(0);
target->velocityY = result(1);
target->velocityRotation = result(2);
}
}
}
......
......@@ -502,8 +502,10 @@ namespace armarx::RobotUnitModule
}
else
{
ARMARX_ERROR << "Invalid Platform velocity controller specified "
<< ""; //platformControllerType;
ARMARX_ERROR << "Invalid Platform velocity controller specified '"
<< NJointHolonomicPlatformVelocityControllerTypesNames.to_name(
platformControllerType)
<< "'";
}
NJointHolonomicPlatformRelativePositionControllerConfigPtr configRelativePositionCtrlCfg =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment