diff --git a/OutputConst.h b/OutputConst.h index 466849b..6398959 100644 --- a/OutputConst.h +++ b/OutputConst.h @@ -95,7 +95,6 @@ static const std::string GVAR_AUX = ".AUX" ; // (string) dato ausi static const std::string GVAR_MOVEID = ".MOVEID" ; // (int) identificativo movimento static const std::string GVAR_MOVEIND = ".MOVEIND" ; // (int) indice movimento static const std::string GVAR_MOVE = ".MOVE" ; // (int) tipo di movimento (0,1,2,3) -static const std::string GVAR_AXESMASK = ".AXESMASK" ; // (int) mask del movimento degli assi (solo se rapido) static const std::string GVAR_L1 = ".L1" ; // (num) valore del primo asse lineare static const std::string GVAR_L2 = ".L2" ; // (num) valore del secondo asse lineare static const std::string GVAR_L3 = ".L3" ; // (num) valore del terzo asse lineare diff --git a/Simulator.cpp b/Simulator.cpp index 1abb76c..6b77772 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -1728,7 +1728,7 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr) bool bOk = m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MOVEID, m_nEntId) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MOVEIND, m_nEntInd) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MOVE, pCamData->GetMoveType()) ; - bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_AXESMASK, pCamData->GetAxesMask()) ; + bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MASK, pCamData->GetAxesMask()) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_FLAG, pCamData->GetFlag()) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_FLAG2, pCamData->GetFlag2()) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_INDEX, pCamData->GetIndex()) ; @@ -1780,7 +1780,7 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr) ResetAuxAxes() ; // recupero i dati di ritorno - m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_AXESMASK, m_nAxesMask) ; + m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_MASK, m_nAxesMask) ; if ( ! m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_ENABAXES, m_bEnabAxes)) m_bEnabAxes = true ; if ( ! m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_SHOWAXES, m_bShowAxes))