Tolti i 100mm aggiuntivi al calcolo ZMAX

- Piccole migliorie ai movimenti

Common_ONE-PF.NUM.mlpe

@@ -424,6 +424,7 @@ function OnMachiningStart()
    EMT.MCHUSERNOTES = EgtGetMachiningParam( MCH_MP.USERNOTES)
    EMT.MCHSPLIT = ( EMT.MCHUSERNOTES:find( 'Split;', 1, true) ~= nil)
    EMT.MCHPRECUT = ( EMT.MCHUSERNOTES:find( 'Precut;', 1, true) ~= nil)
+   EMT.MCHCUT = ( EMT.MCHUSERNOTES:find( 'Cut;', 1, true) ~= nil)
 
    -- se sega a catena, aggiusto subito angolo scelto per asse virtuale A
    if EMT.HEAD == 'H13' or EMT.HEAD == 'H15' then
@@ -602,6 +603,10 @@ function OnMachiningEnd()
    EMT.PREVTOOL = EMT.TOOL
    EMT.PREVHEAD = EMT.HEAD
    EMT.PREVTCPOS = EMT.TCPOS
+   -- se taglio finale, aggiorno lunghezza barra
+   if EMT.MCHCUT then
+      EMT.LB = EMT.LT + ( EMT.X_OFF or 0)
+   end
    -- salvo anche utlimo utensile su testa
    local nHSet = GetHeadSet( EMT.HEAD)
    if nHSet == 1 then
@@ -679,6 +684,10 @@ function OnPathEnd()
    if not EMT.ZMAX then
       EmitResetMachining()
    end
+
+   -- salvo dati precedenti
+   EMT.L2pp = EMT.L2o
+
    EMT.AUXTYPE = nil
    EMT.UNL = nil
    EMT.PREROT = nil
@@ -855,7 +864,7 @@ function OnRapid()
                local bMoveZbeforeX = false
                local dZref = EMT.L3
                -- se carico destro e ho due teste, altrimenti in caso abbia una testa , tipo ONE, il controlo è invertito
-               if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+               if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                   dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                end
                -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -863,14 +872,20 @@ function OnRapid()
                   bMoveZbeforeX = true
                end
 
+               -- se vado in posizione speciale rotazione assi, poi devo ritornare alla X vera di lavoro
+               local dMoveXtoFinalPosition = false
                local dXref = EMT.L2
                if  EMT.HEAD == 'H12'  and  EMT.L2 < -LimX1PlRotSaw  then
                   dXref = -LimX1PlRotSaw
                   EmitMoveDataHead( 1, { X=dXref, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed})
+                  dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2), MyMaxZ1)
+                  dMoveXtoFinalPosition = true
                elseif not bMoveZbeforeX then
                   EmitMoveDataHead( 1, { X=dXref, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed})
                else
-                  EmitMoveDataHead( 1, { X=-ParkX1, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed})
+                  EmitMoveDataHead( 1, { X=-LimX1PlRotSaw, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed})
+                  dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2), MyMaxZ1)
+                  dMoveXtoFinalPosition = true
                end
    
                -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
@@ -881,6 +896,9 @@ function OnRapid()
                   if bMoveZbeforeX then
                      EmitMoveDataHead( 1, { Z=EMT.L3, S=Speed})
                   end
+                  if dMoveXtoFinalPosition then
+                     EmitMoveDataHead( 1, { X=EMT.L2, S=Speed})
+                  end
                -- caso standard
                else
                   EmitMoveDataHead( 1, { X=dXref, Z=dZref, B=ParkB1, C=ParkC1, S=Speed})
@@ -942,7 +960,7 @@ function OnRapid()
                   local bMoveZbeforeX = false
 
                   local dZref = EMT.L3
-                  if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 > 91) then
+                  if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 > 91) then
                      dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                   end
                   -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -952,7 +970,7 @@ function OnRapid()
                   if not bMoveZbeforeX then
                      EmitMoveDataHead( 1, { X=EMT.L2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed})
                   else
-                     EmitMoveDataHead( 1, { X=-ParkX2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed})
+                     EmitMoveDataHead( 1, { X=-LimX1RotSawTC2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed})
                   end
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
                   if EMT.HEAD == 'H12' and abs( PrevR1 - EMT.R1) > 1 and ( abs( HomeC1 - EMT.R1) > 30.1 or abs( HomeB1 - EMT.R2) > 30.1) then
@@ -1020,7 +1038,7 @@ function OnRapid()
                   if not bMoveZbeforeX then
                      EmitMoveDataHead( 2, { X=EMT.L2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed})
                   else
-                     EmitMoveDataHead( 2, { X=-ParkX2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed})
+                     EmitMoveDataHead( 2, { X=-LimX2RotSaw, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed})
                   end
 
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
@@ -1116,7 +1134,7 @@ function OnRapid()
             end
             bToPresel = false
             -- risalita a Zmax
-            EmitZmax( false, false, EMT.TO_XHOME, PrevR1, PrevR2)
+            EmitZmax( false, false, EMT.TO_XHOME, PrevR1, PrevR2, nil, true)
             EMT.ZMAX = true
             EMT.TO_ZMAX = nil
             EMT.TO_XHOME = nil
@@ -1134,37 +1152,17 @@ function OnRapid()
          if EMT.TO_XHOME then
             local nHSet = GetHeadSet( EMT.HEAD)
             local nPrevHSet = GetHeadSet( EMT.PREVHEAD)
-
-            -- se successivo non è sega a catena e la testa è la stessa, vado in home con utensile succesivo
-            if not HeadIsChainSaw( EMT.HEAD) and nHSet == nPrevHSet then
-               if nHSet == 1 then
+            if EMT.PREVHEAD == 'H12' or EMT.PREVHEAD == 'H22' then
+               if nPrevHSet == 1 then
                   local HomeX1 = EgtGetAxisHomePos( 'X1')
-                  EmitMoveDataHead( 1, { X=-HomeX1, Z=MaxZ1, B=ParkB1, C=ParkC1})
+                  EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
                   EmitMoveStartHead( 1, 'EA1')
+                  EmitMoveWaitHead( 1)
                else
                   local HomeX2 = EgtGetAxisHomePos( 'X2')
-                  EmitMoveDataHead( 2, { X=-HomeX2, Z=MaxZ2, B=ParkB2, C=ParkC2})
+                  EmitMoveDataHead( 2, { X=-EMT.PREVHOMEX_H2, Z=MaxZ2, B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
                   EmitMoveStartHead( 2, 'EA1')
-               end
-            else
-               if not HeadIsChainSaw( EMT.PREVHEAD) then
-                  if nPrevHSet == 1 then
-                     local HomeX1 = EgtGetAxisHomePos( 'X1')
-                     EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
-                     EmitMoveStartHead( 1, 'EA1')
-                  else
-                     local HomeX2 = EgtGetAxisHomePos( 'X2')
-                     EmitMoveDataHead( 2, { X=-EMT.PREVHOMEX_H2, Z=MaxZ2, B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
-                     EmitMoveStartHead( 2, 'EA1')
-                  end
-               else
-                  if GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC1' or GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC2' then
-                     EmitMoveDataHead( 1, { X=-ParkCSawX1S, Z=MaxZ1, B=HomeR2, C=HomeR1, TPos='50'})
-                     EmitMoveStartHead( 1, 'EA1')
-                  else
-                     EmitMoveDataHead( 2, { X=-ParkCSawX2S, Z=MaxZ2, B=HomeR2, C=HomeR1, TPos='50'})
-                     EmitMoveStartHead( 2, 'EA1')
-                  end
+                  EmitMoveWaitHead( 2)
                end
             end
 
@@ -1214,14 +1212,14 @@ function OnRapid()
             if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                -- se fresa o lama
                if not HeadIsChainSaw( EMT.HEAD) then
-                  local CurrX1 = EMT.L1pp or ( -LimX1RotSaw)
+                  local CurrX1 = EMT.L1pp or ( -LimX1PlRotSaw)
                   local CurrZ1 = EMT.L3pp or MyMaxZ1
                   local CurrB1 = PrevR2
                   local CurrC1 = PrevR1
 
                   local bMoveZbeforeX = false
                   local dZref = EMT.L3
-                  if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+                  if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                      dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                   end
                   -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -1229,14 +1227,20 @@ function OnRapid()
                      bMoveZbeforeX = true
                   end
 
+               -- se vado in posizione speciale rotazione assi, poi devo ritornare alla X vera di lavoro
+                  local dMoveXtoFinalPosition = false
                   local dXref = EMT.L2
                   if  EMT.HEAD == 'H12'  and  EMT.L2 < -LimX1PlRotSaw  then
                      dXref = -LimX1PlRotSaw
                      EmitMoveDataHead( 1, { X=dXref, Z=CurrZ1, B=CurrB1, C=CurrC1, TRad=dTRad, TLen=dTLen, S=Speed})
-                  elseif not bMoveZbeforeX then
+                     dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2), MyMaxZ1)
+                     dMoveXtoFinalPosition = true
+                     elseif not bMoveZbeforeX then
                      EmitMoveDataHead( 1, { X=dXref, Z=CurrZ1, B=CurrB1, C=CurrC1, TRad=dTRad, TLen=dTLen, S=Speed})
                   else
                      EmitMoveDataHead( 1, { X=CurrX1, Z=CurrZ1, B=CurrB1, C=CurrC1, TRad=dTRad, TLen=dTLen, S=Speed})
+                     dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2), MyMaxZ1)
+                     dMoveXtoFinalPosition = true
                   end
 
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
@@ -1247,6 +1251,9 @@ function OnRapid()
                      if bMoveZbeforeX then
                         EmitMoveDataHead( 1, { Z=EMT.L3, S=Speed})
                      end
+                     if dMoveXtoFinalPosition then
+                        EmitMoveDataHead( 1, { X=EMT.L2, S=Speed})
+                     end
                   -- altrimenti caso standard
                   else
                      EmitMoveDataHead( 1, { Z=dZref, S=Speed})
@@ -1304,14 +1311,14 @@ function OnRapid()
                if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                   -- se fresa o lama
                   if not HeadIsChainSaw( EMT.HEAD) then
-                     local CurrX1 = EMT.L1pp or ( -LimX1RotSaw)
+                     local CurrX1 = EMT.L1pp or ( -LimX1PlRotSaw)
                      local CurrZ1 = EMT.L3pp or MyMaxZ1
                      local CurrB1 = PrevR2
                      local CurrC1 = PrevR1
 
                      local bMoveZbeforeX = false
                      local dZref = EMT.L3
-                     if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+                     if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                         dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                      end
                      -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -1368,14 +1375,14 @@ function OnRapid()
                if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                   -- se fresa o lama
                   if not HeadIsChainSaw( EMT.HEAD) then
-                     local CurrX2 = EMT.L1pp or ( -LimX1RotSaw)
+                     local CurrX2 = EMT.L1pp or ( -LimX2RotSaw)
                      local CurrZ2 = EMT.L3pp or MyMaxZ2
                      local CurrB2 = PrevR2
                      local CurrC2 = PrevR1
 
                      local bMoveZbeforeX = false
                      local dZref = EMT.L3
-                     if EMT.HEAD == 'H22' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+                     if EMT.HEAD == 'H22' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 > -LimX2RotSaw, EMT.L2 < -LimX2RotSaw) or EMT.R2 < -91) then
                         dZref = min( dSafeZ2 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ2)
                      end
                      -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -1938,6 +1945,9 @@ function PrepareMoveChar( sCmd, nInd)
          table.insert( EMT.MDCHAR, MDChar)
          EMT.Y1POS = MoveY1 or EMT.Y1POS
          EMT.TPOS = GetCmdAxMove( Cmd, 'T') or EMT.TPOS
+         if EMT.V1POS < 400 and ( EMT.HEAD == 'H12' or EMT.HEAD == 'H22') and EMT.ZMAX and not EMT.XHOME then
+            EMT.TO_XHOME = true
+         end
       end
    elseif Cmd[1] == '2' then
       local MDChar = { IniStatY1=EMT.ISY1, FinStatY1=EMT.FSY1, IniStatY2=EMT.ISY2, FinStatY2=EMT.FSY2, BeamVise=EMT.BV}
@@ -1965,6 +1975,9 @@ function PrepareMoveChar( sCmd, nInd)
       end
       table.insert( EMT.MDCHAR, MDChar)
       EMT.TPOS = GetCmdAxMove( Cmd, 'T') or EMT.TPOS
+      if EMT.V1POS < 400 and ( EMT.HEAD == 'H12' or EMT.HEAD == 'H22') and EMT.ZMAX and not EMT.XHOME then
+         EMT.TO_XHOME = true
+      end
    elseif Cmd[1] == '3' then
       local MDChar = { IniStatY1=EMT.ISY1, FinStatY1=EMT.FSY1, IniStatY2=EMT.ISY2, FinStatY2=EMT.FSY2, BeamVise=EMT.BV}
       local MoveY1 = GetCmdAxMove( Cmd, 'Y1')
@@ -1991,6 +2004,9 @@ function PrepareMoveChar( sCmd, nInd)
       end
       table.insert( EMT.MDCHAR, MDChar)
       EMT.TPOS = GetCmdAxMove( Cmd, 'T') or EMT.TPOS
+      if EMT.V1POS < 400 and ( EMT.HEAD == 'H12' or EMT.HEAD == 'H22') and EMT.ZMAX and not EMT.XHOME then
+         EMT.TO_XHOME = true
+      end
    elseif Cmd[1] == '4' then
       -- richiesta movimento a ZMAX già gestita
       if Cmd[2] == '1' then
@@ -2672,6 +2688,9 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
    end
    -- gruppo della testa
    local nHSet = GetHeadSet( EMT.HEAD)
+   local dXPos = EgtIf( bUsePrevDelta, EMT.L2pp or EMT.L2o, EMT.L2o)
+   -- reset stato di testa in home
+   EMT.XHOME = nil
    -- se testa 1
    if nHSet == 1 then
       -- posizioni sicure
@@ -2691,12 +2710,12 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             -- eseguo la salita a Z1max (oriento solo se assi rotanti non già a posto)
             if abs( dSafeC1 - PrevR1) > 0.1 or abs( dSafeB1 - PrevR2) > 0.1 then
                local dZref = dSafeZ1 + GetZExtra( EMT.HEAD, PrevR2)
-               if EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, -EMT.L2o < -LimX1RotSaw, -EMT.L2o > -LimX1RotSaw) then
+               if EgtIf( BD.RIGHT_LOAD, -dXPos < -LimX1RotSaw, -dXPos > -LimX1RotSaw) then
                   dZref = dZref - EgtIf( not Mortiser, 100, 370)
                end
                dZref = min( dZref, dMaxZ1)
                local MovH = { Z = EgtIf( dZref > EMT.L3o, dZref, EMT.L3o)}
-               MovH.X = -EMT.L2o ; MovH.B = EgtClamp( PrevR2, -90, 90) ;  MovH.C = PrevR1 ;
+               MovH.X = -dXPos ; MovH.B = EgtClamp( PrevR2, -90, 90) ;  MovH.C = PrevR1 ;
                EmitMoveDataHead( 1, MovH)
                if EMT.HEAD == 'H12' and ( abs( dSafeC1 - PrevR1) > 30.1 or abs( dSafeB1 - PrevR2) > 30.1) then
                   EmitMoveDataHead( 1, { Z=dMaxZ1, B=0})
@@ -2706,10 +2725,13 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
                EmitMoveDataHead( 1, { Z=dMaxZ1})
             else
                local MovH = { Z = dMaxZ1}
-               MovH.X = -EMT.L2o ; MovH.B = PrevR2 ; MovH.C = PrevR1 ;
+               MovH.X = -dXPos ; MovH.B = PrevR2 ; MovH.C = PrevR1 ;
                EmitMoveDataHead( 1, MovH)
             end
-            if bXhome then EmitMoveDataHead( 1, { X=-dSafeX1}) end
+            if bXhome then 
+               EMT.XHOME = true
+               EmitMoveDataHead( 1, { X=-dSafeX1})
+            end
             EmitMoveStartHead( 1)
             -- se lavorazione in doppio
             if EMT.DOU_TYPE == 2 then
@@ -2719,7 +2741,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
          -- altrimenti sega a catena
          else
             -- ribadisco movimento perchè in G141 si aspetta sempre tutti i valori
-            local MovH = { X = -EMT.L2o, Z = EMT.L3o, B = PrevR2, C = PrevR1}
+            local MovH = { X = -dXPos, Z = EMT.L3o, B = PrevR2, C = PrevR1}
             EmitMoveDataHead( 1, MovH)
             EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
             if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
@@ -2727,6 +2749,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             end
             EmitMoveDataHead( 1, { X=-dSafeX1, C=dSafeC1})
             if bXhome then
+               EMT.XHOME = true
                EmitMoveDataHead( 1, { X=-ParkX1, Z=ParkCSawZ1, B=ParkB1, C=ParkC1, TPos=50})
             end
             EmitMoveStartHead( 1)
@@ -2741,7 +2764,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
                local dZref = dSafeZ1 + GetZExtra( EMT.HEAD, PrevR2)
                dZref = min( dZref, dMaxZ1)
                local MovH = { Z = EgtIf( dZref > EMT.L3o, dZref, EMT.L3o)}
-               MovH.X = -EMT.L2o ; MovH.B = EgtClamp( PrevR2, -90, 90) ; MovH.C = PrevR1 ;
+               MovH.X = -dXPos ; MovH.B = EgtClamp( PrevR2, -90, 90) ; MovH.C = PrevR1 ;
                EmitMoveDataHead( 1, MovH)
                if EMT.HEAD == 'H12' and ( abs( dSafeC1 - PrevR1) > 30.1 or abs( dSafeB1 - PrevR2) > 30.1) then
                   EmitMoveDataHead( 1, { Z=dMaxZ1, B=0})
@@ -2751,16 +2774,19 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
                EmitMoveDataHead( 1, { Z=dMaxZ1})
             else
                local MovH = { Z = dMaxZ1}
-               MovH.X = -EMT.L2o ; MovH.B = PrevR2 ; MovH.C = PrevR1 ;
+               MovH.X = -dXPos ; MovH.B = PrevR2 ; MovH.C = PrevR1 ;
                EmitMoveDataHead( 1, MovH)
             end
-            if bXhome then EmitMoveDataHead( 1, { X=-dSafeX1}) end
+            if bXhome then
+               EMT.XHOME = true
+               EmitMoveDataHead( 1, { X=-dSafeX1})
+            end
             EmitMoveStartHead( 1)
             EmitMoveWaitHead( 1)
          -- altrimenti sega a catena
          else
             -- ribadisco movimento perchè in G141 si aspetta sempre tutti i valori
-            local MovH = { X = -EMT.L2o, Z = EMT.L3o, B = PrevR2, C = PrevR1}
+            local MovH = { X = -dXPos, Z = EMT.L3o, B = PrevR2, C = PrevR1}
             EmitMoveDataHead( 1, MovH)
             EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
             if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
@@ -2768,6 +2794,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             end
             EmitMoveDataHead( 1, { X=-dSafeX1, C=dSafeC1})
             if bXhome then
+               EMT.XHOME = true
                EmitMoveDataHead( 1, { X=-ParkX1, Z=ParkCSawZ1, B=ParkB1, C=ParkC1, TPos=50})
             end
             EmitMoveStartHead( 1)
@@ -2794,7 +2821,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             local dZref = dSafeZ2 + GetZExtra( EMT.HEAD, PrevR2)
             dZref = min( dZref, dMaxZ2)
             local MovH = { Z = EgtIf( dZref > EMT.L3o, dZref, EMT.L3o)}
-            MovH.X = -EMT.L2o ; MovH.B = EgtClamp( PrevR2, -90, 90) ; MovH.C = PrevR1 ;
+            MovH.X = -dXPos ; MovH.B = EgtClamp( PrevR2, -90, 90) ; MovH.C = PrevR1 ;
             EmitMoveDataHead( 2, MovH)
             if EMT.HEAD == 'H22' and ( abs( dSafeC2 - PrevR1) > 30.1 or abs( dSafeB2 - PrevR2) > 30.1) then
                EmitMoveDataHead( 2, { Z=dMaxZ2, B=0})
@@ -2804,16 +2831,19 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             EmitMoveDataHead( 2, { Z=dMaxZ2})
          else
             local MovH = { Z = dMaxZ2}
-            MovH.X = -EMT.L2o ; MovH.B = PrevR2 ; MovH.C = PrevR1 ;
+            MovH.X = -dXPos ; MovH.B = PrevR2 ; MovH.C = PrevR1 ;
             EmitMoveDataHead( 2, MovH)
          end
-         if bXhome then EmitMoveDataHead( 2, { X=-dSafeX2}) end
+         if bXhome then
+            EMT.XHOME = true
+            EmitMoveDataHead( 2, { X=-dSafeX2})
+         end
          EmitMoveStartHead( 2)
          EmitMoveWaitHead( 2)
       -- altrimenti sega a catena
       else
          -- ribadisco movimento perchè in G141 si aspetta sempre tutti i valori
-         local MovH = { X = -EMT.L2o, Z = EMT.L3o, B = PrevR2, C = PrevR1}
+         local MovH = { X = -dXPos, Z = EMT.L3o, B = PrevR2, C = PrevR1}
          EmitMoveDataHead( 2, MovH)
          EmitMoveDataHead( 2, { Z=dSafeZ2, B=dSafeB2})
          if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
@@ -2821,6 +2851,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
          end
          EmitMoveDataHead( 2, { X=-dSafeX2, C=dSafeC2})
          if bXhome then
+            EMT.XHOME = true
             EmitMoveDataHead( 2, { X=-ParkX2, Z=ParkCSawZ2, B=ParkB2, C=ParkC2, TPos=50})
          end
          EmitMoveStartHead( 2)
@@ -2954,7 +2985,7 @@ function EmitParkRoller( dPosT, bSplitCut, bUsePrevDelta)
       local dPosY1 = dPosT + dY1Delta
       local DiffY1 = MyParkY1 - dPosY1
       local dMoveY1 = EgtIf( DiffY1 > 0.1, dMoveV1, 0)
-      local dTryMoveY1 = ParkV1 - dPosT - EgtIf( bSplitCut or EMT.FALL, EMT.LT, 0)
+      local dTryMoveY1 = min( ParkV1 - dPosT - EgtIf( bSplitCut or EMT.FALL, EMT.LT, 0), MaxY1 - dPosY1 - 10)
       if ( dPosT > ParkV2 - ExtraParkV and dPosT < ParkV1 and dPosY1 + dTryMoveY1 < MaxY1) then dMoveY1 = max( dMoveY1, dTryMoveY1) end
       MDChar.Y1 = dPosY1 + dMoveY1
       MDChar.MovType = 1
@@ -2965,7 +2996,7 @@ function EmitParkRoller( dPosT, bSplitCut, bUsePrevDelta)
       local dPosY2 = dPosT + dY2Delta
       local DiffY2 = MyParkY2 - dPosY2
       local dMoveY2 = EgtIf( DiffY2 < -0.1, dMoveV2, 0)
-      local dTryMoveY2 = ParkV2 - dPosT - EMT.LT - EMT.DELTA_LT - EMT.HOVM
+      local dTryMoveY2 = max( ParkV2 - dPosT - EMT.LT - EMT.DELTA_LT - EMT.HOVM, MinY2 - dPosY2 + 10)
       if ( dPosT + EMT.LT + EMT.DELTA_LT + EMT.HOVM < ParkV1 + ExtraParkV and dPosT + EMT.LT + EMT.DELTA_LT  + EMT.HOVM > ParkV2 and dPosY2 + dTryMoveY2 > MinY2) then dMoveY2 = min( dMoveY2, dTryMoveY2) end
       MDChar.Y2 = dPosY2 + dMoveY2
       MDChar.MovType = 2
@@ -3027,11 +3058,11 @@ function PreselectNextDiffHead( nMchId, sHead)
          if nNextHSet ~= nHSet then
             local sNextTcPos = EgtTdbGetCurrToolParam( MCH_TP.TCPOS)
             -- se testa attuale da caricare è sega a catena, mando l'altra prima in HomeX (per evitare possibili collisioni) e poi lancio preselezione
-            if sHead == 'H13' and EMT.PREVHEAD ~= 'H13' then
+            if sHead == 'H13' and nHSet ~= GetHeadSet( EMT.PREVHEAD_H1) then
                EmitMoveDataHead( 2, { X=-ParkX2, Z=MaxZ2, B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
                EmitMoveStartHead( 2)
                EmitMoveWaitHead( 2)
-            elseif sHead == 'H23' and EMT.PREVHEAD ~= 'H23' then
+            elseif sHead == 'H23' and nHSet ~= GetHeadSet( EMT.PREVHEAD_H2) then
                EmitMoveDataHead( 1, { X=-ParkX1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
                EmitMoveStartHead( 1)
                EmitMoveWaitHead( 1)
@@ -3231,12 +3262,12 @@ end
 function EmitBeamHeadData( BhData)
    if not BhData.Pz5 then
    local sOut = 'G152'
-   if BhData.T then sOut = sOut .. ' Y' .. EmtLenToString( BhData.T, 3) end
-   if BhData.Y1 then sOut = sOut .. ' EY' .. EmtLenToString( BhData.Y1, 3) end
-   if BhData.Y2 then sOut = sOut .. ' EV' .. EmtLenToString( BhData.Y2, 3) end
-   if BhData.V1 then sOut = sOut .. ' B' .. EmtLenToString( BhData.V1, 3) end
-   if BhData.V2 then sOut = sOut .. ' C' .. EmtLenToString( BhData.V2, 3) end
-         if BhData.W then sOut = sOut .. ' EW' .. EmtLenToString( BhData.W, 3) end
+      if BhData.T then sOut = sOut .. ' Y' .. EmtLenToString( BhData.T, 3) end
+      if BhData.Y1 then sOut = sOut .. ' EY' .. EmtLenToString( BhData.Y1, 3) end
+      if BhData.Y2 then sOut = sOut .. ' EV' .. EmtLenToString( BhData.Y2, 3) end
+      if BhData.V1 then sOut = sOut .. ' B' .. EmtLenToString( BhData.V1, 3) end
+      if BhData.V2 then sOut = sOut .. ' C' .. EmtLenToString( BhData.V2, 3) end
+      if BhData.W then sOut = sOut .. ' EW' .. EmtLenToString( BhData.W, 3) end
       if BhData.ViseY1 then sOut = sOut .. ' EA' .. EgtNumToString( BhData.ViseY1, 0) end
       if BhData.ViseY2 then sOut = sOut .. ' EB' .. EgtNumToString( BhData.ViseY2, 0) end
       if BhData.SetHead then sOut = sOut .. ' EC' .. EgtNumToString( BhData.SetHead, 0) end

Common_ONE-PF.mlpe

@@ -119,6 +119,8 @@ function OnSimulStart()
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'TRAV'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'COL1'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'COL2'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'TC1'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'TC2'},
                      { Grp = 'Base', Sub = 'BELT', Name = 'COLLISION'}}
    -- gruppo CHSAW si attiva solo se progress, one con BIT mortiser o PF
    if Progress or Mortiser or EgtGetHeadId( 'H21') then
@@ -132,6 +134,10 @@ function OnSimulStart()
    if Progress and EgtGetHeadId( 'H21') then
       table.insert( McdData, { Grp = 'Base', Sub = 'COLLISION', Name = 'SAW1'})
    end
+   -- se non è Progress ed è una ONE, aggiungo collisioni magazzino speciale
+   if not Progress and not EgtGetHeadId( 'H21') then
+      table.insert( McdData, { Grp = 'Base', Sub = 'COLLISION', Name = 'MTC'})
+   end
 
    if Clamp5 then
       table.insert( McdData, { Grp = 'W', Sub = 'COLLISION', Name = 'STM1'})
@@ -954,6 +960,7 @@ function OnSimulMoveStart()
    VerifyY2Stroke( EMT.A2)
    VerifyV1Stroke( EMT.A3)
    VerifyV2Stroke( EMT.A4)
+   
    -- se devo subito parcheggiare i rulli
    local nRes = 0
    if bParkV then
@@ -988,22 +995,28 @@ function OnSimulMoveStart()
                local bMoveZbeforeX = false
                
                local dZref = EMT.L3
-               if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, -EMT.L2 < -LimX1RotSaw, -EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+               if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, -EMT.L2 < -LimX1RotSaw, -EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                   dZref = Z1Home + GetZExtra( EMT.HEAD, EMT.R2) - 100
                end
                -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
                if EMT.L3 > dZref then
                   bMoveZbeforeX = true
                end
-               
+
+               -- se vado in posizione speciale rotazione assi, poi devo ritornare alla X vera di lavoro
+               local dMoveXtoFinalPosition = false
                local dXref = EMT.L2
                if  EMT.HEAD == 'H12' and  -EMT.L2 < -LimX1PlRotSaw  then
                   dXref = LimX1PlRotSaw
                   SimulMoveAxis( 'X1', dXref, MCH_SIM_STEP.RAPID)
+                  dZref = Z1Home + GetZExtra( EMT.HEAD, EMT.R2)
+                  dMoveXtoFinalPosition = true
                elseif not bMoveZbeforeX then
                   SimulMoveAxis( 'X1', dXref, MCH_SIM_STEP.RAPID)
                else
-                  SimulMoveAxis( 'X1', LimX1RotSaw, MCH_SIM_STEP.RAPID)
+                  SimulMoveAxis( 'X1', LimX1PlRotSaw, MCH_SIM_STEP.RAPID)
+                  dZref = Z1Home + GetZExtra( EMT.HEAD, EMT.R2)
+                  dMoveXtoFinalPosition = true
                end
 
                -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
@@ -1014,6 +1027,9 @@ function OnSimulMoveStart()
                   if bMoveZbeforeX then
                      SimulMoveAxis( 'Z1', EMT.L3, MCH_SIM_STEP.RAPID)
                   end
+                  if dMoveXtoFinalPosition then
+                     SimulMoveAxis( 'X1', EMT.L2, MCH_SIM_STEP.RAPID)
+                  end
                -- caso standard
                else
                   SimulMoveAxis( 'Z1', dZref, MCH_SIM_STEP.RAPID)
@@ -1069,6 +1085,8 @@ function OnSimulMoveStart()
                   end
                   if not bMoveZbeforeX then
                      SimulMoveAxis( 'X1', EMT.L2, MCH_SIM_STEP.RAPID)
+                  else
+                     SimulMoveAxis( 'X1', LimX1RotSawTC2, MCH_SIM_STEP.RAPID)
                   end
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 400")
                   if EMT.HEAD == 'H12' and abs( C1Pos - EMT.R1) > 1 and ( abs( C1Home - EMT.R1) > 30.1 or abs(B1Home - EMT.R2) > 30.1) then
@@ -1138,6 +1156,8 @@ function OnSimulMoveStart()
                   end
                   if not bMoveZbeforeX then
                      SimulMoveAxis( 'X2', EMT.L2, MCH_SIM_STEP.RAPID)
+                  else
+                     SimulMoveAxis( 'X2', LimX2RotSaw, MCH_SIM_STEP.RAPID)
                   end
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
                   if EMT.HEAD == 'H22' and abs( C2Pos - EMT.R1) > 1 and ( abs( C2Home - EMT.R1) > 30.1 or abs(B2Home - EMT.R2) > 30.1) then
@@ -1251,6 +1271,7 @@ function OnSimulMoveStart()
       EMT.A4 = EgtIf( GetV2ToClose(), EMT.V2NEXTPOS, ParkV2)
    end
    EMT.ZMAX = nil
+   EMT.XHOME = nil
 end
 
 ---------------------------------------------------------------------
@@ -1359,6 +1380,10 @@ function ExecAuxCmd( sCmd, bPathStart)
          ExecOpenRoller( 1)
          ExecOpenRoller( 2)
          local sV1, MoveV1, sV2, MoveV2 = CalcMoveV1V2ForAuxCmd( Cmd)
+         -- se stringo i rulli e ho lama, verifico che sia in home
+         if MoveV1 and MoveV1 < 400 and ( EMT.HEAD == 'H12' or EMT.HEAD == 'H22') and EMT.ZMAX and not EMT.XHOME then
+            ExecMoveZmax( false, true)
+         end
          local bOk, bOk1, bOk2, bOk3 = SimulMoveAxes( Cmd[2], tonumber( Cmd[3]), MCH_SIM_STEP.RAPID,
                                                       sV1, MoveV1, MCH_SIM_STEP.RAPID,
                                                       sV2, MoveV2, MCH_SIM_STEP.RAPID)
@@ -1381,6 +1406,10 @@ function ExecAuxCmd( sCmd, bPathStart)
       ExecOpenRoller( 1)
       ExecOpenRoller( 2)
       local sV1, MoveV1, sV2, MoveV2 = CalcMoveV1V2ForAuxCmd( Cmd)
+      -- se stringo i rulli e ho lama, verifico che sia in home
+      if MoveV1 and MoveV1 < 400 and ( EMT.HEAD == 'H12' or EMT.HEAD == 'H22') and EMT.ZMAX and not EMT.XHOME then
+         ExecMoveZmax( false, true)
+      end
       local bOk, bOk1, bOk2, bOk3, bOk4 =  SimulMoveAxes( Cmd[2], tonumber( Cmd[3]), MCH_SIM_STEP.RAPID,
                                                           Cmd[4], tonumber( Cmd[5]), MCH_SIM_STEP.RAPID,
                                                           sV1, MoveV1, MCH_SIM_STEP.RAPID,
@@ -1404,6 +1433,10 @@ function ExecAuxCmd( sCmd, bPathStart)
       ExecOpenRoller( 1)
       ExecOpenRoller( 2)
       local sV1, MoveV1, sV2, MoveV2 = CalcMoveV1V2ForAuxCmd( Cmd)
+      -- se stringo i rulli e ho lama, verifico che sia in home
+      if MoveV1 and MoveV1 < 400 and ( EMT.HEAD == 'H12' or EMT.HEAD == 'H22') and EMT.ZMAX and not EMT.XHOME then
+         ExecMoveZmax( false, true)
+      end
       local bOk, bOk1, bOk2, bOk3, bOk4, bOk5 = SimulMoveAxes( Cmd[2], tonumber( Cmd[3]), MCH_SIM_STEP.RAPID,
                                                                Cmd[4], tonumber( Cmd[5]), MCH_SIM_STEP.RAPID,
                                                                Cmd[6], tonumber( Cmd[7]), MCH_SIM_STEP.RAPID,
@@ -1585,7 +1618,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
          if not HeadIsChainSaw( EMT.HEAD) then
             if abs( HomeC - CurrC) > 0.1 or abs( HomeB - CurrB) > 0.1 then
                local dZref = HomeZ + GetZExtra( EMT.HEAD, CurrB)
-               if EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, -CurrX < -LimX1RotSaw, -CurrX > -LimX1RotSaw) then
+               if EgtIf( BD.RIGHT_LOAD, -CurrX < -LimX1RotSaw, -CurrX > -LimX1RotSaw) then
                   dZref = dZref - EgtIf( not Mortiser, 100, 370)
                end
                SimulMoveAxes( 'Z1', EgtIf( dZref > CurrZ, dZref, CurrZ), MCH_SIM_STEP.RAPID, 'B1', EgtClamp( CurrB, -90, 90), MCH_SIM_STEP.COLLROT)
@@ -1597,6 +1630,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
             end
             SimulMoveAxis( 'Z1', MaxZ1, MCH_SIM_STEP.RAPID)
             if btoXHome then
+               EMT.XHOME = true
                SimulMoveAxis( 'X1', ParkX1, MCH_SIM_STEP.RAPID)
             end
             -- se lavorazione in doppio
@@ -1608,6 +1642,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
                SimulMoveAxes( 'B2', ParkB2, MCH_SIM_STEP.COLLROT, 'C2', ParkC2, MCH_SIM_STEP.COLLROT)
                SimulMoveAxis( 'Z2', MaxZ2, MCH_SIM_STEP.RAPID)
                if bToXHome then 
+                  EMT.XHOME = true
                   SimulMoveAxis( 'X2', ParkX2, MCH_SIM_STEP.RAPID)
                end
                EMT.DOU_TO_ZMAX = nil
@@ -1634,6 +1669,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
             end
             SimulMoveAxis( 'Z1', MaxZ1, MCH_SIM_STEP.RAPID)
             if btoXHome then
+               EMT.XHOME = true
                SimulMoveAxis( 'X1', ParkX1, MCH_SIM_STEP.RAPID)
             end
          -- altrimenti sega a catena
@@ -1649,6 +1685,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
                EMT.PREVHEAD_H1 = nil
                EMT.PREVTCPOS_H1 = nil
                EMT.CHSAW_OUT = true
+               EMT.XHOME = true
             end
             SimulMoveAxes( 'X1', HomeX, MCH_SIM_STEP.RAPID, 'C1', HomeC, MCH_SIM_STEP.COLLROT)
          end
@@ -1669,6 +1706,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
          end
          SimulMoveAxis( 'Z2', MaxZ2, MCH_SIM_STEP.RAPID)
          if btoXHome then
+            EMT.XHOME = true
             SimulMoveAxis( 'X2', ParkX2, MCH_SIM_STEP.RAPID)
          end
    -- altrimenti sega a catena
@@ -1853,7 +1891,7 @@ function ExecParkRoller( PosY1, PosY2, PosV1, PosV2, bSpliCut, bAgg)
       local MoveV1 = ParkV1 - PosV1
       local DiffY1 = MyParkY1 - PosY1
       local MoveY1 = EgtIf( DiffY1 > 0.1, MoveV1, 0)
-      local TryMoveY1 = ParkV1 - PosT - EgtIf( bSpliCut or EMT.FALL, EMT.LT, 0) - EMT.HOVM
+      local TryMoveY1 = min( ParkV1 - PosT - EgtIf( bSpliCut or EMT.FALL, EMT.LT, 0) - EMT.HOVM, MaxY1 - PosY1 - 10)
       if ( PosT > ParkV2 - ExtraParkV and PosT < ParkV1 and PosY1 + TryMoveY1 < MaxY1 and not EMT.W2DELTA) then MoveY1 = max( MoveY1, TryMoveY1) end
       -- se appena eseguito taglio di separazione
       if bSpliCut then
@@ -1883,7 +1921,7 @@ function ExecParkRoller( PosY1, PosY2, PosV1, PosV2, bSpliCut, bAgg)
       local MoveV2 = ParkV2 - PosV2
       local DiffY2 = MyParkY2 - PosY2
       local MoveY2 = EgtIf( DiffY2 < -0.1, MoveV2, 0)
-      local TryMoveY2 = ParkV2 - PosT - EMT.LT - EMT.DELTA_LT - EMT.HOVM
+      local TryMoveY2 = max( ParkV2 - PosT - EMT.LT - EMT.DELTA_LT - EMT.HOVM, MinY2 - PosY2 + 10)
       if ( PosT + EMT.LT + EMT.DELTA_LT + EMT.HOVM < ParkV1 + ExtraParkV and PosT + EMT.LT + EMT.DELTA_LT + EMT.HOVM > ParkV2 and PosY2 + TryMoveY2 > MinY2) then MoveY2 = min( MoveY2, TryMoveY2) end
       if not SimulMoveAxes( 'T',  PosT + MoveY2, MCH_SIM_STEP.RAPID,
                             'V1', ParkV1, MCH_SIM_STEP.RAPID,

UpdateLog.txt

@@ -1,5 +1,17 @@
            ==== Common_ONE-PF Update Log ====
 
+Versione 2.6j1 (08/10/2024)
+-- (SIM-GEN) Corretto primo movimento di approccio al pezzo. Ticket#2093
+
+Versione 2.6i2 (13/09/2024)
+- (GEN) Migliorato calcolo chiusura paratia rulli con aggiornamento lunghezza della barra in caso di ultimo taglio e grezzo residuo in coda. Ticket#2017
+- (NGE-MLDE-GEN-SIM) Aggiunto solidi collisione TC.  Corretto movimento a Y di sicurezza con lama. Ticket#2042
+- (NGE-SIM) Aggiunta collisione magazzino motosega ONE
+
+Versione 2.6i1 (02/09/2024)
+- (SIM-GEN) Quando si aprono i rulli, se la trave non può seguire i rulli perchè la pinza andrebbe in extra-corsa, si sposta comunque la pinza fino al massimo della sua corsa. Ticket#1949
+- (GEN) In preselezione. Se lavorazione motosega, non mando a parcheggio altra testa con utensile precedente, perchè subito dopo viene chiamata preselezione. Ticket#1961 
+
 Versione 2.6h2 (07/08/2024)
 - (SIM) Allineata simulazione a generazione in primo movimento rapido approccio al pezzo.
 

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_ONE-PF',            -- nome script PP standard
-   VERSION = '2.6h2',                 -- versione script
+   VERSION = '2.6j1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }