Merge remote-tracking branch 'origin/develop'

Beam/BeamData.lua

@@ -115,8 +115,8 @@ if EgtExistsFile( sDataBeam) then
          BeamData.OVM_MID = Machine.Offsets.OVM_MID or BeamData.OVM_MID
          if Machine.Offsets.MAX_ANGLE_DRILL_CUT then BeamData.MAX_ANGLE_DRILL_CUT = EgtClamp( Machine.Offsets.MAX_ANGLE_DRILL_CUT, 1, 89) end
          if Machine.Offsets.CUT_SIC then BeamData.CUT_SIC = EgtClamp( Machine.Offsets.CUT_SIC, 15, 50) end
-         if Machine.Offsets.MIN_JOIN_S then BeamData.MIN_JOIN_S = Machine.Offsets.MIN_JOIN_S end
-         if Machine.Offsets.MIN_JOIN_L then BeamData.MIN_JOIN_L = Machine.Offsets.MIN_JOIN_L end
+         if Machine.Offsets.MIN_JOIN_S then BeamData.MIN_JOIN_S = EgtClamp( Machine.Offsets.MIN_JOIN_S, 80, 150) end
+         if Machine.Offsets.MIN_JOIN_L then BeamData.MIN_JOIN_L = EgtClamp( Machine.Offsets.MIN_JOIN_L, 300, 450) end
       end
       if Machine.Trave then
          BeamData.MIN_WIDTH = Machine.Trave.XMIN or BeamData.MIN_WIDTH

Common_PF1250.TPA.mlpe

@@ -2091,7 +2091,8 @@ function PrepareUnload( sCmd, nInd)
       if Cmd[4] == 'Y2' then
           -- se non è ultima fase c'è una barra sulla pinza Y1
          local bBarOnY = ( EMT.PHASE < EgtGetPhaseCount() and not IsEnd2Phase( EMT.PHASE))
-         local MDChar = { Y2=tonumber(Cmd[5]), IniStatY1=EgtIf( bBarOnY, -1, 1), FinStatY1=EgtIf( bBarOnY, -1, 1), IniStatY2=-1, FinStatY2=1, IniStatV2=1, BeamVise=2, MovType=EgtIf( EMT.CHY_ON, 3, 2)}
+         local bManualUnl = ( Cmd[4] and Cmd[4] == 'Manual Unloading')
+         local MDChar = { Y2=tonumber(Cmd[3]), V2=EgtIf( bManualUnl, MaxV2, ParkV2), IniStatY2=1, FinStatY2=EgtIf( bManualUnl, -85, -84), BeamVise=EgtIf( bBarOnY, 1, 0), MovType=EgtIf( EMT.CHY_ON, 3, 2)}
          table.insert( EMT.MDCHAR, MDChar)
       end
    elseif Cmd[1] == '3' then

Common_PF1250.mlpe

@@ -1499,6 +1499,9 @@ function ExecAuxCmd( sCmd, bPathStart)
       if Cmd[2] ~= 'Z' then
          ExecOpenRoller( 1)
          ExecOpenRoller( 2)
+         if Cmd[4] and Cmd[4] == 'Manual Unloading' then
+            ExecMovePY2( false)
+         end
          local sV1, MoveV1, sV2, MoveV2 = CalcMoveV1V2ForAuxCmd( Cmd)
          local bOk, bOk1, bOk2, bOk3 = SimulMoveAxes( Cmd[2], tonumber( Cmd[3]), MCH_SIM_STEP.RAPID,
                                                       sV1, MoveV1, MCH_SIM_STEP.RAPID,

Common_PF1250.mlse

@@ -1406,7 +1406,7 @@ function SpecCalcUnload()
       table.insert( vCmd, { 2, 'T', dFinT, 'Y2', dFinY2})
       EgtOutLog( '  Y2PosF=' .. EgtNumToString( dFinY2), 1)
    else
-      table.insert( vCmd, { 1, 'Y2', MaxY2})
+      table.insert( vCmd, { 1, 'Y2', MaxY2, 'Manual Unloading'})
    end
    -- apro la morsa
    table.insert( vCmd, { 12, 0})
@@ -2536,11 +2536,11 @@ function SpecOutputCmds( vCmd, bEnd)
          EgtSetInfo( EMC.PATHID, sKey, sInfo)
       -- movimento di 1 asse
       elseif Cmd[1] == 1 then
-         local sInfo = '1,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..EgtIf( Cmd[4], ',*', '')
+         local sInfo = '1,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..EgtIf( Cmd[4], ','..tostring(Cmd[4]), '')
          EgtSetInfo( EMC.PATHID, sKey, sInfo)
       -- movimento di 2 assi
       elseif Cmd[1] == 2 then
-         local sInfo = '2,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..','..Cmd[4]..','..EgtNumToString( Cmd[5],3)..EgtIf( Cmd[6], ',*', '')
+         local sInfo = '2,'..Cmd[2]..','..EgtNumToString( Cmd[3],3)..','..Cmd[4]..','..EgtNumToString( Cmd[5],3)..EgtIf( Cmd[6], ','..tostring(Cmd[6]), '')
          EgtSetInfo( EMC.PATHID, sKey, sInfo)
       -- movimento di 3 assi
       elseif Cmd[1] == 3 then

Essetre-PF1250MAX.mlde

@@ -8,8 +8,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '3.1c1'
-PP_NVER = '3.1.3.1'
+PP_VER = '3.1e1'
+PP_NVER = '3.1.5.1'
 MIN_MACH_VER = '2.7d2'
 MACH_NAME = EgtGetCurrMachineName()
 

UpdateLog.txt

@@ -1,6 +1,9 @@
            ==== Common_PF1250 Update Log ====
 
-Versione 3.1c1 (12/03/2026)
+Versione 3.1e1 (12/05/2026)
+- (SIM-GEN) Corretta SIM (muoveva Y2 a MaxY2 senza aprire pinza) e GEN (non chiudeva rulliere e dava extracorsa e non generava P7=-85) di pezzi lunghi che necessitano lo scarico manuale. Ticket#2971
+
+Versione 3.1c1 
 - (SIM-GEN) Corretto calcolo rimanenza durante ParkRoller. Ticket#2832
 - (SIM) Corretto caricamento geometrie di collisioni. Modificato indice di collisione per una migliore gestione. ATT: MIN_MACH -> 3.1b2
 - (SIM-GEN) Aggiunta OnSpecialApplyMachining per calcolare i carrelli da subito

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_PF1250',            -- nome script PP standard
-   VERSION = '3.1c1',                 -- versione script
+   VERSION = '3.1e1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '3.1b2'   -- versione minima kernel
 }