Merge branch 'develop' of https://gitlab.steamware.net/egalware-machines/essetre/essetre-90480023_xs-mw into develop

Essetre-90480023_XS-MW.mlde

@@ -8,7 +8,7 @@ require( 'EmtGenerator')
 EgtEnableDebug( true)
 if not EmtModifyHeadAuxDirection then error( 'A newer version of the program is required (minimum 2.3j5)') end
 
-PP_VER = '3.1d1_DEV4'
+PP_VER = '3.1d1_DEV5'
 PP_NVER = '2.7.4.1'
 
 -- Parametri macchina
@@ -25,7 +25,7 @@ MinC1 = -275.0
 MaxC1 = 275.0
 PosSpecC1 = 34
 MillOffs = 170
-ChSawLen = 150.0
+ChSawLen = 0.0
 ParkC1 = 0
 ParkB1 = 0
 ParkSawC1 = -90
@@ -39,14 +39,14 @@ SawOffsY = 0
 SawOffsZ = -150.25
 SawC1Offs = 0
 SawB1Offs = 0
-SawOffs = 115.5
+SawOffs = 0.0
-Nail11DeltaX = 318.0    -- Distanza da Mandrino a Graffettatrice H21
+Nail11DeltaX = -277.0    -- Distanza da Mandrino a Graffettatrice H21
 Nail11DeltaY = -112.5
 Nail11DeltaZ = -421.6497
-Nail12DeltaX = 315.8125   -- Distanza da Mandrino a Graffettatrice H22
+Nail12DeltaX = -279.1874   -- Distanza da Mandrino a Graffettatrice H22
 Nail12DeltaY = 135.1311
 Nail12DeltaZ = -421.6497
-Nail13DeltaX = -277.0 -- Distanza da Mandrino a Graffettatrice H23
+Nail13DeltaX = 318.0 -- Distanza da Mandrino a Graffettatrice H23
 Nail13DeltaY = -112.5
 Nail13DeltaZ = -421.6497
 Nail14DeltaX = 0        -- Distanza da Mandrino a Graffettatrice H24 (non esiste su questa macchina)
@@ -114,7 +114,7 @@ if EgtExistsFile( sData) then
       if MchOffs.OFFSET_ZERO3_Y then DimTabX = - MchOffs.OFFSET_ZERO3_Y end
       if MchOffs.OFFSET_ZERO2_X then DimTabY = - MchOffs.OFFSET_ZERO2_X end
       if MchOffs.ZERO_Y_MILL then DeltaTabX = MchOffs.ZERO_Y_MILL end
-      if MchOffs.ZERO_X_MILL then DeltaTabY = -MchOffs.ZERO_X_MILL or DeltaTabY end
+      if MchOffs.ZERO_X_MILL then DeltaTabY = - MchOffs.ZERO_X_MILL or DeltaTabY end
       if MchOffs.ZERO_Z_MILL then DeltaTabZ = MchOffs.ZERO_Z_MILL or DeltaTabZ end
       if MchOffs.ZERO_Y_MILL and MchOffs.ZERO_Y_SAW then SawDeltaX = ( MchOffs.ZERO_Y_MILL - MchOffs.ZERO_Y_SAW) end
       if MchOffs.ZERO_X_MILL and MchOffs.ZERO_X_SAW then SawDeltaY = - ( MchOffs.ZERO_X_MILL - MchOffs.ZERO_X_SAW) end
@@ -154,13 +154,13 @@ if EgtExistsFile( sData) then
 end
 
 -- Spostamenti delle chiodatrici rispetto al disegno
-local Nail11OffsX = Nail11DeltaX - 318.0
+local Nail11OffsX = Nail11DeltaX + 277.0
 local Nail11OffsY = Nail11DeltaY + 112.5
 local Nail11OffsZ = Nail11DeltaZ + 421.6497
-local Nail12OffsX = Nail12DeltaX - 315.8125
+local Nail12OffsX = Nail12DeltaX + 279.1874
 local Nail12OffsY = Nail12DeltaY - 135.1311
 local Nail12OffsZ = Nail12DeltaZ + 421.6497
-local Nail13OffsX = Nail13DeltaX + 277.0
+local Nail13OffsX = Nail13DeltaX - 318.0
 local Nail13OffsY = Nail13DeltaY + 112.5
 local Nail13OffsZ = Nail13DeltaZ + 421.6497
 

Essetre-WALL.mlpe

@@ -306,6 +306,13 @@ function OnSimulToolDeselect()
       EMT.TOOL_1 = nil
       EMT.TCPOS_1 = nil
    end
+   -- se testa attuale è lama devo depositarla
+   if EMT.HEAD == 'H12' then
+      ShowToolInTcPos( EMT.TCPOS_1, true)
+      EgtUnloadTool( 'H12', 1)
+      EMT.TOOL_1 = nil
+      EMT.TCPOS_1 = nil
+   end
    -- deposito utensile se non lama su rinvio o graffettatrici
    if ( EMT.NEXTHEAD == 'H1' or EMT.NEXTHEAD == 'H12' or EMT.NEXTHEAD == 'H3') and ( EMT.HEAD == 'H1' or EMT.HEAD == 'H12' or EMT.HEAD == 'H3') then
       if EMT.NEXTTOOL ~= EMT.TOOL_1 then

Essetre-WALL.mlse

@@ -47,6 +47,14 @@ function OnSpecialMoveZup()
          EMC.R2 = R2New
          EMC.TDIR = EgtGetCalcToolDirFromAngles( EMC.R1, EMC.R2, EMC.R3)
       end
+   -- Se altrimenti Lama normale
+   elseif EMC.HEAD == 'H12' then
+      if EMC.L3 > -300 then
+         EMC.R1 = EgtGetAxisHomePos( 'C1')
+         EMC.R2 = EgtGetAxisHomePos( 'B1')
+         EMC.TDIR = EgtGetCalcToolDirFromAngles( EMC.R1, EMC.R2)
+         EMC.MODIF = true
+      end
    -- se altre teste
    elseif EMC.HEAD == 'H14' or EMC.HEAD == 'H12' or EMC.HEAD == 'H21' or EMC.HEAD == 'H22' or EMC.HEAD == 'H23' then
       -- non è necessaria una gestione speciale