diff --git a/lwrserv/SvrHandling.cpp b/lwrserv/SvrHandling.cpp index 028a5df..9e3eb6b 100755 --- a/lwrserv/SvrHandling.cpp +++ b/lwrserv/SvrHandling.cpp @@ -625,8 +625,8 @@ void movePTPJoints(SocketObject& client, string& arg) class Trajectory* 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*) new LinearJointTrajectory(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* newTrajectory = new LinearJointTrajectory(sampleTimeMs, maxJointVelocity, maxJointAcceleration, prevJointPos, newJointPos);