diff --git a/dll/iodllD.dll b/dll/iodllD.dll index 2a80952..7445aff 100644 Binary files a/dll/iodllD.dll and b/dll/iodllD.dll differ diff --git a/dll/mcctrdllD.dll b/dll/mcctrdllD.dll index 6321011..3f222a4 100644 Binary files a/dll/mcctrdllD.dll and b/dll/mcctrdllD.dll differ diff --git a/iodll/Include/MotionControllerBase.h b/iodll/Include/MotionControllerBase.h index de4e156..9ea4564 100644 --- a/iodll/Include/MotionControllerBase.h +++ b/iodll/Include/MotionControllerBase.h @@ -37,6 +37,9 @@ public: // get the IOs status of the motor virtual unsigned short GetMotionIOStatus(const CMtrProfile& mtrProfile); + // get the IOs status of the motor (standardise bit mask according to 8134/1864 standard) + virtual unsigned short GetMotionIOStatusEx(const CMtrProfile& mtrProfile); + // get Motion status of motor virtual int GetMotionStatus(const CMtrProfile& mtrProfile); diff --git a/iodll/Include/MotorBase.h b/iodll/Include/MotorBase.h index 54f45ad..4038018 100644 --- a/iodll/Include/MotorBase.h +++ b/iodll/Include/MotorBase.h @@ -215,6 +215,9 @@ public: // virtual method to get the motor axis IO status virtual int GetMotionIOStatus(); + // virtual method to get the motor axis IO status (standardise bit mask according to 8134/1864 standard) + virtual int GetMotionIOStatusEx(); + // virtual method to get the Motor Ready Status virtual BOOL IsMotorReady(); @@ -239,6 +242,9 @@ public: // virtual method to get other motor axis IO status virtual int GetMotionIOStatus(const CMtrProfile& mtrProfile) = 0; + // virtual method to get other motor axis IO status (standardise bit mask according to 8134/1864 standard) + virtual int GetMotionIOStatusEx(const CMtrProfile& mtrProfile); + // virtual method to get Other axis motor ready status virtual BOOL IsMotorReady(const CMtrProfile& mtrProfile); diff --git a/iodll/Include/Motor_1203.h b/iodll/Include/Motor_1203.h index 10d2898..eaeddd1 100644 --- a/iodll/Include/Motor_1203.h +++ b/iodll/Include/Motor_1203.h @@ -43,6 +43,9 @@ public: // method to get other motor axis IO status int GetMotionIOStatus(const CMtrProfile& mtrProfile) override; + // method to get other motor axis IO status + int GetMotionIOStatusEx(const CMtrProfile& mtrProfile) override; + // method to get other motor axis current position bool GetMotorPosition(const CMtrProfile& mtrProfile, double& dRawPosition) override; diff --git a/iodll/Include/Motor_7856.h b/iodll/Include/Motor_7856.h index 467dc53..73e6622 100644 --- a/iodll/Include/Motor_7856.h +++ b/iodll/Include/Motor_7856.h @@ -41,6 +41,9 @@ public: // method to get other motor axis IO status int GetMotionIOStatus(const CMtrProfile& mtrProfile) override; + // method to get other motor axis IO status + int GetMotionIOStatusEx(const CMtrProfile& mtrProfile) override; + // method to get other motor axis current position bool GetMotorPosition(const CMtrProfile& mtrProfile, double& dRawPosition) override; diff --git a/iodll/Include/Motor_ADLINK_ECAT.h b/iodll/Include/Motor_ADLINK_ECAT.h index 5dc2224..095b48f 100644 --- a/iodll/Include/Motor_ADLINK_ECAT.h +++ b/iodll/Include/Motor_ADLINK_ECAT.h @@ -41,6 +41,9 @@ public: // method to get other motor axis IO status int GetMotionIOStatus(const CMtrProfile& mtrProfile) override; + // method to get other motor axis IO status + int GetMotionIOStatusEx(const CMtrProfile& mtrProfile) override; + // method to get other motor axis current position bool GetMotorPosition(const CMtrProfile& mtrProfile, double& dRawPosition) override; diff --git a/iodll/lib/iodllD.lib b/iodll/lib/iodllD.lib index aaaebef..fd89ddf 100644 Binary files a/iodll/lib/iodllD.lib and b/iodll/lib/iodllD.lib differ