- Rimosse variabili Lxxx iniziali
- Modifica a macro M26 e M27 - Corretta costruzione piano generico
This commit is contained in:
+9
-27
@@ -60,28 +60,7 @@ function OnProgramStart()
|
||||
end
|
||||
EmtOutput( '('.. MLE_INFO..')')
|
||||
-- Parametri macchina
|
||||
local sOut = 'L151='..EgtNumToString( Nail11DeltaY - DeltaTabY, 2)..'\n'..
|
||||
'L152='..EgtNumToString( DeltaTabX - Nail11DeltaX, 2)..'\n'..
|
||||
'L153='..EgtNumToString( DeltaTabZ - Nail11DeltaZ, 2)..'\n'..
|
||||
'L154='..EgtNumToString( Nail12DeltaY - DeltaTabY, 2)..'\n'..
|
||||
'L155='..EgtNumToString( DeltaTabX - Nail12DeltaX, 2)..'\n'..
|
||||
'L156='..EgtNumToString( DeltaTabZ - Nail12DeltaZ, 2)..'\n'..
|
||||
'L157='..EgtNumToString( Nail13DeltaY - DeltaTabY, 2)..'\n'..
|
||||
'L158='..EgtNumToString( DeltaTabX - Nail13DeltaX, 2)..'\n'..
|
||||
'L159='..EgtNumToString( DeltaTabZ - Nail13DeltaZ, 2)..'\n'..
|
||||
'L160='..EgtNumToString( Nail14DeltaY - DeltaTabY, 2)..'\n'..
|
||||
'L161='..EgtNumToString( DeltaTabX - Nail14DeltaX, 2)..'\n'..
|
||||
'L162='..EgtNumToString( DeltaTabZ - Nail14DeltaZ, 2)..'\n'..
|
||||
'L163='..EgtNumToString( Orig2DeltaY, 2)..'\n'..
|
||||
'L164='..EgtNumToString( -Orig2DeltaX, 2)..'\n'..
|
||||
'L165='..EgtNumToString( Orig2DeltaZ, 2)..'\n'..
|
||||
'L166='..EgtNumToString( Orig3DeltaY, 2)..'\n'..
|
||||
'L167='..EgtNumToString( -Orig3DeltaX, 2)..'\n'..
|
||||
'L168='..EgtNumToString( Orig3DeltaZ, 2)..'\n'..
|
||||
'L169='..EgtNumToString( Orig4DeltaY, 2)..'\n'..
|
||||
'L170='..EgtNumToString( -Orig4DeltaX, 2)..'\n'..
|
||||
'L171='..EgtNumToString( Orig4DeltaZ, 2)..'\n'..
|
||||
'G114'..' EA'..EgtNumToString( -DeltaTabY, 2)..' EB'..EgtNumToString( DeltaTabX, 2)..
|
||||
local sOut = 'G114'..' EA'..EgtNumToString( -DeltaTabY, 2)..' EB'..EgtNumToString( DeltaTabX, 2)..
|
||||
' EC'..EgtNumToString( DeltaTabZ, 2)..' ED'..EgtNumToString( MillOffs, 2)..
|
||||
' EE'..EgtNumToString( Nail11DeltaY - DeltaTabY, 2, 2)..' EF'..EgtNumToString( DeltaTabX - Nail11DeltaX, 2)..' EG'..EgtNumToString( DeltaTabZ - Nail11DeltaZ, 2)..
|
||||
' EH'..EgtNumToString( Nail12DeltaY - DeltaTabY, 2, 2)..' EI'..EgtNumToString( DeltaTabX - Nail12DeltaX, 2)..' EL'..EgtNumToString( DeltaTabZ - Nail12DeltaZ, 2)..
|
||||
@@ -119,7 +98,7 @@ function OnProgramEnd()
|
||||
EmtOutput( 'M05 E80000=1')
|
||||
-- Tipo di scarico
|
||||
if not TEST_USE then
|
||||
EmtOutput( 'M27 E30057=1')
|
||||
EmtOutput( 'M27 E30057=0')
|
||||
end
|
||||
-- Se modalità test, termino il programma
|
||||
if TEST_USE then
|
||||
@@ -157,8 +136,8 @@ function OnDispositionEnd()
|
||||
' E30051='..EgtNumToString( 1000 * b3Raw:getDimX(), 0)..
|
||||
' E30052='..EgtNumToString( 1000 * b3Raw:getDimZ(), 0))
|
||||
EMT.ST = b3Raw:getDimZ()
|
||||
-- Scelta origine
|
||||
EmtOutput( 'M26 E30054='..EgtNumToString( EMT.ORIG, 0))
|
||||
-- Comando per gestione carico
|
||||
EmtOutput( 'M26 E30054=1')
|
||||
-- Posizione cuffia
|
||||
local dHCuff = b3Raw:getDimZ() + 32
|
||||
EmtOutput( 'E30039=' .. EgtNumToString( dHCuff * 1000, 0))
|
||||
@@ -683,10 +662,13 @@ function CalcInterpPlane()
|
||||
--EmtOutput( 'IPLGLFR='..tostring(EMT.IPLGLFR))
|
||||
local _, dAngV, dAngO = SphericalFromVector( vtE)
|
||||
local dAngO2 = EmtGetAngO2( EMT.IPLGLFR:getVersZ(), EMT.IPLGLFR:getVersX(), dAngV, dAngO)
|
||||
dAngO = dAngO - 90
|
||||
while dAngO < 0 do
|
||||
dAngO = dAngO + 90
|
||||
while dAngO - GEO.EPS_ANG_SMALL < 0 do
|
||||
dAngO = dAngO + 360
|
||||
end
|
||||
while dAngO + GEO.EPS_ANG_SMALL > 360 do
|
||||
dAngO = dAngO - 360
|
||||
end
|
||||
-- se rotazione solo attorno alla C allora si mette come rotazione finale
|
||||
if abs( dAngV) < GEO.EPS_ANG_SMALL then
|
||||
dAngO2 = dAngO2 + dAngO
|
||||
|
||||
Reference in New Issue
Block a user