Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtMachKernel 1.6r6 :

Browse Source 
- corretto errore di mancata scrittura di m_dExtSawArcMinRad in dati generali DB lavorazioni
- aggiunte funzioni per conoscere utensile caricato su testa/uscita dati e per scaricarlo
- corretta impostazione assi e verifica corse per Rise di lavorazione precedente
- su inizio fine movimento si richiamano sempre i relativi script indipendentemente dal valore del flag.
This commit is contained in:
Dario Sassi
2016-05-22 17:07:41 +00:00
parent 086af445e5
commit 061e7a26a3
13 changed files with 233 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Generator.cpp
-49
View File
@@ -29,7 +29,6 @@ using namespace std ;
//----------------------------------------------------------------------------
static const string ERR_EXT = ".err" ;
static const int MAX_AXES = 7 ;
//----------------------------------------------------------------------------
Generator::Generator( void)
@@ -697,51 +696,3 @@ Generator::ResetArcData( void)
bOk = bOk && m_pMachine->LuaResetGlobVar( GLOB_VAR + GVAR_AC) ;
return bOk ;
}
//----------------------------------------------------------------------------
string
Generator::GetGlobVarAxisValue( int nAx)
{
switch ( nAx) {
case 1 : return ( GLOB_VAR + GVAR_L1) ;
case 2 : return ( GLOB_VAR + GVAR_L2) ;
case 3 : return ( GLOB_VAR + GVAR_L3) ;
case 4 : return ( GLOB_VAR + GVAR_R1) ;
case 5 : return ( GLOB_VAR + GVAR_R2) ;
case 6 : return ( GLOB_VAR + GVAR_R3) ;
case 7 : return ( GLOB_VAR + GVAR_R4) ;
default : return "" ;
}
}
//----------------------------------------------------------------------------
string
Generator::GetGlobVarAxisPrev( int nAx)
{
switch ( nAx) {
case 1 : return ( GLOB_VAR + GVAR_L1P) ;
case 2 : return ( GLOB_VAR + GVAR_L2P) ;
case 3 : return ( GLOB_VAR + GVAR_L3P) ;
case 4 : return ( GLOB_VAR + GVAR_R1P) ;
case 5 : return ( GLOB_VAR + GVAR_R2P) ;
case 6 : return ( GLOB_VAR + GVAR_R3P) ;
case 7 : return ( GLOB_VAR + GVAR_R4P) ;
default : return "" ;
}
}
//----------------------------------------------------------------------------
string
Generator::GetGlobVarAxisToken( int nAx)
{
switch ( nAx) {
case 1 : return ( GLOB_VAR + GVAR_L1T) ;
case 2 : return ( GLOB_VAR + GVAR_L2T) ;
case 3 : return ( GLOB_VAR + GVAR_L3T) ;
case 4 : return ( GLOB_VAR + GVAR_R1T) ;
case 5 : return ( GLOB_VAR + GVAR_R2T) ;
case 6 : return ( GLOB_VAR + GVAR_R3T) ;
case 7 : return ( GLOB_VAR + GVAR_R4T) ;
default : return "" ;
}
}