Skip to content
Snippets Groups Projects
Commit 523e33b0 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Update ice interface

parent 8b8b25cf
No related branches found
No related tags found
1 merge request!76Update cartesian impedance and arviz
......@@ -22,6 +22,7 @@
#pragma once
#include <ArmarXCore/interface/serialization/Eigen.ice>
#include <RobotAPI/interface/units/RobotUnit/NJointController.ice>
module armarx
......@@ -29,24 +30,32 @@ module armarx
class NJointTaskSpaceImpedanceControlConfig extends NJointControllerConfig
{
string nodeSetName;
Ice::FloatSeq desiredPoseVec;
Ice::FloatSeq desiredJointPositions;
Ice::FloatSeq Kpos;
Ice::FloatSeq Kori;
Ice::FloatSeq Dpos;
Ice::FloatSeq Dori;
Ice::FloatSeq Knull;
Ice::FloatSeq Dnull;
float torqueLimit;
Eigen::Vector3f desiredPosition;
Eigen::Quaternionf desiredOrientation;
Eigen::Vector3f Kpos;
Eigen::Vector3f Kori;
Eigen::Vector3f Dpos;
Eigen::Vector3f Dori;
Eigen::VectorXf desiredJointPositions;
Eigen::VectorXf Knull;
Eigen::VectorXf Dnull;
float torqueLimit;
};
interface NJointTaskSpaceImpedanceControlInterface extends NJointControllerInterface
{
void setPosition(Ice::FloatSeq target);
void setOrientation(Ice::FloatSeq orientation);
void setPosition(Eigen::Vector3f target);
void setOrientation(Eigen::Quaternionf orientation);
void setPositionOrientation(Eigen::Vector3f target, Eigen::Quaternionf orientation);
void setPose(Eigen::Matrix4f mat);
void setImpedanceParameters(string paraName, Ice::FloatSeq vals);
void setNullspaceConfig(Eigen::VectorXf desiredJointPositions, Eigen::VectorXf Knull, Eigen::VectorXf Dnull);
void setConfig(NJointTaskSpaceImpedanceControlConfig cfg);
};
};
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