Merge remote-tracking branch 'origin/develop'

Essetre-90480023_MW.mlde

@@ -4,7 +4,7 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6k1'
+PP_VER = '3.1d2'
 PP_NVER = '2.6.11.1'
 
 -- Parametri macchina
@@ -50,6 +50,7 @@ DeltaTabX = 1019.6
 DeltaTabY = -1294.3 - DimTabY
 DeltaTabZ = -1090.0
 CoeffVM = 0.75
+ParkYScrapRemove = nil
 
 -- Aggiornamento con dati da TechnoEssetre7
 local sTs3Data = EgtGetStringFromIni( 'Wall', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-90480023_MW.data"
@@ -98,6 +99,7 @@ if EgtExistsFile( sData) then
       if MchOffs.ZERO_Y_MILL and MchOffs.ZERO_Y_DRILL then DrillDeltaX = - ( MchOffs.ZERO_Y_MILL - MchOffs.ZERO_Y_DRILL) end
       if MchOffs.ZERO_X_MILL and MchOffs.ZERO_X_DRILL then DrillDeltaY = ( MchOffs.ZERO_X_MILL - MchOffs.ZERO_X_DRILL) end
       if MchOffs.ZERO_Z_MILL and MchOffs.ZERO_Z_DRILL then DrillDeltaZ = ( MchOffs.ZERO_Z_MILL - MchOffs.ZERO_Z_DRILL) end
+      if MchOffs.PARK_Y_SCRAP_REMOVE then ParkYScrapRemove = MchOffs.PARK_Y_SCRAP_REMOVE end
    end
 end
 

Essetre-WALL.NUM.mlpe

@@ -133,7 +133,8 @@ function OnDispositionEnd()
                 ' E30051='..EgtNumToString( 1000 * EMT.LP, 0)..
                 ' E30052='..EgtNumToString( 1000 * EMT.SP, 0))
       -- Posizione cuffia
-      local dHCuff = b3Raw:getDimZ() + 32 
+      local dHeightSubPiece = EMT.RAWPOS[3] or 0
+      local dHCuff = dHeightSubPiece + b3Raw:getDimZ() + 32 
       EmtOutput( 'E30039=' .. EgtNumToString( dHCuff * 1000, 0))
       -- Eventuale salto a lavorazione in corso
       EmtOutput( 'G79 NE80000')
@@ -250,7 +251,7 @@ function OnRapid()
             if EMT.SCRAPFIRST then
                EMT.SCRAPFIRST = false
                local b3Raw = EgtGetRawPartBBox( EMT.RAWID)
-               local ParkY = min( -( b3Raw:getMin():getX() - 2000), -MinY)
+               local ParkY = ParkYScrapRemove or min( -( b3Raw:getMin():getX() - 2000), -MinY)
                EmtOutput( 'G104 Y' .. EmtLenToString( ParkY, 3) .. ' ET1' .. GetEF())
             end
             -- pre-posizionamento
@@ -273,7 +274,7 @@ function OnRapid()
             EMT.SCRAPFIRST = false
             -- pausa per rimozione sfridi
             local b3Raw = EgtGetRawPartBBox( EMT.RAWID)
-            local ParkY = min( -( b3Raw:getMin():getX() - 2000), -MinY)
+            local ParkY = ParkYScrapRemove or min( -( b3Raw:getMin():getX() - 2000), -MinY)
             EmtOutput( 'G104 Y' .. EmtLenToString( ParkY, 3) .. ' ET1' .. GetEF())
          end
       end