- Allineamento con common ver. 2.6i1

- File YML con prefisso di ricerca "Common_" per compilazione

.gitlab-ci.yml

@@ -84,9 +84,9 @@ variables:
      Rename-Item -Path "$env:TEST_PATH\$env:MACH_NAME.ini" -NewName "$env:MACH_NAME_TEST.ini"
      ROBOCOPY . "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
      echo "-----------------------"
-     echo "   Compilazione file *.lua 32/64bit di Common*"
+     echo "   Compilazione file *.lua 32/64bit di Common_*"
      echo "-----------------------"
-     $FileList = Get-ChildItem("Common*")
+     $FileList = Get-ChildItem("Common_*")
      ForEach ($File in $FileList) {
        $FileName = Split-Path $File -leaf
        lua54 -o $env:SRC_PATH\bin\$env:MACH_NAME\$FileName -s $FileName

Common_ONE-PF.NUM.mlpe

@@ -2954,7 +2954,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 +2965,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 +3027,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)

Common_ONE-PF.mlpe

@@ -1853,7 +1853,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 +1883,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,

Essetre-PFrl.mlde

@@ -72,12 +72,13 @@
 -- 2024/07/31 ver 2.6g5 Allineamento con common ver. 2.6g5
 -- 2024/08/01 ver 2.6h1 Allineamento con common ver. 2.6h1
 -- 2024/08/07 ver 2.6h2 Allineamento con common ver. 2.6h2
+-- 2024/09/02 ver 2.6i1 Allineamento con common ver. 2.6i1
 
 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6h2'
+PP_VER = '2.6i1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-PFrl'
 

UpdateLog.txt

@@ -1,5 +1,9 @@
            ==== Common_ONE-PF Update Log ====
 
+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.6i1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }