diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index f9e3306..8fe19b6 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/Simulator.cpp b/Simulator.cpp index 1fabbac..e567122 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -1787,8 +1787,8 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr) m_pMachine->GetAxisInvert( sName, bInvert) && m_pMachine->GetAxisType( sName, bLinear) && m_pMachine->GetAxisPos( sName, dVal)) { - // se da agganciare ad asse principale - if ( m_pMachine->LuaGetGlobVar( sAuxAxMaster, sLink)) { + // se assi principali abilitati e da agganciare ad asse principale + if ( m_bEnabAxes && m_pMachine->LuaGetGlobVar( sAuxAxMaster, sLink)) { bool bNeg = ( sLink.find( '-') != string::npos) ; string sMainAxis = sLink ; ReplaceString( sMainAxis, "-", "") ; int nInd = 0 ; @@ -1796,8 +1796,8 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr) if ( m_AxesName[i] == sMainAxis) nInd = i + 1 ; } - // se assi principali abilitati e trovato asse principale di riferimento - if ( m_bEnabAxes && nInd > 0) { + // se trovato asse principale di riferimento + if ( nInd > 0) { m_AuxAxesName.emplace_back( sName) ; m_AuxAxesToken.emplace_back( sToken) ; m_AuxAxesInvert.push_back( bInvert) ;