From c029a996de00067aba36f78168db6796364d438c Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 7 Dec 2015 10:45:44 +0000 Subject: [PATCH] EgtMachKernel 1.6l1 : - in simulazione ora ritorno stato di fine step di movimento. --- EgtMachKernel.rc | Bin 11798 -> 11782 bytes Simulator.cpp | 11 +++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index d84756b087f2a59b997893e10a74b528b80ff271..5e80d3e818e72ddd01db7b86f2516793766caca7 100644 GIT binary patch delta 126 zcmbOh(-yPg2OFyqgARk?W=8&tOp`BgW-;e57*2K+(cPTG)yD#tvu8#UcVpbVL)e2E WE{UPhgK_g7X*YxdblnG(!?*x~q#-B( delta 145 zcmZpRnHIC*2OGN~gARisgTdy%Y}U-o*$jr0FLFpuF5nc~oF(MOxOpA72Q!kAi%gTx W2tjJufz=Rcf`%x~;RXN|$0~LJ diff --git a/Simulator.cpp b/Simulator.cpp index 7acc46c..b73ce51 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -172,11 +172,14 @@ Simulator::Move( int& nStatus) m_pMchMgr->SetAxisPos( m_AxesName[i], dVal) ; } - // Se arrivato a fine interpolazione movimento, salvo posizioni - if ( m_dCoeff > 0.999) + // Se arrivato a fine interpolazione movimento, salvo posizioni e segnalo + if ( m_dCoeff > 0.999) { m_AxesVal = AxesEnd ; - - nStatus = MCH_SIM_OK ; + nStatus = MCH_SIM_END_STEP ; + } + // Altrimenti sto muovendomi in uno step + else + nStatus = MCH_SIM_OK ; return true ; }