diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index fea7b8c..0722d82 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/Operation.cpp b/Operation.cpp index 3b2c772..66c7f2c 100644 --- a/Operation.cpp +++ b/Operation.cpp @@ -2930,7 +2930,7 @@ Operation::CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR bool Operation::GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1, const DBLVECTOR& vAx2, const Vector3d& vtTool2, - double dSafeZ, double& dExtraZ) const + double dHomeZ, double& dExtraZ) const { // Recupero macchina corrente Machine* pMch = ( m_pMchMgr != nullptr ? m_pMchMgr->GetCurrMachine() : nullptr) ; @@ -2952,12 +2952,12 @@ Operation::GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1, if ( SpecialGetMaxZ( vAx1, vtTool1, vAx2, vtTool2, dMaxZ)) { // se caso standard if ( ! bZHomeDown) { - dExtraZ = min( dMaxZ, dAxZmax) - dSafeZ ; + dExtraZ = min( dMaxZ, dAxZmax) - dHomeZ ; return ( dExtraZ > EPS_SMALL) ; } // altrimenti caso con posizione sicura in basso (teste da sotto) else { - dExtraZ = max( dMaxZ, dAxZmin) - dSafeZ ; + dExtraZ = max( dMaxZ, dAxZmin) - dHomeZ ; return ( dExtraZ < EPS_SMALL) ; } } @@ -2982,14 +2982,14 @@ Operation::GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1, if ( ! bZHomeDown) { double dZmax ; pMch->GetCurrAxisMax( 2, dZmax) ; - dExtraZ = min( vdVal[0], dZmax - dSafeZ) ; + dExtraZ = min( vdVal[0], dZmax - dHomeZ) ; return ( dExtraZ > EPS_SMALL) ; } // altrimenti caso con posizione sicura in basso (teste da sotto) else { double dZmin ; pMch->GetCurrAxisMin( 2, dZmin) ; - dExtraZ = max( vdVal[0], dZmin - dSafeZ) ; + dExtraZ = max( vdVal[0], dZmin - dHomeZ) ; return ( dExtraZ < EPS_SMALL) ; } } diff --git a/Operation.h b/Operation.h index a841f84..84bb986 100644 --- a/Operation.h +++ b/Operation.h @@ -136,7 +136,7 @@ class Operation : public IUserObj bool CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd, double& dDeltaZ) const ; bool GetExtraZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1, const DBLVECTOR& vAx2, const Vector3d& vtTool2, - double dSafeZ, double& dExtraZ) const ; + double dHomeZ, double& dExtraZ) const ; bool SpecialGetMaxZ( const DBLVECTOR& vAx1, const Vector3d& vtTool1, const DBLVECTOR& vAx2, const Vector3d& vtTool2, double& dMaxZ) const ;