Merge branch 'develop'

- Salita in ZMax dopo una chiodatura avviene solo se l'utensile seguente è diverso da quello attuale (EB1).

Essetre-90480023_XS-MW.mlde

@@ -8,7 +8,8 @@ require( 'EmtGenerator')
 EgtEnableDebug( false)
 if not EmtModifyHeadAuxDirection then error( 'A newer version of the program is required (minimum 2.3j5)') end
 
-PP_VER = '3.1d1_DEV15'
+PP_VER = '3.1d2'
+PP_NVER = '3.1.4.2'
 PP_NVER = '2.7.4.1'
 
 -- Parametri macchina
@@ -36,7 +37,7 @@ MinZ2 = -770.0
 MaxZ2 = 0.0
 SawOffsX = 110.0
 SawOffsY = 0
-SawOffsZ = -149.55
+SawOffsZ = -150.3
 SawC1Offs = 0
 SawB1Offs = 0
 SawOffs = 0.0
@@ -75,6 +76,7 @@ DeltaTabZ = -1227.6497
 CoeffVM = 0.5
 OffsetH12X = 110
 OffsetH12Z = 150
+ParkYScrapRemove = nil
 
 -- Aggiornamento con dati da TechnoEssetre7
 local sTs3Data = EgtGetStringFromIni( 'Wall', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-90480023_XS-MW.data"
@@ -150,6 +152,7 @@ if EgtExistsFile( sData) then
       if MchOffs.OFFSET_ZERO6_Y then Orig6DeltaX = -MchOffs.OFFSET_ZERO6_Y end
       if MchOffs.OFFSET_ZERO6_X then Orig6DeltaY = MchOffs.OFFSET_ZERO6_X end
       if MchOffs.OFFSET_ZERO6_Z then Orig6DeltaZ = MchOffs.OFFSET_ZERO6_Z end
+      if MchOffs.PARK_Y_SCRAP_REMOVE then ParkYScrapRemove = MchOffs.PARK_Y_SCRAP_REMOVE end
    end
 end
 

Essetre-WALL.NUM.mlpe

@@ -144,7 +144,8 @@ function OnDispositionEnd()
       if nLoad90 > 0 then nLoad90 = 4 else nLoad90 = 1 end
       EmtOutput( 'M26 E30054='..EgtNumToString( nLoad90, 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')
@@ -236,11 +237,19 @@ end
 function OnPathEnd()
    if IsNailingHead( EMT.HEAD) then
       local dStep = GetValNotes( EgtGetMachiningParam( MCH_MP.USERNOTES), 'Par', 'd') or 100
-      local dSafeZ = max( EgtGetMachiningParam( MCH_MP.STARTPOS), 10) or 20
+      local dSafeZ = EMT.NAIL_START_L3 + ( max( EgtGetMachiningParam( MCH_MP.STARTPOS), 10) or 20)
       --local dSafeZ = EgtMdbGetGeneralParam( MCH_GP.SAFEZ)
       if EMT.HEAD == 'H21' or EMT.HEAD == 'H22' or EMT.HEAD == 'H23' then
+         local nNextOperationId = EgtGetNextActiveOperation( EMT.MCHID)
+         if nNextOperationId then
+            EgtSetCurrMachining( nNextOperationId)
+            EMT.NEXTTOOL = EgtGetMachiningParam( MCH_MP.TOOL)
+            EgtSetCurrMachining( EMT.MCHID)
+         end
+         local sZMax = ''
+         if EMT.TOOL ~= EMT.NEXTTOOL then sZMax = ' EB1' end
          EmtOutput( 'G124 X'..EmtLenToString( EMT.NAIL_START_L1, 3)..' Y'..EmtLenToString( EMT.NAIL_START_L2, 3)..' Z'..EmtLenToString( EMT.NAIL_START_L3, 3)..
-                        ' B'..EmtLenToString( EMT.NAIL_END_L1, 3)..' C'..EmtLenToString( EMT.NAIL_END_L2, 3)..' EA'..EmtLenToString( dStep, 3)..' EB1'..
+                        ' B'..EmtLenToString( EMT.NAIL_END_L1, 3)..' C'..EmtLenToString( EMT.NAIL_END_L2, 3)..' EA'..EmtLenToString( dStep, 3).. sZMax..
                         ' W'..EmtLenToString( dSafeZ, 3)..EMT.NAIL_END)
       else
          local sExtra = ''
@@ -305,7 +314,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
@@ -329,7 +338,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
@@ -680,7 +689,7 @@ function CalcInterpPlane()
       while dAngO2 >= 360 do
          dAngO2 = dAngO2 - 360
       end
-      dAngO = 0 
+      dAngO = 0
    end
    
    local xOut = - ( yS - DeltaTabY)

Wall/WallData.lua

@@ -30,8 +30,10 @@ local WallData = {
    MAX_CLEAN_CRN60 = 150,                   -- massimo spessore per pulitura angolo con fresa 60deg
    MILL_MAX_DEPTH_AS_MAT = false,            -- massimo affondamento frese uguale ad altezza tagliente (max materiale)
    RAWCOL = { 255, 160, 32, 30},            -- colore del grezzo
-   SIMUL_VIEW_DIR = 2,                      -- direzione di vista predefinita per la simulazione (1=NW, 2=SW, 3=NE, 4=SE)
+   DEFAULT_RAW_NO_EXTRA_WIDTH = true,
+   SIMUL_VIEW_DIR = 4,                      -- direzione di vista predefinita per la simulazione (1=NW, 2=SW, 3=NE, 4=SE)
    ORIG_CORNER = 'BL',                      -- posizione origine (TL,BL,TR,BR,TM,BM) 
+   RAWPART_ROT = 180,
    USE_POSY = true                          -- utilizzare POSY di BTL (spostamento sullo spessore per pareti a layer)
 }