diff --git a/lwrserv/include/SvrData.h b/lwrserv/include/SvrData.h index 9b0aeed..f1c9f91 100644 --- a/lwrserv/include/SvrData.h +++ b/lwrserv/include/SvrData.h @@ -6,6 +6,7 @@ #include #include "Singleton.h" +#include "vec.h" #include "friComm.h" @@ -29,10 +30,10 @@ private: struct { struct { - float* velocity; - float* accelaration; - float* torque; - float* range; + float velocity[LBR_MNJ]; + float accelaration[LBR_MNJ]; + float torque[LBR_MNJ]; + float range[LBR_MNJ]; } max; unsigned int joints; } robot; @@ -62,12 +63,19 @@ public: float getMaxTorque(unsigned int pos); int getMaxTorque(float* data, size_t size); + Vec getMaxTorque(); - float getMaxAccelaration(unsigned int pos); - int getMaxAccelaration(float* data, size_t size); + float getMaxVelocity(unsigned int pos); + int getMaxVelocity(float* data, size_t size); + Vec getMaxVelocity(); + + float getMaxAcceleration(unsigned int pos); + int getMaxAcceleration(float* data, size_t size); + Vec getMaxAcceleration(); float getMaxRange(unsigned int pos); int getMaxRange(float* data, size_t size); + Vec getMaxRange(); unsigned int getJoints();