diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index e055e40..aff92b1 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgrSimulation.cpp b/MachMgrSimulation.cpp index d2b75b1..af36e9d 100644 --- a/MachMgrSimulation.cpp +++ b/MachMgrSimulation.cpp @@ -198,7 +198,7 @@ MachMgr::SimMoveAxes( int nMoveType, const SAMVECTOR& vAxNaEpSt) { // verifico simulatore if ( m_pSimul == nullptr) - return false ; + return SIM_AXMV_RES_ERR ; // lancio movimento assi return m_pSimul->MoveAxes( nMoveType, vAxNaEpSt) ; } diff --git a/MachineLua.cpp b/MachineLua.cpp index 4699442..0117a62 100644 --- a/MachineLua.cpp +++ b/MachineLua.cpp @@ -1483,18 +1483,11 @@ int Machine::LuaEmtMoveAxes( lua_State* L) { // 4, ..., 31 parametri : nMoveType, sAx1, dPos1, dStep1 [, sAx2, dPos2, dStep2] ... [, sAx10, dPos10, dStep10] - int nMoveType ; - LuaCheckParam( L, 1, nMoveType) - string sAx1 ; - LuaCheckParam( L, 2, sAx1) ; - double dEnd1 ; - LuaCheckParam( L, 3, dEnd1) ; - double dStep1 ; - LuaCheckParam( L, 4, dStep1) ; + int nMoveType = 0 ; + LuaGetParam( L, 1, nMoveType) ; SAMVECTOR vAxNaEpSt ; - vAxNaEpSt.emplace_back( sAx1, dEnd1, dStep1) ; - for ( int i = 0 ; i < 9 ; ++ i) { - int nInd = 5 + 3 * i ; + for ( int i = 0 ; i < 10 ; ++ i) { + int nInd = 2 + 3 * i ; string sAxN ; double dEndN ; double dStepN ; diff --git a/Simulator.cpp b/Simulator.cpp index c1558aa..4a17e19 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -2237,7 +2237,7 @@ Simulator::MoveAxes( int nMoveType, const SAMVECTOR& vAxNaEpSt) } } // Aggiorno visualizzazione - if ( bViewAllFrames || ( i % 2) == 0 || i == nStep) + if ( bViewAllFrames || ( i % 4) == 0 || i == nStep) ExeDraw() ; // Verifico collisioni int nCdInd, nObjInd ;