Allineamento con common ver. 2.6g1

Common-PF1250.mlpe

@@ -1283,7 +1283,7 @@ function ExecAuxCmd( sCmd, bPathStart)
       ExecMoveHome( Cmd[2] == '1', EgtIf( bPathStart, false, EMT.MCHSPLIT))
    elseif Cmd[1] == '11' then
       local bClose = Cmd[2] ~= '0'
-      if bPathStart and EMT.MCHSPLIT and not EMT.FALL and GetPY2Light() then bClose = false end
+      if bPathStart and EMT.MCHSPLIT and not ( EMT.FALL or EMT.TO_FALL) and GetPY2Light() then bClose = false end
       ExecMovePY1( bClose)
    elseif Cmd[1] == '12' then
       ExecMovePY2( Cmd[2] ~= '0')

Common-PF1250.mlse

@@ -1069,11 +1069,21 @@ function SpecCalcCarriages( dDistFront, dDistBack, dRollFront, dRollBack, dY1Del
       WorkTab.dY1DeltaMaxF = min( EMC.LB - MinJoin, MaxY1 + dDistFront + dRollFront + AGG_V)
       WorkTab.dY2DeltaMinF = nil
       WorkTab.dY2DeltaMaxF = nil
+      if dY1DeltaMaxSP then WorkTab.dY1DeltaMaxF = min( WorkTab.dY1DeltaMaxF, dY1DeltaMaxSP) end
       WorkTab.dV1PosF = dRollBack
       WorkTab.bV1CloseF = false
       WorkTab.dV2PosF = -dRollFront
       WorkTab.bV2CloseF = false
 
+      -- aggiuntivo per non avere problemi con pezzi a caduta
+      if WorkTab.dY1DeltaMaxF - WorkTab.dY1DeltaMinF > 5 * BD.CHAR_EXTRA_DIST then
+         WorkTab.dY1DeltaMinF = WorkTab.dY1DeltaMinF + 4 * BD.CHAR_EXTRA_DIST
+      elseif WorkTab.dY1DeltaMaxF - WorkTab.dY1DeltaMinF > 2.5 * BD.CHAR_EXTRA_DIST then
+         WorkTab.dY1DeltaMinF = WorkTab.dY1DeltaMinF + 2 * BD.CHAR_EXTRA_DIST
+      elseif WorkTab.dY1DeltaMaxF - WorkTab.dY1DeltaMinF > 1.5 * BD.CHAR_EXTRA_DIST then
+         WorkTab.dY1DeltaMinF = WorkTab.dY1DeltaMinF + BD.CHAR_EXTRA_DIST
+      end
+
       -- verifico validità intervallo ammesso per Y1
       if WorkTab.dY1DeltaMinF > WorkTab.dY1DeltaMaxF + 10 * GEO.EPS_SMALL then
          EMC.ERR = 18
@@ -1110,6 +1120,15 @@ function SpecCalcCarriages( dDistFront, dDistBack, dRollFront, dRollBack, dY1Del
       WorkTab.dV2PosF = -dRollFront
       WorkTab.bV2CloseF = false
 
+      -- aggiuntivo per minimizzare scambi carrelli
+      if WorkTab.dY1DeltaMaxF - WorkTab.dY1DeltaMinF > 5 * BD.CHAR_EXTRA_DIST then
+         WorkTab.dY1DeltaMinF = WorkTab.dY1DeltaMinF + 4 * BD.CHAR_EXTRA_DIST
+      elseif WorkTab.dY1DeltaMaxF - WorkTab.dY1DeltaMinF > 2.5 * BD.CHAR_EXTRA_DIST then
+         WorkTab.dY1DeltaMinF = WorkTab.dY1DeltaMinF + 2 * BD.CHAR_EXTRA_DIST
+      elseif WorkTab.dY1DeltaMaxF - WorkTab.dY1DeltaMinF > 1.5 * BD.CHAR_EXTRA_DIST then
+         WorkTab.dY1DeltaMinF = WorkTab.dY1DeltaMinF + BD.CHAR_EXTRA_DIST
+      end
+
       -- verifico validità intervallo ammesso per Y1
       if WorkTab.dY1DeltaMinF > WorkTab.dY1DeltaMaxF + 10 * GEO.EPS_SMALL then
          EMC.ERR = 18

Essetre-PF1250.mlde

@@ -67,12 +67,13 @@
 -- 2024/06/03 ver 2.6f1 Aggiunta funzione GetSetupInfo a BeamData per nuovo automatismo
 --                      Allineamento con common ver. 2.6f1
 -- 2024/06/06 ver 2.6f2 Allineamento con common ver. 2.6f2
+-- 2024/07/08 ver 2.6g1 Allineamento con common ver. 2.6g1
 
 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6f2'
+PP_VER = '2.6g1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-PF1250'
 

UpdateLog.txt

@@ -1,5 +1,8 @@
            ==== Common_PF1250 Update Log ====
 
+Versione 2.6g1 (08/07/2024)
+- (SIM-GEN) Corretto movimento che pinzava nel vuoto durante riposizionamento. Ticket#1836
+
 Versione 2.6f2 (06/06/2024)
 - (GEN) Quando si va a ZMAX, si azzerano tutte le coordinate ".pp". Scriveva una Z bassa quando era a Z massima. Ticket#1839
 

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_PF1250',            -- nome script PP standard
-   VERSION = '2.6f2',                 -- versione script
+   VERSION = '2.6g1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }