Nascosti solidi di collisione

- Aggiunta PP_NVER, versione in formato numerico.

.gitignore

@@ -15,4 +15,3 @@
 /Wall/PocketingData.lua
 /Wall/SawingData.lua
 /Wall/Ts3Data.lua
-.vscode/settings.json

.gitlab-ci.yml

@@ -2,19 +2,27 @@ variables:
  VERS_MAIN: '1.0'
  MACH_NAME: ''
  MACH_NAME_TEST: ''
+ MANUFACTURER: ''
  NEW_REL: ''
  NET_SHARE_X: '\\10.74.82.201\EgwTech'
  NET_SHARE_Z: '\\10.74.82.201\Artifacts'
  NET_SHARE_S: '\\10.74.82.201\Scambio'
  NET_SHARE_R: '\\10.74.82.201\EgwTech'
+ NET_SHARE_H: '\\10.74.82.252\team drives'
  NET_USERQ: 'steamw\egalware'
+ NET_USER_SERVICES: 'steamw\services'
  MACH_VERS: '0.0.0.0'
  TEMP_PATH: 'C:\MachinesDeploy'
- MACHINES_PATH_R: 'R:\EgtData\Machines'
- DEST_MACHINES_PATH_R: 'R:\EgtData\Machines\zTestYAML'
+ MACHINES_PATH_R: 'R:\EgtData\Machines_GIT'
+ DEST_MACHINES_PATH_H: 'H:'
  SRC_PATH: ''
  BASE_PATH: ''
  TEST_PATH: ''
+ URL_VERSIONS_LOG: "https://liman.egalware.com/ELM.API/api/release/save"
+ MACH_VERS_NUM: '0.0.0.0'
+ CRITICAL_STRING: "#critical#"
+ TOOLS_MACHINE_PATH: ""
+
 
 #Note compilazione LUA:
 # lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols
@@ -38,12 +46,29 @@ variables:
       echo "-----------------------"
       echo "   Copia macchina su R"
       echo "-----------------------"
-      ROBOCOPY /MIR "$env:SRC_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME\" /XD "bin"
-      ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /E /XD "bin"
-      ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST"
+      $customerPathR = $env:MACHINES_PATH_R + "\" + $env:MANUFACTURER
+      ROBOCOPY /MIR "$env:SRC_PATH" "$customerPathR\$env:MACH_NAME\" /XD "bin"
+      ROBOCOPY "$env:TEST_PATH" "$customerPathR\_TestMachines\$env:MACH_NAME_TEST\" /E /XD "bin"
+      ROBOCOPY /MIR "$env:BASE_PATH" "$customerPathR\_Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST"
       SLEEP 2
       net use R: /delete
 
+# helper copia script verso drive condiviso
+.ReplicaStor01: &ReplicaStor01
+   - |
+      net use H: /delete
+      SLEEP 2
+      net use H: $env:NET_SHARE_H /u:$env:NET_USER_SERVICES $SRVCS_PASSWD
+      echo "-----------------------"
+      echo "   Copia macchina su stor01"
+      echo "-----------------------"
+      SLEEP 2
+      $customerPathH = $env:DEST_MACHINES_PATH_H + "\" + $env:MANUFACTURER + "\test"
+      $destinationPath = "$customerPathH\$env:MACH_NAME" + "\"
+      ROBOCOPY "$env:BASE_PATH" "$destinationPath\" *.zip
+      SLEEP 2
+      net use H: /delete
+
 # helper copia script verso cartella di rete R:\ per develop
 .ReplicaR_DEV: &ReplicaR_DEV
    - |
@@ -53,7 +78,8 @@ variables:
       echo "-----------------------"
       echo "   Copia macchina su R - DEV"
       echo "-----------------------"
-      ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\_DEV\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST"
+      $customerPathR = $env:MACHINES_PATH_R + "\" + $env:MANUFACTURER
+      ROBOCOPY /MIR "$env:BASE_PATH" "$customerPathR\_Deploy\$env:MACH_NAME\_DEV\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST"
       SLEEP 2
       net use R: /delete
 
@@ -66,8 +92,15 @@ variables:
       echo "-----------------------"
       echo "   Recupero file non git da R e copia su macchina virtuale"
       echo "-----------------------"
-      ROBOCOPY "$env:LAST_MACHINE_PATH" "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
-      ROBOCOPY "$env:LAST_MACHINE_PATH" "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
+      # test se la cartella con gli utensili esiste per questa macchina
+      if (!(Test-Path -Path $env:TOOLS_MACHINE_PATH)) {
+      echo "-----------------------"
+      echo "CANNOT FIND TOOLS FOR THIS MACHINE!!"
+      echo "-----------------------"
+      Exit 1}
+      ROBOCOPY "$env:TOOLS_MACHINE_PATH" "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
+      ROBOCOPY "$env:TOOLS_MACHINE_PATH" "$env:TEST_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
+      ROBOCOPY "$env:TOOLS_MACHINE_PATH" "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
       SLEEP 2
       net use R: /delete
 
@@ -86,22 +119,25 @@ variables:
      echo "-----------------------"
      echo "   Compilazione file *.lua 32/64bit"
      echo "-----------------------"
-     $FileList = Get-ChildItem("Common_*")
+     $FileList = Get-ChildItem * -Include( "*.mlpe", "*.mlse")
      ForEach ($File in $FileList) {
        $FileName = Split-Path $File -leaf
        lua54 -o $env:SRC_PATH\bin\$env:MACH_NAME\$FileName -s $FileName
        echo "lua54 -o bin\$FileName -s $FileName"
      }
 
-# helper recupero nome macchina
+# helper recupero nome macchina e costruttore
 .machName-fix: &machName-fix
    - |
       echo "-----------------------"
-      echo "   Recupero nome macchina"
+      echo "   Recupero nome macchina e costruttore"
       echo "-----------------------"
       $fileName = dir *.mlde
       $env:MACH_NAME = $fileName.BaseName
       $env:MACH_NAME_TEST = $env:MACH_NAME + ".TEST"
+      $comp = $fileName.BaseName -split "-"
+      $env:MANUFACTURER = $comp[0]
+      Write-Output $env:MANUFACTURER 
 
 # helper calcolo versione
 .version-fix: &version-fix
@@ -109,12 +145,22 @@ variables:
       echo "-----------------------"
       echo "   Calcolo versione"
       echo "-----------------------"
+
+      # calcolo versione formato stringa
       $fPath = "$env:MACH_NAME.mlde";
-      $vLine = Select-String -path $fPath -Pattern 'PP_VER';
+      $vLine = Select-String -path $fPath -Pattern '^PP_VER';
       $comp = $vLine -split "=";
       $env:MACH_VERS = $comp[1].Replace("'","").Trim()
-      # display versione
-      Write-Output $env:MACH_VERS;
+      # display versione formato stringa
+      Write-Output $env:MACH_VERS
+
+      # calcolo versione formato numerico
+      $fPath = "$env:MACH_NAME.mlde";
+      $vLine = Select-String -path $fPath -Pattern '^PP_NVER';
+      $comp = $vLine -split "=";
+      $env:MACH_VERS_NUM = $comp[1].Replace("'","").Trim()
+      # display versione formato numerico
+      Write-Output $env:MACH_VERS_NUM
 
 # helper calcolo versione se develop
 .version-fix_DEV: &version-fix_DEV
@@ -126,7 +172,7 @@ variables:
       $commitAuthor = $commitAuthor[0].Trim()
       $env:MACH_VERS = $commitAuthor
       # display versione
-      Write-Output $env:MACH_VERS;
+      Write-Output $env:MACH_VERS
 
 # helper creazione folders 
 .folder-fix: &folder-fix
@@ -134,8 +180,8 @@ variables:
       echo "-----------------------"
       echo "   Creazione cartelle su macchina virtuale"
       echo "-----------------------"
-      $env:LAST_MACHINE_PATH = "$env:MACHINES_PATH_R\$env:MACH_NAME";
-      Write-Output  $env:LAST_MACHINE_PATH;
+      $env:TOOLS_MACHINE_PATH = "$env:MACHINES_PATH_R\$env:MANUFACTURER\_DefaultMachineSetup\$env:MACH_NAME"
+      Write-Output  $env:TOOLS_MACHINE_PATH
       $env:SRC_PATH = "$env:TEMP_PATH\$env:MACH_NAME\$env:MACH_VERS\$env:MACH_NAME";
       $env:BASE_PATH = "$env:TEMP_PATH\$env:MACH_NAME\$env:MACH_VERS";
       $env:TEST_PATH = "$env:TEMP_PATH\$env:MACH_NAME\$env:MACH_VERS\$env:MACH_NAME_TEST";
@@ -158,6 +204,39 @@ variables:
       7zip a -tzip $Target $Source  
       Write-Output "called ZIP $Source --> $Target"
 
+# helper invio notifica a log versioni online (LiMan)
+.SendToVersionsLog: &SendToVersionsLog
+   - |
+      echo "-----------------------"
+      echo "   Invio versione a log online"
+      echo "-----------------------"
+      $tags = ""
+      $date = ""
+      # se critico scrive tag
+      if ( $CI_COMMIT_MESSAGE | Select-String -Pattern $env:CRITICAL_STRING) {
+         $tags = "CRITICAL"
+         $date = (Get-Date).AddDays(1).toString("yyyy-MM-ddTHH:mm:ss.fffZ")
+      }
+      else
+      {
+         $date = (Get-Date).AddDays(3).toString("yyyy-MM-ddTHH:mm:ss.fffZ")
+      }
+      $body =
+      @{
+            codInst = "EgalWare"
+            codApp = $env:MACH_NAME
+            uplAppId = "UpdateManager"
+            masterKey = $LiMan_Key
+            tipo = "Machine"
+            versNum = $env:MACH_VERS_NUM
+            versText = $env:MACH_VERS
+            releaseDate = $date
+            relTags = $tags
+      }
+      $jsonBody = ConvertTo-Json -InputObject $body
+      echo $jsonBody
+      Invoke-WebRequest -Method Post -URI $env:URL_VERSIONS_LOG -ContentType "application/json" -Body $jsonBody -UseBasicParsing
+
 
 # helper esecuzione test 
 .RunTest: &RunTest
@@ -186,6 +265,8 @@ LuaCompile:build:
    - *LuaCompile
    - *ZipClean
    - *ReplicaR
+   - *ReplicaStor01
+   - *SendToVersionsLog
 
 LuaCompileDev:build:
  stage: build
@@ -233,4 +314,5 @@ LuaCompileDev:build:
 #  script:    
 #    - *LuaCompile
 #    - *ZipClean
-#    - *ReplicaR
+#    - *ReplicaR
+

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

@@ -397,6 +397,8 @@ function OnMachiningStart()
    EMT.MCHNAME = EgtGetOperationName( EMT.MCHID)
    EMT.MCHTYPE = EgtGetMachiningParam( MCH_MP.TYPE)
    EMT.MCHUSERNOTES = EgtGetMachiningParam( MCH_MP.USERNOTES)
+   EMT.MCHCUT = ( EMT.MCHUSERNOTES:find( 'Cut;', 1, true) ~= nil)
+
    -- se sega a catena, aggiusto subito angolo scelto per asse virtuale A
    if EMT.HEAD == 'H13' then
       -- valore dell'asse virtuale
@@ -533,7 +535,10 @@ function OnMachiningEnd()
    EMT.PREVTOOL = EMT.TOOL
    if EMT.DOU_TYPE and not EMT.ZMAX then EMT.DOU_TO_ZMAX = EMT.DOU_TYPE end
    EMT.DOU_TYPE = nil
-
+   -- se taglio finale, aggiorno lunghezza barra
+   if EMT.MCHCUT then
+      EMT.LB = EMT.LT + ( EMT.X_OFF or 0)
+   end
    -- salvo dati utensile
    local nSetHead = GetHeadSet( EMT.HEAD)
    -- per gruppo testa 1
@@ -830,9 +835,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 +844,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})
@@ -1299,6 +1305,14 @@ function OnRapid()
          EMT.R1p = nil
          EMT.R2p = nil
       else
+         -- se lavorazione in doppio controllo le corse
+         if EMT.DOU_TYPE == 2 then
+            local dZ2 = -Head2Z + MillOffs + Mill2Offs + EMT.L3
+            -- dato che la testa 2 è slave, bisogna controllare eventuale extra-corsa da post
+            if dZ2 > MaxZ2 then
+               EmtSetLastError( 1220, EMT.MCHNAME..'  ==>  Out of Stroke: Z2 : '.. EgtNumToString( dZ2-MaxZ2, 2))
+            end
+         end
          MyAdjustLinearAxes()
          EmtAdjustRotaryAxes()
       end
@@ -2523,7 +2537,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 +2549,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
@@ -2611,6 +2625,8 @@ function PreselectNextDiffHead( nMchId, sHead)
                   if sNextHead == 'H22' or EMT.PREVHEAD_H2 == 'H22' then return end
                   -- se la Z di lavoro è più bassa del cambio della minima Z
                   if EMT.MAXMIN[3] < MinZ1ToChangeH2 then
+                     -- se diametro utensile più del truciolatore standard grande, si rischia di collidere anche con il carro X testa sotto (quindi indipendentemente dalla Y della lavorazione)
+                     if EMT.TTOTDIAM > 201 then return end
                      -- verifico quota del TC
                      if BD.RIGHT_LOAD and EMT.MAXMAX[2] > ( DeltaTabY + MaxHoOpen + 200) then return end
                      if not BD.RIGHT_LOAD and EMT.MAXMAX[2] > ( DeltaTabY + 200) then return end

Common_PF1250.mlpe

@@ -121,6 +121,9 @@ function OnSimulStart()
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'COL2'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'CHSAW'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'CEIL'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'TC1'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'TC2'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'TCR'},
                      { Grp = 'Z2', Sub = 'COLLISION', Name = 'COL1'},
                      { Grp = 'Z2', Sub = 'COLLISION', Name = 'CHAIN'},
                      { Grp = 'Z2', Sub = 'COLLISION', Name = 'COL2'},
@@ -1624,7 +1627,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 +1657,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,18 @@
 -- 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
+-- 2024/09/10 ver 2.6i2 Allineamento con common ver. 2.6i1
+-- 2024/09/18 ver 2.6i3 Modificato YAML per comunicazione versioni a LiMan. Aggiunta PP_NVER, versione in formato numerico. 
+-- 2024/09/10 ver 2.6j1 Allineamento con common ver. 2.6j1
 
 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6h1'
+PP_VER = '2.6j1'
+PP_NVER = '2.6.10.1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-PF1250MAX'
 

UpdateLog.txt

@@ -1,5 +1,17 @@
            ==== Common_PF1250 Update Log ====
 
+Versione 2.6j1 (01/10/2024)
+- (GEN) Migliorato calcolo chiusura paratia rulli con aggiornamento lunghezza della barra in caso di ultimo taglio e grezzo residuo in coda. Ticket#2017
+- (NGE-SIM) Aggiunta gestione solidi collisione per TC verticali e TC rotante sotto
+- (GEN) Per lavorazione in doppio: messaggio bloccante in caso di extra-corsa durante un movimento standard su piano generico della lavorazione.
+
+Versione 2.6i1 (10/09/2024)
+- (GEN) Se diametro utensile più del truciolatore standard grande, non si preseleziona. Ticket#2028
+
+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.6j1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }