|
|
@ -625,8 +625,8 @@ void movePTPJoints(SocketObject& client, string& arg) |
|
|
|
class Trajectory<JOINT_NUMBER>* newTrajectory; |
|
|
|
|
|
|
|
float sampleTimeMs = SvrData::getInstance()->getSampleTimeMs(); |
|
|
|
VecJoint maxJointVelocity = SvrData::getInstance()->getMaxVelocity(); |
|
|
|
VecJoint maxJointAcceleration = SvrData::getInstance()->getMaxAcceleration(); |
|
|
|
VecJoint maxJointVelocity = SvrData::getInstance()->getRobotVelocity(); |
|
|
|
VecJoint maxJointAcceleration = SvrData::getInstance()->getRobotAcceleration(); |
|
|
|
|
|
|
|
newTrajectory = (class Trajectory<JOINT_NUMBER>*) new LinearJointTrajectory<JOINT_NUMBER>(sampleTimeMs, maxJointVelocity, maxJointAcceleration, prevJointPos, newJointPos); |
|
|
|
|
|
|
@ -711,6 +711,7 @@ void moveHomRowWiseStatus(SocketObject& client, string& arg) |
|
|
|
float sampleTimeMs = SvrData::getInstance()->getSampleTimeMs(); |
|
|
|
VecJoint maxJointVelocity = SvrData::getInstance()->getRobotVelocity(); |
|
|
|
VecJoint maxJointAcceleration = SvrData::getInstance()->getRobotAcceleration(); |
|
|
|
std::cout << "max velo is " << maxJointVelocity ; |
|
|
|
|
|
|
|
class Trajectory<JOINT_NUMBER>* newTrajectory = new LinearJointTrajectory<JOINT_NUMBER>(sampleTimeMs, maxJointVelocity, maxJointAcceleration, prevJointPos, newJointPos); |
|
|
|
|
|
|
|