Merge branch 'release/2.5l4'

- Prima bozza gestione aggregato lama da sotto

Beam/BeamData.lua

@@ -5,12 +5,12 @@ EgtOutLog( ' PF1250-BeamData started')
 
 -- Tabella per definizione modulo
 local BeamData = {
-   RIGHT_LOAD = false,                       -- flag carico da destra
+   RIGHT_LOAD = false,                      -- flag carico da destra
    SIMUL_VIEW_DIR = 2,                      -- direzione di vista predefinita per la simulazione (1=NW, 2=SW, 3=NE, 4=SE)
    MIN_WIDTH = 40,                          -- larghezza minima del grezzo
    MIN_HEIGHT = 40,                         -- altezza minima del grezzo
-   MAX_WIDTH = 1250,                        -- larghezza massima del grezzo
-   MAX_HEIGHT = 400,                        -- altezza massima del grezzo
+   MAX_WIDTH = 1300,                        -- larghezza massima del grezzo
+   MAX_HEIGHT = 600,                        -- altezza massima del grezzo
    LEN_SHORT_PART = 1200,                   -- lunghezza massima pezzo piccolo
    MAX_RAW = 20000,                         -- massima lunghezza grezzo (deve essere minore di LenTable - RAW_OFFSET)
    STD_RAW = 14000,                         -- lunghezza standard della barra di grezzo
@@ -77,7 +77,7 @@ local BeamData = {
 
 ---------------------------------------------------------------------
 -- Aggiornamento con dati da TechnoEssetre7
-local sTs3Data = EgtGetStringFromIni( 'Beam', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-PF1250.data"
+local sTs3Data = EgtGetStringFromIni( 'Beam', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-PF1250MAX.data"
 local sDataBeam = EgtGetSourceDir().."\\Ts3Data.lua"
 local sDataWall = EgtGetCurrMachineDir()..'\\Wall\\Ts3Data.lua'
 if EgtExistsFile( sTs3Data) then

Essetre-PF1250.TPA.mlpe

@@ -351,6 +351,20 @@ function OnToolSelect()
       if MCH_TP.DIST then EMT.TDIST = EgtTdbGetCurrToolParam( MCH_TP.DIST) end
       if EMT.TDIST and abs( EMT.TDIST) < 0.1 then EMT.TDIST = nil end
       EMT.TUSERNOTES = EgtTdbGetCurrToolParam( MCH_TP.USERNOTES)
+         -- salvo dati utensile
+      local nSetHead = GetHeadSet( EMT.HEAD)
+      -- per gruppo testa 1
+      if nSetHead == 1 then
+         EMT.PREVTOOL_H1 = EMT.TOOL
+         EMT.PREVHEAD_H1 = EMT.HEAD
+         EMT.PREVTCPOS_H1 = EMT.TCPOS
+      -- per gruppo testa 2
+      elseif nSetHead == 2 then
+         EMT.PREVTOOL_H2 = EMT.TOOL
+         EMT.PREVHEAD_H2 = EMT.HEAD
+         EMT.PREVTCPOS_H2 = EMT.TCPOS
+      end
+
    end
 end
 
@@ -370,7 +384,15 @@ function OnMachiningStart()
       -- imposto home dell'asse C1 (A=0 -> T101, A=90 -> T104)
       local MyParkCSawC1 = GetChainSawCHomeFromVirtualAxis( dPosA)
       EmtModifyAxisHome( 'C1', MyParkCSawC1)
+   -- se lama su aggregato testa sotto, aggiusto subito angolo scelto per asse virtuale A
+   elseif EMT.HEAD == 'H22' then
+      -- valore dell'asse virtuale
+      dPosA = GetCurrSawingVirtualAxis()
+      -- imposto home dell'asse C2 (A=0 -> T201, A=90 -> T204)
+      local MyParkCSawC2 = GetSawCHomeFromVirtualAxis( dPosA)
+      EmtModifyAxisHome( 'C2', MyParkCSawC2)
    end
+
    -- gestione eventuale lavorazione in doppio
    local nDouType = EgtGetValInNotes( EMT.MCHUSERNOTES, 'DOUBLE', 'i')
    if nDouType == 2 or nDouType == 3 then
@@ -1868,6 +1890,20 @@ function AdjustTcPos( bLen3, sTcPos, dAxR3)
          EmtSetLastError( 1210, 'Chain saw orientation not allowed')
       end
    end
+   if sPos == '201' then
+      if not dAxR3 then dAxR3 = EMT.R3 end
+      if abs( dAxR3 - 0) < 0.1 then
+         sPos = '201'
+      elseif abs( dAxR3 - 270) < 0.1 then
+         sPos = '202'
+      elseif abs( dAxR3 - 180) < 0.1 then
+         sPos = '203'
+      elseif abs( dAxR3 - 90) < 0.1 then
+         sPos = '204'
+      else
+         EmtSetLastError( 1210, 'Saw orientation not allowed')
+      end
+   end
 
    return sPos
 end
@@ -1928,32 +1964,32 @@ function EmitZmax( bReset, bEnd, PrevR1, PrevR2, bSplitCut)
    if EMT.HEAD ~= 'H21' and EMT.HEAD ~= 'H22' then
       -- posizioni sicure
       local dMaxZ1 = EgtGetAxisMax( 'Z1')
-      local dSafeX1 = EgtGetAxisHomePos( 'X1')
-      local dSafeZ1 = EgtGetAxisHomePos( 'Z1')
-      local dSafeB1 = EgtGetAxisHomePos( 'B1')
-      local dSafeC1 = EgtGetAxisHomePos( 'C1')
+      local dHomeX1 = EgtGetAxisHomePos( 'X1')
+      local dHomeZ1 = EgtGetAxisHomePos( 'Z1')
+      local dHomeB1 = EgtGetAxisHomePos( 'B1')
+      local dHomeC1 = EgtGetAxisHomePos( 'C1')
       -- se necessario allargo le cabine
-      if RollerParkingNeeded( EMT.HEAD, PrevR1, PrevR2, dSafeC1, dSafeB1) then
+      if RollerParkingNeeded( EMT.HEAD, PrevR1, PrevR2, dHomeC1, dHomeB1) then
          local dPosT = EgtIf( bEnd, EMT.L1o, EMT.TPOS or EMT.L1op)
          EmitParkRoller( dPosT, bSplitCut)
       end
       -- se fresa o lama
       if EMT.HEAD ~= 'H13' then
          -- 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 abs( dHomeC1 - PrevR1) > 0.1 or abs( dHomeB1 - PrevR2) > 0.1 then
+            local dZref = dHomeZ1 + 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 ;
             EmitMoveDataHead( 1, MovH)
-            if ( EMT.HEAD == 'H12' or EMT.HEAD == 'H16') and ( abs( dSafeC1 - PrevR1) > 30.1 or abs( dSafeB1 - PrevR2) > 30.1) then
+            if ( EMT.HEAD == 'H12' or EMT.HEAD == 'H16') and ( abs( dHomeC1 - PrevR1) > 30.1 or abs( dHomeB1 - PrevR2) > 30.1) then
                EmitMoveDataHead( 1, { Z=dMaxZ1, B=0, Fmt=1})
             end
             if EMT.L2o > DeltaTabY then
                EmitMoveDataHead( 1, { X=-DeltaTabY, Fmt=1})
             end
-            EmitMoveDataHead( 1, { C=dSafeC1, Fmt=1})
-            EmitMoveDataHead( 1, { B=dSafeB1, Fmt=1})
+            EmitMoveDataHead( 1, { C=dHomeC1, Fmt=1})
+            EmitMoveDataHead( 1, { B=dHomeB1, Fmt=1})
          end
          EmitMoveDataHead( 1, { Z=dMaxZ1, Fmt=1})
          EmitMoveStartHead( 1)
@@ -1965,9 +2001,9 @@ function EmitZmax( bReset, bEnd, PrevR1, PrevR2, bSplitCut)
          EmitMoveWaitHead( 1)
       -- altrimenti sega a catena
       else
-         EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1, Fmt=1})
-         EmitMoveDataHead( 1, { X=-dSafeX1, C=dSafeC1, Fmt=1})
-         EmitMoveDataHead( 1, { Z=dMaxZ1, Fmt=1})
+         -- salzo in Z sicurezza raddrizzando la B
+         EmitMoveDataHead( 1, { Z=ParkCSawZ1, B=dHomeB1, Fmt=1})
+         EmitMoveDataHead( 1, { X=-dHomeX1, C=dHomeC1, Fmt=1})
          EmitMoveStartHead( 1)
          EmitMoveWaitHead( 1)
       end
@@ -2171,7 +2207,13 @@ function PreselectNextDiffHead( nMchId, sHead)
                   EmitMoveStartHead( 1)
                end
             else
-               EmitMoveDataHead( 2, { B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, sNextTcPos), Fmt=2})
+               -- non si può preselezionare lama su aggregato da sotto
+               -- Se è già montata, non preseleziono altro utensile fino all'effettiva lavorazione altro utensile
+               if sNextHead == 'H22' or EMT.PREVHEAD_H2 == 'H22' then
+                  return
+               else
+                  EmitMoveDataHead( 2, { B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, sNextTcPos), Fmt=2})
+               end
                EmitMoveStartHead( 2)
             end
          end

Essetre-PF1250.mlpe

@@ -25,8 +25,8 @@ local COLL_SAFE_DIST = 4
 ---------------------------------------------------------------------
 function OnSimulStart()
    -- controllo versione programma
-   if not EMT.VER or EMT.VER < '2.5d1' then
-      EmtSetLastError( 1200, 'A newer version of the program is required (minimum EgtMachKernel 2.5d1)')
+   if not EMT.VER or EMT.VER < MIN_MACH_VER then
+      EmtSetLastError( 1200, 'A newer version of the program is required (minimum EgtMachKernel '..MIN_MACH_VER..')')
    end
    -- Carico gli utensili sulle barre portautensili
    local vTcPos = EgtGetAllTcPosNames()
@@ -74,6 +74,7 @@ function OnSimulStart()
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'CHSAW'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'CHSAW2'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'SPTOOLS'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'AGGREBLADEUNDER'},
                      { Grp = 'Z2', Sub = 'COLLISION', Name = 'COL1'},
                      { Grp = 'Z2', Sub = 'COLLISION', Name = 'CHAIN'},
                      { Grp = 'Z2', Sub = 'COLLISION', Name = 'COL2'}}
@@ -437,7 +438,7 @@ function OnSimulToolSelect( dPosA)
    -- se attivo Collision Check
    EMT.SAFEDIST = COLL_SAFE_DIST
    if EMT.COLLOBJ then
-      local nInd = EgtIf( EMT.HEAD ~= 'H21', 1001, 1011)
+      local nInd = EgtIf( EMT.HEAD ~= 'H21' and EMT.HEAD ~= 'H22', 1001, 1011)
       AddToolToCollisionObj( EMT.TOOL, EMT.HEAD, EMT.EXIT, nInd, true)
       AddToolHolderToCollisionObj( EMT.TOOL, EMT.HEAD, EMT.EXIT, nInd + 1)
       for i, Coll in ipairs( EMT.COLLOBJ or {}) do
@@ -449,65 +450,78 @@ end
 ---------------------------------------------------------------------
 function OnSimulToolDeselect( dPrevA)
    -- se prossimo utensile non cambia e non è sega a catena, esco
-   if ( EMT.NEXTTOOL == EMT.PREVTOOL_H1 or EMT.NEXTTOOL == EMT.PREVTOOL_H2) and EMT.NEXTHEAD ~= 'H13' then return end
+   if ( EMT.NEXTTOOL == EMT.PREVTOOL_H1 or EMT.NEXTTOOL == EMT.PREVTOOL_H2) and EMT.NEXTHEAD ~= 'H13' and EMT.NEXTHEAD ~= 'H22' then return end
    -- deposito utensile
    EgtOutText( 'Tool change in progress...')
    -- recupero il gruppo
    local nSetHead = GetHeadSet( EMT.NEXTHEAD)
    -- per testa gruppo 2 
    if nSetHead == 2 then
+      -- deposito lama su aggregato testa sotto
+      if EMT.PREVHEAD_H2 == 'H22' then
+         -- simulo movimento
+         local ParkC2 = EgtGetAxisHomePos( 'C2')
+         if dPrevA then
+            ParkC2 = GetSawCHomeFromVirtualAxis( dPrevA)
+         end
+         SimulMoveAxes( 'B2', ParkSawB2, MCH_SIM_STEP.RAPROT, 'C2', ParkC2, MCH_SIM_STEP.RAPROT)
+         SimulMoveAxis( 'X2', ParkSawX2, MCH_SIM_STEP.RAPID)
+      end
+      -- breve pausa
+      EgtPause( 100)
       -- visualizzo utensile su TcPos
       ShowToolInTcPos( EMT.PREVTCPOS_H2, true)
       -- nascondo l'utensile sulla testa
       EgtSetStatus( EgtGetHeadId( EMT.PREVHEAD_H2 or '') or GDB_ID.NULL, GDB_ST.OFF)
-      return
-   end
-   -- Testa gruppo 1...
-   -- deposito utensile fresa
-   if EMT.PREVHEAD_H1 == 'H11' or EMT.PREVHEAD_H1 == 'H14' then
-      -- simulo movimento
-      local nPrevTc = GetTcForTopHeadTool( EMT.PREVTCPOS_H1)
-      if EMT.PREVTTOTLEN_H1 < LongTool then
-         SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
-         local dPosX = EgtIf( nPrevTc ~= 2, ParkX1, ParkTc2X1)
-         SimulMoveAxis( 'X1', dPosX, MCH_SIM_STEP.RAPID)
-      else
-         if nPrevTc ~= 2 then
-            SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkLongTc1C1, MCH_SIM_STEP.RAPROT)
-            local dPosX = ParkX1
+   -- se testa gruppo 1
+   else
+      -- deposito utensile fresa
+      if EMT.PREVHEAD_H1 == 'H11' or EMT.PREVHEAD_H1 == 'H14' then
+         -- simulo movimento
+         local nPrevTc = GetTcForTopHeadTool( EMT.PREVTCPOS_H1)
+         if EMT.PREVTTOTLEN_H1 < LongTool then
+            SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
+            local dPosX = EgtIf( nPrevTc ~= 2, ParkX1, ParkTc2X1)
             SimulMoveAxis( 'X1', dPosX, MCH_SIM_STEP.RAPID)
          else
-            SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkLongTc2C1, MCH_SIM_STEP.RAPROT)
-            local dPosX = ParkTc2X1
-            SimulMoveAxis( 'X1', dPosX, MCH_SIM_STEP.RAPID)
+            if nPrevTc ~= 2 then
+               SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkLongTc1C1, MCH_SIM_STEP.RAPROT)
+               local dPosX = ParkX1
+               SimulMoveAxis( 'X1', dPosX, MCH_SIM_STEP.RAPID)
+            else
+               SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkLongTc2C1, MCH_SIM_STEP.RAPROT)
+               local dPosX = ParkTc2X1
+               SimulMoveAxis( 'X1', dPosX, MCH_SIM_STEP.RAPID)
+            end
          end
+      -- deposito utensile lama
+      elseif EMT.PREVHEAD_H1 == 'H12' then
+         -- simulo movimento
+         SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
+         SimulMoveAxis( 'X1', ParkX1, MCH_SIM_STEP.RAPID)
+      -- deposito utensile sega a catena
+      elseif EMT.PREVHEAD_H1 == 'H13' then
+         -- simulo movimento
+         local ParkC1 = EgtGetAxisHomePos( 'C1')
+         if dPrevA then
+            ParkC1 = GetChainSawCHomeFromVirtualAxis( dPrevA)
+         end
+         SimulMoveAxes( 'B1', ParkCSawB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
+         SimulMoveAxis( 'X1', ParkCSawX1, MCH_SIM_STEP.RAPID)
+      -- deposito utensile seconda lama
+      elseif EMT.PREVHEAD_H1 == 'H16' then
+         -- simulo movimento
+         SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
+         SimulMoveAxis( 'X1', ParkTc2X1, MCH_SIM_STEP.RAPID)
       end
-   -- deposito utensile lama
-   elseif EMT.PREVHEAD_H1 == 'H12' then
-      -- simulo movimento
-      SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
-      SimulMoveAxis( 'X1', ParkX1, MCH_SIM_STEP.RAPID)
-   -- deposito utensile sega a catena
-   elseif EMT.PREVHEAD_H1 == 'H13' then
-      -- simulo movimento
-      local ParkC1 = EgtGetAxisHomePos( 'C1')
-      if dPrevA then
-         ParkC1 = GetChainSawCHomeFromVirtualAxis( dPrevA)
-      end
-      SimulMoveAxes( 'B1', ParkCSawB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
-      SimulMoveAxis( 'X1', ParkCSawX1, MCH_SIM_STEP.RAPID)
-   -- deposito utensile seconda lama
-   elseif EMT.PREVHEAD_H1 == 'H16' then
-      -- simulo movimento
-      SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
-      SimulMoveAxis( 'X1', ParkTc2X1, MCH_SIM_STEP.RAPID)
+      -- breve pausa
+      EgtPause( 100)
+      -- visualizzo utensile su TcPos
+      ShowToolInTcPos( EMT.PREVTCPOS_H1, true)
+      -- nascondo l'utensile sulla testa
+      EgtSetMode( EgtGetHeadId( EMT.PREVHEAD_H1 or '') or GDB_ID.NULL, GDB_MD.HIDDEN)
    end
-   -- breve pausa
-   EgtPause( 100)
-   -- visualizzo utensile su TcPos
-   ShowToolInTcPos( EMT.PREVTCPOS_H1, true)
-   -- nascondo l'utensile sulla testa
-   EgtSetMode( EgtGetHeadId( EMT.PREVHEAD_H1 or '') or GDB_ID.NULL, GDB_MD.HIDDEN)
+   -- movimento per prendere nuovo utensile
    -- prendo utensile fresa
    if EMT.NEXTHEAD == 'H11' or EMT.NEXTHEAD == 'H14' then
       -- simulo movimento
@@ -524,13 +538,23 @@ function OnSimulToolDeselect( dPrevA)
    elseif EMT.NEXTHEAD == 'H13' then
       -- simulo movimento
       SimulMoveAxes( 'B1', ParkCSawB1, MCH_SIM_STEP.RAPROT, 'C1', EgtGetAxisHomePos( 'C1'), MCH_SIM_STEP.RAPROT)
-      SimulMoveAxis( 'X1', ParkCSawX1, MCH_SIM_STEP.RAPID)
+      SimulMoveAxes( 'X1', ParkCSawX1, MCH_SIM_STEP.RAPID, 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID)
    -- prendo utensile seconda lama
    elseif EMT.NEXTHEAD == 'H16' then
       -- simulo movimento
       SimulMoveAxes( 'B1', ParkB1, MCH_SIM_STEP.RAPROT, 'C1', ParkC1, MCH_SIM_STEP.RAPROT)
       SimulMoveAxis( 'X1', ParkTc2X1, MCH_SIM_STEP.RAPID)
-   end
+   -- prendo utensile su CU margherita testa sotto
+   elseif EMT.NEXTHEAD == 'H21' then
+      -- simulo movimento
+      SimulMoveAxes( 'B2', ParkB2, MCH_SIM_STEP.RAPROT, 'C2', ParkC2, MCH_SIM_STEP.RAPROT)
+      SimulMoveAxis( 'X2', ParkX2, MCH_SIM_STEP.RAPID)
+   -- prendo utensile seconda lama
+   elseif EMT.NEXTHEAD == 'H22' then
+      -- simulo movimento
+      SimulMoveAxes( 'B2', ParkSawB2, MCH_SIM_STEP.RAPROT, 'C2', EgtGetAxisHomePos( 'C2'), MCH_SIM_STEP.RAPROT)
+      SimulMoveAxis( 'X2', ParkSawX2, MCH_SIM_STEP.RAPID)
+      end
 end
 
 ---------------------------------------------------------------------
@@ -546,6 +570,18 @@ function OnSimulMachiningStart()
          OnSimulToolSelect( dPosA)
       end
    end
+   -- se lavorazione attuale e precedente con sega a catena con angolo A diverso, devo scaricare e ricaricare
+   if EMT.HEAD == 'H22' and EMT.HEAD == EMT.PREVHEAD_H2 then
+      local dPrevA = EgtGetAxisPos( 'A2')
+      local sVal = EgtGetMachiningParam( MCH_MP.BLOCKEDAXIS)
+      local dPosA = tonumber( sVal:sub( 4))
+      if abs( dPosA - dPrevA) > 1 then
+         ExecParkRoller( nil, nil, nil, nil, false, bAgg)
+         OnSimulToolDeselect( dPrevA)
+         EgtSetStatus( EgtGetHeadId( EMT.HEAD), GDB_ST.ON)
+         OnSimulToolSelect( dPosA)
+      end
+   end
    -- salvo dati utensile
    local nSetHead = GetHeadSet( EMT.HEAD)
    -- per gruppo testa 1
@@ -968,11 +1004,11 @@ function OnSimulCollision()
       if EMT.SIMCOBIND == 1001 then
          Class = 'T_'..EMT.HEAD
       elseif EMT.SIMCOBIND == 1011 then
-         Class = 'T_H21'
+         Class = 'T_'..EMT.HEAD
       elseif EMT.SIMCOBIND == 1002 then
          Class = 'TH_'..EMT.HEAD
       elseif EMT.SIMCOBIND == 1012 then
-         Class = 'TH_H21'
+         Class = 'TH_'..EMT.HEAD
       else
          Class = EMT.COLLOBJ[EMT.SIMCOBIND].Cl
       end
@@ -1195,9 +1231,9 @@ function ExecMoveZmax( bMchSplit)
          SimulMoveAxis( 'Z1', MaxZ1, MCH_SIM_STEP.RAPID)
       -- altrimenti sega a catena
       else
-         SimulMoveAxes( 'Z1', HomeZ, MCH_SIM_STEP.RAPID, 'B1', HomeB, MCH_SIM_STEP.COLLROT)
+         -- salzo in Z sicurezza raddrizzando la B
+         SimulMoveAxes( 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID, 'B1', HomeB, MCH_SIM_STEP.COLLROT)
          SimulMoveAxes( 'X1', HomeX, MCH_SIM_STEP.RAPID, 'C1', HomeC, MCH_SIM_STEP.COLLROT)
-         SimulMoveAxis( 'Z1', MaxZ1, MCH_SIM_STEP.RAPID)
       end
       -- se lavorazione in doppio
       if EMT.DOU_TYPE == 2 then
@@ -1457,7 +1493,7 @@ function VerifyY1Slide( sName1, dVal1, sName2, dVal2)
    if sName1 == 'T' and sName2 == 'Y1' and GetPY1Light() then
       local dY1DeltaP = EgtGetAxisPos( 'Y1') - EgtGetAxisPos( 'T')
       local dY1DeltaA = tonumber( dVal2) - tonumber( dVal1)
-      EgtOutLog( string.format( 'Y1DeltaP=%.3f YDeltaA=%.3f', dY1DeltaP, dY1DeltaA), 5)
+      EgtOutLog( string.format( 'Y1DeltaP=%.3f Y1DeltaA=%.3f', dY1DeltaP, dY1DeltaA), 5)
       if abs( dY1DeltaA - dY1DeltaP) > 0.5 then
          EMT.ERR = 2
          local sErr = 'Y1 slide : ' .. EmtLenToString( dY1DeltaP, 3) .. ' -> ' .. EmtLenToString( dY1DeltaA, 3)
@@ -1663,7 +1699,7 @@ function LoadFirstTool( nHSet, sTcPosDef)
             end
          else
             -- lama su aggregato da sotto
-            if sTcPos == 'T201' then
+            if TcAggreBladeUnder and sTcPos == 'T201' then
                sHead = 'H22'
             -- utensili standard da sotto
             else
@@ -2088,38 +2124,6 @@ function GetParkT()
    end
 end
 
----------------------------------------------------------------------
-function GetHeadSet( sHead)
-   if sHead == 'H11' or sHead == 'H12' or sHead == 'H13' or sHead == 'H14' or sHead == 'H16' then
-      return 1
-   elseif sHead == 'H21' or sHead == 'H22' then
-      return 2
-   else
-      return 0
-   end
-end
-
----------------------------------------------------------------------
-function GetHeadSetFromTcPos( sTcPos)
-   local TCPOS_1A = { 'T1', 'T3', 'T4', 'T5', 'T6', 'T7', 'T8', 'T9', 'T10', 'T11', 'T12', 'T13'}
-   local TCPOS_1B = { 'T101', 'T121', 'T111'}
-   local TCPOS_1C = { 'T21', 'T22', 'T23', 'T24', 'T25', 'T26', 'T27', 'T28', 'T29', 'T30'}
-   local TCPOS_2  = { 'T220', 'T221', 'T222', 'T223', 'T224', 'T225', 'T226', 'T227', 'T228', 'T229', 'T230'}
-   for _, sVal in ipairs( TCPOS_1A) do
-      if sVal == sTcPos then return 1, 1 end
-   end
-   for _, sVal in ipairs( TCPOS_1B) do
-      if sVal == sTcPos then return 1, 2 end
-   end
-   for _, sVal in ipairs( TCPOS_1C) do
-      if sVal == sTcPos then return 1, 3 end
-   end
-   for _, sVal in ipairs( TCPOS_2) do
-      if sVal == sTcPos then return 2, 1 end
-   end
-   return 0, 0
-end
-
 ---------------------------------------------------------------------
 function FindFirstToolOnHeadSet( nHSet)
    -- salvo stato iniziale
@@ -2223,7 +2227,7 @@ function GetNextSawingVirtualAxis( MchId)
       NextMchId = EgtGetNextActiveOperation( NextMchId)
    end
    -- verifico sia un taglio o fresatura con lama su aggregato da sotto
-   if EgtGetOperationType( NextMchId) ~= MCH_OY.MILLING and EgtGetOperationType( NextMchId) ~= MCH_OY.SAWING and EMT.HEAD ~= 'H22' then
+   if ( EgtGetOperationType( NextMchId) ~= MCH_OY.MILLING and EgtGetOperationType( NextMchId) ~= MCH_OY.SAWING) or EMT.HEAD ~= 'H22' then
       return nil
    end
    -- la imposto come lavorazione corrente

Essetre-PF1250.mlse

@@ -50,7 +50,7 @@ function OnSpecialGetMaxZ()
       if EMC.HEAD == 'H11' or EMC.HEAD == 'H14' or EMC.HEAD == 'H12' or EMC.HEAD == 'H16' then
          EMC.R1p = ParkC1
          EMC.R2p = ParkB1
-      elseif EMC.HEAD == 'H21' then
+      elseif EMC.HEAD == 'H21' or EMC.HEAD == 'H22' then
          EMC.R1p = ParkC2
          EMC.R2p = ParkB2
       end
@@ -130,11 +130,11 @@ function OnSpecialMoveZup()
    local dZmax = EgtGetAxisHomePos( EgtIf( nHeadSet ~= 2, 'Z1', 'Z2'))
 
 
-   -- se fresa su testa1 o su testa 2
-   if EMC.HEAD == 'H11' or EMC.HEAD == 'H14' or EMC.HEAD == 'H21' then
+   -- se fresa su testa1 o testa 2
+   if EMC.HEAD == 'H11' or EMC.HEAD == 'H14' or EMC.HEAD == 'H21' or EMC.HEAD == 'H22' then
       ;
-   -- se lama su testa1
-   elseif EMC.HEAD == 'H12' then
+   -- se lama
+   else
       -- riporto i valori tra -179 e + 180
       local dCheckAxR1 = EMC.R1
       if dCheckAxR1 < -180 then
@@ -142,39 +142,41 @@ function OnSpecialMoveZup()
       elseif dCheckAxR1 > 180 then
          dCheckAxR1 = dCheckAxR1 - 360
       end
-
-      -- se inclinata oltre 90 gradi e interferisce con la trave
-      if ( EMC.R2 > 87.9 and ( dCheckAxR1 < 15.0 or dCheckAxR1 > 180.0)) or ( EMC.R2 < -87.9 and ( dCheckAxR1 > -15.0 and dCheckAxR1 < 180.0)) then
-         local dZref = dZmax + min( 330 * vtT:getZ(), 0) + 260 * ( 1 - sqrt( 1- vtT:getZ() * vtT:getZ()))
-         -- se troppo in alto
-         if EMC.L3 > dZref + 1 then
-            ---- sistemo asse rotante
-            --EMC.R2 = EgtIf( ( EMC.R2 > 0), 90, -90)
-            ---- ricalcolo versore utensile
-            --EMC.TDIR = EgtGetCalcToolDirFromAngles( EMC.R1, EMC.R2)
-            ---- porto alla giusta quota
-            --EMC.L3 = dZmax
-            EMC.L3 = dZref
-            -- dichiaro modificato
-            EMC.MODIF = true
+      -- se lama su testa1
+      if EMC.HEAD == 'H12' then
+         -- se inclinata oltre 90 gradi e interferisce con la trave
+         if ( EMC.R2 > 87.9 and ( dCheckAxR1 < 15.0 or dCheckAxR1 > 180.0)) or ( EMC.R2 < -87.9 and ( dCheckAxR1 > -15.0 and dCheckAxR1 < 180.0)) then
+            local dZref = dZmax + min( 330 * vtT:getZ(), 0) + 260 * ( 1 - sqrt( 1- vtT:getZ() * vtT:getZ()))
+            -- se troppo in alto
+            if EMC.L3 > dZref + 1 then
+               ---- sistemo asse rotante
+               --EMC.R2 = EgtIf( ( EMC.R2 > 0), 90, -90)
+               ---- ricalcolo versore utensile
+               --EMC.TDIR = EgtGetCalcToolDirFromAngles( EMC.R1, EMC.R2)
+               ---- porto alla giusta quota
+               --EMC.L3 = dZmax
+               EMC.L3 = dZref
+               -- dichiaro modificato
+               EMC.MODIF = true
+            end
          end
-      end
-   -- se seconda lama su testa1
-   elseif EMC.HEAD == 'H16' then
-      -- se inclinata oltre 90 gradi e interferisce con la trave
-      if ( EMC.R2 > 87.9 and ( dCheckAxR1 < 15.0 or dCheckAxR1 > 180.0)) or ( EMC.R2 < -87.9 and ( dCheckAxR1 > -15.0 and dCheckAxR1< 180.0)) then
-         local dZref = dZmax + min( 330 * vtT:getZ(), 0) + 260 * ( 1 - sqrt( 1- vtT:getZ() * vtT:getZ()))
-         -- se troppo in alto
-         if EMC.L3 > dZref + 1 then
-            ---- sistemo asse rotante
-            --EMC.R2 = EgtIf( ( EMC.R2 > 0), 90, -90)
-            ---- ricalcolo versore utensile
-            --EMC.TDIR = EgtGetCalcToolDirFromAngles( EMC.R1, EMC.R2)
-            ---- porto alla giusta quota
-            --EMC.L3 = dZmax
-            EMC.L3 = dZref
-            -- dichiaro modificato
-            EMC.MODIF = true
+      -- se seconda lama su testa1
+      elseif EMC.HEAD == 'H16' then
+         -- se inclinata oltre 90 gradi e interferisce con la trave
+         if ( EMC.R2 > 87.9 and ( dCheckAxR1 < 15.0 or dCheckAxR1 > 180.0)) or ( EMC.R2 < -87.9 and ( dCheckAxR1 > -15.0 and dCheckAxR1< 180.0)) then
+            local dZref = dZmax + min( 330 * vtT:getZ(), 0) + 260 * ( 1 - sqrt( 1- vtT:getZ() * vtT:getZ()))
+            -- se troppo in alto
+            if EMC.L3 > dZref + 1 then
+               ---- sistemo asse rotante
+               --EMC.R2 = EgtIf( ( EMC.R2 > 0), 90, -90)
+               ---- ricalcolo versore utensile
+               --EMC.TDIR = EgtGetCalcToolDirFromAngles( EMC.R1, EMC.R2)
+               ---- porto alla giusta quota
+               --EMC.L3 = dZmax
+               EMC.L3 = dZref
+               -- dichiaro modificato
+               EMC.MODIF = true
+            end
          end
       end
    end
@@ -846,7 +848,7 @@ function SpecialCalcMachiningEncumbrance( nMchId, bPreCut)
    end
    -- Calcolo dell'ingombro della testa rispetto allo Zero Macchina (assi rotanti fissi, C=4, B=5, A=6)
    local b3Enc
-   if sHead ~= 'H21' then
+   if sHead ~= 'H21' and sHead ~= 'H22' then
       EgtSetAxisPos( 'C1', vAxMid[4])
       EgtSetAxisPos( 'B1', vAxMid[5])
       if sHead == 'H13' then
@@ -856,11 +858,14 @@ function SpecialCalcMachiningEncumbrance( nMchId, bPreCut)
    else
       EgtSetAxisPos( 'C2', vAxMid[4])
       EgtSetAxisPos( 'B2', vAxMid[5])
+      if sHead == 'H22' then
+         EgtSetAxisPos( 'A2', vAxMid[6])
+      end
       b3Enc = EgtGetBBoxGlob( EgtGetAxisId( 'C2'), GDB_BB.ONLY_VISIBLE)
    end
-   local dMinFrontEng = EgtIf( sHead ~= 'H21', MIN_ENG_RACK_V, EgtIf( vAxMax[3] < MIN_Z2_FOR_ENG_XZ2_V, MIN_ENG_V, MIN_ENG_XZ2_V))
+   local dMinFrontEng = EgtIf( sHead ~= 'H21' and sHead ~= 'H22', MIN_ENG_RACK_V, EgtIf( vAxMax[3] < MIN_Z2_FOR_ENG_XZ2_V, MIN_ENG_V, MIN_ENG_XZ2_V))
    local dRollFront = max( b3Enc:getMax():getX(), dMinFrontEng) + SIC_V
-   local dMinBackEng = EgtIf( sHead ~= 'H21', MIN_ENG_V, EgtIf( vAxMax[3] < MIN_Z2_FOR_ENG_XZ2_V, MIN_ENG_V, MIN_ENG_XZ2_V))
+   local dMinBackEng = EgtIf( sHead ~= 'H21' and sHead ~= 'H22', MIN_ENG_V, EgtIf( vAxMax[3] < MIN_Z2_FOR_ENG_XZ2_V, MIN_ENG_V, MIN_ENG_XZ2_V))
    local dRollBack = max( -b3Enc:getMin():getX(), dMinBackEng) + SIC_V
    EgtOutLog( '  RollFront = ' .. EgtNumToString( dRollFront, 1) .. ' RollBack = ' .. EgtNumToString( dRollBack, 1), 3)
    -- Calcolo della posizione della Punta Utensile rispetto allo Zero Macchina

Essetre-PF1250MAX.mlde

@@ -1,12 +1,15 @@
 -- Descrizione macchina Essetre-PF1250MAX by EgalWare s.r.l.   2023/12/07
 -- 2023/12/07 ver 2.5l1 Prima versione. Derivata da PF1250 ver 2.5l4
-
+-- 2023/12/15 ver 2.5l2 Corretti vari offset in simulazione
+-- 2023/12/18 ver 2.5l3 Ultimata gestione aggregato lama da sotto
+--                      Spostato alcune funzioni proprie del C.U. nel MLDE (per post-proc common)
+--                      Spostato magazzini sotto traversa ( di 200mm) come da modifica meccanica
 
 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.5l1'
+PP_VER = '2.5l3'
 MIN_MACH_VER = '2.5k1'
 
 EgtOutLog ( '** Essetre-PF1500rl '..PP_VER..' (MinMach '.. MIN_MACH_VER ..') **', 1)
@@ -62,7 +65,7 @@ SawC2Offs = 0
 SawB2Offs = 0
 MinX1 = 0
 MaxX1 = 3300
-MinZ1 = -1550
+MinZ1 = -1850
 MaxZ1 = -100
 MinC1 = -275
 MaxC1 = 275
@@ -88,7 +91,7 @@ MinZ1ToChangeH2 = -1400
 MinX2 = -2760
 MaxX2 = 0
 MinZ2 = 0
-MaxZ2 = 795
+MaxZ2 = 1450
 MinC2 = -275
 MaxC2 = 275
 MinB2 = -127
@@ -100,7 +103,7 @@ SafeX2 = -400
 ParkZ2 = 0
 ParkC2 = -90
 ParkB2 = -90
-ParkSawX2 = 1000
+ParkSawX2 = MinX2
 ParkSawZ2 = 0
 ParkSaw0Z2 = 0
 ParkSawC2 = -90
@@ -109,12 +112,12 @@ ParkSawB2 = 0
 MinDistToolX1X2 = 40
 TurnerOffs = 120.0
 AggLoad = 50
-DeltaTabY = 2750
+DeltaTabY = 2550
 DeltaTabZ = -1428 + MillOffs                   -- per TPA : -1128.0 + MillOffs    -- per NUM : -1258
 DeltaRulliTraveZ = -1203
 DimTabY = 1400
 DimTabX = 24000
-Delta2TabY = -985.9
+Delta2TabY = -1185.9
 Delta2TabZ = 393 - Mill2Offs                   -- per TPA : 378.0 - Mill2Offs      -- per NUM : 223
 Head2X = 0
 Head2Y = DeltaTabY - Delta2TabY
@@ -129,7 +132,7 @@ TcSpecialTools = true                            -- magarzzino per utensili spec
 TcAggreBladeUnder = true                         -- lama su aggregato per testa da sotto
 
 -- Aggiornamento con dati da TechnoEssetre7
-local sTs3Data = EgtGetStringFromIni( 'Beam', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-PF1250.data"
+local sTs3Data = EgtGetStringFromIni( 'Beam', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-PF1250MAX.data"
 local sDataBeam = EgtGetSourceDir().."\\Beam\\Ts3Data.lua"
 local sDataWall = EgtGetSourceDir().."\\Wall\\Ts3Data.lua"
 if EgtExistsFile( sTs3Data) then
@@ -452,20 +455,22 @@ EgtSetInfo( H21Id, 'ABOVE', '0')
 EgtSetInfo( H21Id, 'ZHOMEDOWN', '1')
 -- Lama
 if TcAggreBladeUnder then
-local H22Id = EmtHead {
-      Name = 'H22',
-      Parent = 'A2',
-      HSet = 'H21',
-      Type = MCH_HT.STD,
-      Pos = Point3d( SawUnderOffsX+Head2X, SawUnderOffsY+Head2Y, SawUnderOffsZ+Head2Z),
-      TDir = Vector3d( 0, sin( SawUnderB2Offs), -cos( SawUnderB2Offs)),
-      ADir = Y_AX(),
-      Rot1W = 0.5,
-      Rot2Stroke = { MinB2b, MaxB2b},
-      OthColl = {'B2/SOLID', 'C2/SOLID'},
-      Geo = 'H22_HEAD/GEO'}
-EgtSetInfo( H22Id, 'ZEXTRA', '160,60')
-EgtSetInfo( H22Id, 'ZMAXONROT', '1,190')
+   local H22Id = EmtHead {
+         Name = 'H22',
+         Parent = 'A2',
+         HSet = 'H21',
+         Type = MCH_HT.STD,
+         Pos = Point3d( SawUnderOffsX+Head2X, SawUnderOffsY+Head2Y, SawUnderOffsZ+Head2Z),
+         TDir = Vector3d( 0, sin( SawUnderB2Offs), -cos( SawUnderB2Offs)),
+         ADir = Y_AX(),
+         Rot1W = 0.5,
+         Rot2Stroke = { MinB2b, MaxB2b},
+         OthColl = {'B2/SOLID', 'C2/SOLID'},
+         Geo = 'H22_HEAD/GEO'}
+   EgtSetInfo( H21Id, 'ABOVE', '0')
+   EgtSetInfo( H21Id, 'ZHOMEDOWN', '1')
+   EgtSetInfo( H22Id, 'ZEXTRA', '160,60')
+   EgtSetInfo( H22Id, 'ZMAXONROT', '1,190')
 end
 --  *** Carrelli ***
 -- Morse
@@ -757,7 +762,7 @@ if Tc2Active then
          ADir = X_AX(),
          Geo = 'BASE/T30'}
 end
-local ptTc3 = Point3d( 480, 529, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTc3 = Point3d( 680, 529, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
 EmtTcPos {
       Name = 'T101',
       Parent = 'Base',
@@ -765,7 +770,7 @@ EmtTcPos {
       TDir = -X_AX(),
       ADir = Z_AX(),
       Geo = 'BASE/T101'}
-local ptTc4 = Point3d( 450, 909, -115 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTc4 = Point3d( 650, 909, -115 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
 EmtTcPos {
       Name = 'T121',
       Parent = 'Base',
@@ -773,7 +778,7 @@ EmtTcPos {
       TDir = Z_AX(),
       ADir = X_AX(),
       Geo = 'BASE/T121'}
-local ptTc5 = Point3d( 450, 1249, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTc5 = Point3d( 650, 1249, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
 EmtTcPos {
       Name = 'T111',
       Parent = 'Base',
@@ -881,7 +886,7 @@ EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC5') or GDB_ID.NULL, vtMovB, GDB_RT.G
 EgtMove( EgtGetFirstNameInGroup( BaseId, 'TCR') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( BaseId, 'TCS') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( X1Id, 'SOLID'), vtMovB, GDB_RT.GLOB)
-local vtMove = Vector3d( 0, ( DeltaTabY - 2750.0), ( DeltaTabZ + 1258.0))
+local vtMove = Vector3d( 0, ( DeltaTabY - 2550.0), ( DeltaTabZ + 1258.0))
 EgtMove( EgtGetFirstNameInGroup( BaseId, 'CONVOYER'), vtMove, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( Y1Id, 'SOLID'), vtMove, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( PY1Id, 'SOLID'), vtMove, GDB_RT.GLOB)
@@ -984,6 +989,42 @@ function GetTcForTopHeadTool( sTcPos)
    end
 end
 
+---------------------------------------------------------------------
+function GetHeadSet( sHead)
+   if sHead == 'H11' or sHead == 'H12' or sHead == 'H13' or sHead == 'H14' or sHead == 'H16' then
+      return 1
+   elseif sHead == 'H21' or sHead == 'H22' then
+      return 2
+   else
+      return 0
+   end
+end
+   
+---------------------------------------------------------------------
+function GetHeadSetFromTcPos( sTcPos)
+   local TCPOS_1A = { 'T1', 'T3', 'T4', 'T5', 'T6', 'T7', 'T8', 'T9', 'T10', 'T11', 'T12', 'T13'}               -- CU montante DX
+   local TCPOS_1B = { 'T101', 'T121', 'T111'}                                                                   -- CU sotto traversa
+   local TCPOS_1C = { 'T21', 'T22', 'T23', 'T24', 'T25', 'T26', 'T27', 'T28', 'T29', 'T30'}                     -- CU montante sinistro
+   local TCPOS_2A  = { 'T220', 'T221', 'T222', 'T223', 'T224', 'T225', 'T226', 'T227', 'T228', 'T229', 'T230'}  -- CU margherita testa 2
+   local TCPOS_2B  = { 'T201'}                                                                                  -- CU lama su aggregato testa 2
+   for _, sVal in ipairs( TCPOS_1A) do
+         if sVal == sTcPos then return 1, 1 end
+   end
+   for _, sVal in ipairs( TCPOS_1B) do
+         if sVal == sTcPos then return 1, 2 end
+   end
+   for _, sVal in ipairs( TCPOS_1C) do
+         if sVal == sTcPos then return 1, 3 end
+   end
+   for _, sVal in ipairs( TCPOS_2A) do
+         if sVal == sTcPos then return 2, 1 end
+   end
+   for _, sVal in ipairs( TCPOS_2B) do
+         if sVal == sTcPos then return 2, 2 end
+   end
+   return 0, 0
+end
+   
 ---------------------------------------------------------------------
 -- Funzione che riconosce testa per sega a catena
 function HeadIsChainSaw( sHead)

README.md

@@ -1,92 +0,0 @@
-# Essetre-PF1250MAX
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.steamware.net/egalware-machines/essetre/Essetre-PF1250MAX.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.steamware.net/egalware-machines/essetre/Essetre-PF1250MAX/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.