diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 1f91176..6a9c675 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -269,7 +269,7 @@ class __declspec( novtable) IMachMgr virtual bool GetAxisToken( const std::string& sAxis, std::string& sToken) const = 0 ; virtual bool GetAxisType( const std::string& sAxis, bool& bLinear) const = 0 ; virtual bool GetAxisInvert( const std::string& sAxis, bool& bInvert) const = 0 ; - virtual bool SetAxisPos( const std::string& sAxis, double dVal) = 0 ; + virtual bool SetAxisPos( const std::string& sAxis, double dVal, double* pdNewVal = nullptr) = 0 ; virtual bool GetAxisPos( const std::string& sAxis, double& dVal) const = 0 ; virtual bool GetAxisHomePos( const std::string& sAxis, double& dHomeVal) const = 0 ; virtual bool ResetAxisPos( const std::string& sAxis) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index e92bd97..6e85145 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -891,7 +891,7 @@ EXE_EXPORT bool ExeGetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtD EXE_EXPORT bool ExeVerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ; EXE_EXPORT bool ExeGetOutstrokeInfo( std::string& sInfo) ; // Machine Move -EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ; +EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal, double* pdNewVal = nullptr) ; EXE_EXPORT bool ExeGetAxisPos( const std::string& sAxis, double* pdVal) ; EXE_EXPORT bool ExeGetAxisHomePos( const std::string& sAxis, double* pdHomeVal) ; EXE_EXPORT bool ExeResetAxisPos( const std::string& sAxis) ;