Skip to content
Snippets Groups Projects
Commit afafdee9 authored by Simon Ottenhaus's avatar Simon Ottenhaus
Browse files

fixed compile error

parent aeacf87d
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,6 @@ set(LIB_FILES
JointVelocityRamp.cpp
CartesianVelocityControllerWithRamp.cpp
SimpleDiffIK.cpp
SimpleGridReachability.cpp
)
set(LIB_HEADERS
......@@ -93,7 +92,6 @@ set(LIB_HEADERS
JointVelocityRamp.h
CartesianVelocityControllerWithRamp.h
SimpleDiffIK.h
SimpleGridReachability.h
EigenHelpers.h
)
......
......@@ -29,10 +29,9 @@ using namespace armarx;
SimpleDiffIK::Result SimpleDiffIK::CalculateDiffIK(const Eigen::Matrix4f targetPose, Parameters params)
SimpleDiffIK::Result SimpleDiffIK::CalculateDiffIK(const Eigen::Matrix4f targetPose, VirtualRobot::RobotNodeSetPtr rns, VirtualRobot::RobotNodePtr tcp, Parameters params)
{
VirtualRobot::RobotNodeSetPtr rns = params.nodeSet;
VirtualRobot::RobotNodePtr tcp = params.tcp ? params.tcp : rns->getTCP();
tcp = tcp ? tcp : rns->getTCP();
CartesianVelocityController velocityController(rns);
CartesianPositionController positionController(tcp);
......
......@@ -37,9 +37,7 @@ namespace armarx
public:
struct Parameters
{
VirtualRobot::RobotNodePtr tcp;
VirtualRobot::RobotNodeSetPtr nodeSet;
Parameters() {}
// IK params
float ikStepLengthInitial = 0.2f;
float ikStepLengthFineTune = 0.5f;
......@@ -61,7 +59,7 @@ namespace armarx
float minimumJointLimitMargin;
};
static Result CalculateDiffIK(const Eigen::Matrix4f targetPose, Parameters params);
static Result CalculateDiffIK(const Eigen::Matrix4f targetPose, VirtualRobot::RobotNodeSetPtr rns, VirtualRobot::RobotNodePtr tcp = VirtualRobot::RobotNodePtr(), Parameters params = Parameters());
};
}
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