From 576a5e8e002fbf3c89202200cd4546616ef42782 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 4 Mar 2016 07:37:14 +0000 Subject: [PATCH] EgtMachKernel 1.6n11 : - corretto tipo movimento per Rise e Home. --- EgtMachKernel.rc | Bin 11798 -> 11798 bytes Machining.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 3d9f86adaf67bfaebc45afc6234b123d19936403..539003b51ec8fe3d773e6235664adab66a3e9b14 100644 GIT binary patch delta 102 zcmbOhGc9JrKQ>0g&5ZmPnI>Q0%wsg1>?oqUIfrWs3s}^d87|_+xOs=LACQl!*n@HN P9%&zl6snE`%3)jpW3(P1 delta 102 zcmbOhGc9JrKQ=~#&5ZmPnI>Q0%wsf|>?oqUIfrWs3s}^d87|_+xOs=LACQl!*n@HN P9%&zl6snE`%3)jpVg4Q% diff --git a/Machining.cpp b/Machining.cpp index bd32f5c..03cea94 100644 --- a/Machining.cpp +++ b/Machining.cpp @@ -1104,7 +1104,7 @@ Machining::AddRise( DBLVECTOR& vAxVal, double dDelta) return false ; // recupero i valori degli assi vAxVal = pCam->GetAxesVal() ; - // flag di movimento in rapido + // flag per tipo di movimento in rapido int nFlag = 0 ; // se delta positivo lo uso come incremento di Z if ( dDelta > 0) { @@ -1128,6 +1128,7 @@ Machining::AddRise( DBLVECTOR& vAxVal, double dDelta) bool bOk = ( m_pMchMgr->VerifyOutstroke( dL1, dL2, dL3, dR1, dR2, nStat) && nStat == 0) ; // assegno i dati pCam->SetAxes( (bOk ? CamData::AS_OK : CamData::AS_OUTSTROKE), vAxVal) ; + pCam->SetMoveType( 0) ; pCam->SetFeed( 0) ; pCam->SetFlag( nFlag) ; // associo questo oggetto a quello geometrico @@ -1199,13 +1200,14 @@ Machining::AddHome( void) PtrOwner pCam( pCamData->Clone()) ; if ( IsNull( pCam)) return false ; - // flag di movimento in rapido (rapido a Home) + // flag per tipo di movimento in rapido (rapido a Home) int nFlag = 4 ; // recupero coordinate home DBLVECTOR vAxHome ; m_pMchMgr->GetAllCalcAxesHomePos( vAxHome) ; // assegno i dati pCam->SetAxes( CamData::AS_OK, vAxHome) ; + pCam->SetMoveType( 0) ; pCam->SetFeed( 0) ; pCam->SetFlag( nFlag) ; // associo questo oggetto a quello geometrico