In BeamData aggiunte costanti MIN_HEIGHT_ADDED_CUTS, PRECUT_HEAD, PRECUT_TAIL, configurabili da offsets Ts3v7

.gitlab-ci.yml

@@ -84,7 +84,7 @@ 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"
+     echo "   Compilazione file *.lua 32/64bit di Common_*"
      echo "-----------------------"
      $FileList = Get-ChildItem("Common_*")
      ForEach ($File in $FileList) {
@@ -92,6 +92,9 @@ variables:
        lua54 -o $env:SRC_PATH\bin\$env:MACH_NAME\$FileName -s $FileName
        echo "lua54 -o bin\$FileName -s $FileName"
      }
+     echo "-----------------------"
+     echo "   FINE Compilazione"
+     echo "-----------------------"
 
 # helper recupero nome macchina
 .machName-fix: &machName-fix

Beam/BeamData.lua

@@ -72,7 +72,10 @@ local BeamData = {
    ADVANCE_TAIL_OFFS = 5,                   -- accorciamento taglio di coda avanzato (minimo 1)
    DOUBLE_HEAD_DOVETAIL = true,             -- flag abilitazione lavorazione mortase a coda di rondine in doppio
    DOUBLE_HEAD_MORTISE = true,              -- flag abilitazione lavorazione mortase in doppio
-   DOUBLE_HEAD_DRILLING = true              -- flag abilitazione forature in doppio
+   DOUBLE_HEAD_DRILLING = true,             -- flag abilitazione forature in doppio
+   PRECUT_HEAD = true,                      -- flag abilitazione pretaglio grezzo a zero in testa
+   PRECUT_TAIL = true,                      -- flag abilitazione pretaglio grezzo a zero in coda
+   MIN_HEIGHT_ADDED_CUTS = 400,             -- altezza minima pezzo per effettuare tagli orizzontali aggiuntivi in testa e coda
 }
 
 ---------------------------------------------------------------------
@@ -92,6 +95,9 @@ if EgtExistsFile( sDataBeam) then
          if Machine.Offsets.DOUBLE_HEAD_DOVETAIL then BeamData.DOUBLE_HEAD_DOVETAIL = ( Machine.Offsets.DOUBLE_HEAD_DOVETAIL == 1) end
          if Machine.Offsets.DOUBLE_HEAD_POCKET then BeamData.DOUBLE_HEAD_MORTISE = ( Machine.Offsets.DOUBLE_HEAD_POCKET == 1) end
          if Machine.Offsets.DOUBLE_HEAD_DRILLING then BeamData.DOUBLE_HEAD_DRILLING = ( Machine.Offsets.DOUBLE_HEAD_DRILLING == 1) end
+         if Machine.Offsets.PRECUT_HEAD_DISABLE then BeamData.PRECUT_HEAD = ( Machine.Offsets.PRECUT_HEAD_DISABLE == 0) end
+         if Machine.Offsets.PRECUT_TAIL_DISABLE then BeamData.PRECUT_TAIL = ( Machine.Offsets.PRECUT_TAIL_DISABLE == 0) end
+         if Machine.Offsets.MIN_HEIGHT_ADDED_CUTS then BeamData.MIN_HEIGHT_ADDED_CUTS = min( Machine.Offsets.MIN_HEIGHT_ADDED_CUTS, BeamData.MIN_HEIGHT_ADDED_CUTS) end
          BeamData.MINRAW_S = max( BeamData.MINRAW_S, Machine.Offsets.MINRAW_S or BeamData.MINRAW_S)
          BeamData.MINRAW_L = max( BeamData.MINRAW_L, Machine.Offsets.MINRAW_L or BeamData.MINRAW_L)
          BeamData.CUT_EXTRA = Machine.Offsets.CUT_EXTRA or BeamData.CUT_EXTRA

Common_PF1250.TPA.mlpe

@@ -830,9 +830,6 @@ function OnRapid()
                   EMT.L2pp = ParkX2
                end
             end
-            if ( not EMT.L2pp or ( EMT.L2pp and EMT.L2pp > ParkMchY2)) and ( ParkB2 ~= EMT.R2  or  ParkC2 ~= EMT.R1) then
-               EmitMoveDataHead( 2, { X=ParkMchY2, Z=ParkZ2, B=ParkB2, C=ParkC2, S=Speed}) 
-            end
             EmitMoveStartHead( 2)
             EmitMoveWaitHead( 2)
             EmitMoveWaitChars( EgtIf( bOnlyCharY, 1, 3))
@@ -842,6 +839,10 @@ function OnRapid()
                local dPosT = EMT.TPOS or EMT.L1op
                EmitParkRoller( dPosT, bSplitCut)
             end
+            -- vado a quota sicurezza in X per permettere rotazione assi rotanti
+            if ( not EMT.L2pp or ( EMT.L2pp and EMT.L2pp > ParkMchY2)) and ( ParkB2 ~= EMT.R2  or  ParkC2 ~= EMT.R1) then
+               EmitMoveDataHead( 2, { X=ParkMchY2, Z=ParkZ2, B=ParkB2, C=ParkC2, S=Speed}) 
+            end
             -- scrivo solo se gli assi rotanti sono cambiati
             if EMT.HEAD == 'H22' and ( CurrB2 ~= EMT.R2  or  CurrC2 ~= EMT.R1) then
                EmitMoveDataHead( 2, { B=EMT.R2, C=EMT.R1, S=Speed})
@@ -2523,7 +2524,7 @@ function EmitParkRoller( dPosT, bSplitCut)
       local dPosY1 = dPosT + EMT.Y1DELTA
       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
       --MyOutput( string.format( 'PosT=%.3f PosY1=%.3f V1POS=%.3f Split=%s', dPosT, dPosY1, EMT.V1POS, EgtIf( bSplitCut, '1', '0')))
       MDChar.Y1 = dPosY1 + dMoveY1
@@ -2535,7 +2536,7 @@ function EmitParkRoller( dPosT, bSplitCut)
       local dPosY2 = dPosT + EMT.Y2DELTA
       local DiffY2 = MyParkY2 - dPosY2
       local dMoveY2 = EgtIf( DiffY2 < -0.1, dMoveV2, 0)
-      local dTryMoveY2 = ParkV2 - dPosT - EMT.LT - EMT.HOVM
+      local dTryMoveY2 = max( ParkV2 - dPosT - EMT.LT - EMT.HOVM, MinY2 - dPosY2 + 10)
       if ( dPosT + EMT.LT + EMT.HOVM < ParkV1 + ExtraParkV and dPosT + EMT.LT + EMT.HOVM > ParkV2 and dPosY2 + dTryMoveY2 > MinY2) then dMoveY2 = min( dMoveY2, dTryMoveY2) end
       --MyOutput( string.format( 'PosT=%.3f LT=%.3f PosY2=%.3f V2POS=%.3f', dPosT, EMT.LT, dPosY2, EMT.V2POS))
       MDChar.Y2 = dPosY2 + dMoveY2

Common_PF1250.mlpe

@@ -1624,7 +1624,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)
+      local TryMoveY1 = min( ParkV1 - PosT - EgtIf( bSpliCut or EMT.FALL, EMT.LT, 0), MaxY1 - PosY1 - 10)
       if ( PosT > ParkV2 - ExtraParkV and PosT < ParkV1 and PosY1 + TryMoveY1 < MaxY1) then MoveY1 = max( MoveY1, TryMoveY1) end
       -- se appena eseguito taglio di separazione
       if bSpliCut then
@@ -1654,7 +1654,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
+      local TryMoveY2 = max( ParkV2 - PosT - EMT.LT, MinY2 - PosY2 + 10)
       if ( PosT + EMT.LT < ParkV1 + ExtraParkV and PosT + EMT.LT > 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-PF1250MAX.mlde

@@ -60,12 +60,14 @@
 -- 2024/07/24 ver 2.6g5 Allineamento con common ver. 2.6g5
 --                      Gestione limite corsa asse B2 se lama su H21
 -- 2024/08/07 ver 2.6h1 Allineamento con common ver. 2.6h1
+-- 2024/08/28 ver 2.6h2 Allineamento con common ver. 2.6h2
+-- 2024/09/06 ver 2.6i1 In BeamData aggiunte costanti MIN_HEIGHT_ADDED_CUTS, PRECUT_HEAD, PRECUT_TAIL, configurabili da offsets Ts3v7
 
 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6h1'
+PP_VER = '2.6i1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-PF1250MAX'
 

UpdateLog.txt

@@ -1,5 +1,9 @@
            ==== Common_PF1250 Update Log ====
 
+Versione 2.6h2 (28/08/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) La testa veniva spostata a quota X sicurezza rotazione assi rotanti prima di aprire le rulliere. Ticket#1991
+
 Versione 2.6h1 (07/08/2024)
 - (GEN) Gestione creazione piano generico in caso il primo movimento della lavorazione sia un arco. Ticket#1891
 - (SIM-GEN) Migliorata gestione riposizionamenti fatta con la 2.6g1. Ticket#1836

Version.lua

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