In preselezione testa attende che sia terminato il movimento

- 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
 
@@ -84,27 +117,27 @@ 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"
      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"
      }
-     echo "-----------------------"
-     echo "   FINE Compilazione"
-     echo "-----------------------"
 
-# 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
@@ -112,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
@@ -129,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
@@ -137,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";
@@ -161,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
@@ -189,6 +265,8 @@ LuaCompile:build:
    - *LuaCompile
    - *ZipClean
    - *ReplicaR
+   - *ReplicaStor01
+   - *SendToVersionsLog
 
 LuaCompileDev:build:
  stage: build
@@ -236,4 +314,5 @@ LuaCompileDev:build:
 #  script:    
 #    - *LuaCompile
 #    - *ZipClean
-#    - *ReplicaR
+#    - *ReplicaR
+

Common_ONE-PF.NUM.mlpe

@@ -424,6 +424,7 @@ function OnMachiningStart()
    EMT.MCHUSERNOTES = EgtGetMachiningParam( MCH_MP.USERNOTES)
    EMT.MCHSPLIT = ( EMT.MCHUSERNOTES:find( 'Split;', 1, true) ~= nil)
    EMT.MCHPRECUT = ( EMT.MCHUSERNOTES:find( 'Precut;', 1, true) ~= nil)
+   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' or EMT.HEAD == 'H15' then
@@ -602,6 +603,10 @@ function OnMachiningEnd()
    EMT.PREVTOOL = EMT.TOOL
    EMT.PREVHEAD = EMT.HEAD
    EMT.PREVTCPOS = EMT.TCPOS
+   -- se taglio finale, aggiorno lunghezza barra
+   if EMT.MCHCUT then
+      EMT.LB = EMT.LT + ( EMT.X_OFF or 0)
+   end
    -- salvo anche utlimo utensile su testa
    local nHSet = GetHeadSet( EMT.HEAD)
    if nHSet == 1 then
@@ -855,7 +860,7 @@ function OnRapid()
                local bMoveZbeforeX = false
                local dZref = EMT.L3
                -- se carico destro e ho due teste, altrimenti in caso abbia una testa , tipo ONE, il controlo è invertito
-               if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+               if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                   dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                end
                -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -870,7 +875,7 @@ function OnRapid()
                elseif not bMoveZbeforeX then
                   EmitMoveDataHead( 1, { X=dXref, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed})
                else
-                  EmitMoveDataHead( 1, { X=-ParkX1, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed})
+                  EmitMoveDataHead( 1, { X=-LimX1PlRotSaw, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed})
                end
    
                -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
@@ -942,7 +947,7 @@ function OnRapid()
                   local bMoveZbeforeX = false
 
                   local dZref = EMT.L3
-                  if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 > 91) then
+                  if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 > 91) then
                      dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                   end
                   -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -952,7 +957,7 @@ function OnRapid()
                   if not bMoveZbeforeX then
                      EmitMoveDataHead( 1, { X=EMT.L2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed})
                   else
-                     EmitMoveDataHead( 1, { X=-ParkX2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed})
+                     EmitMoveDataHead( 1, { X=-LimX1RotSawTC2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed})
                   end
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
                   if EMT.HEAD == 'H12' and abs( PrevR1 - EMT.R1) > 1 and ( abs( HomeC1 - EMT.R1) > 30.1 or abs( HomeB1 - EMT.R2) > 30.1) then
@@ -1020,7 +1025,7 @@ function OnRapid()
                   if not bMoveZbeforeX then
                      EmitMoveDataHead( 2, { X=EMT.L2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed})
                   else
-                     EmitMoveDataHead( 2, { X=-ParkX2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed})
+                     EmitMoveDataHead( 2, { X=-LimX2RotSaw, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed})
                   end
 
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
@@ -1141,10 +1146,12 @@ function OnRapid()
                   local HomeX1 = EgtGetAxisHomePos( 'X1')
                   EmitMoveDataHead( 1, { X=-HomeX1, Z=MaxZ1, B=ParkB1, C=ParkC1})
                   EmitMoveStartHead( 1, 'EA1')
+                  EmitMoveWaitHead( 1)
                else
                   local HomeX2 = EgtGetAxisHomePos( 'X2')
                   EmitMoveDataHead( 2, { X=-HomeX2, Z=MaxZ2, B=ParkB2, C=ParkC2})
                   EmitMoveStartHead( 2, 'EA1')
+                  EmitMoveWaitHead( 2)
                end
             else
                if not HeadIsChainSaw( EMT.PREVHEAD) then
@@ -1152,18 +1159,22 @@ function OnRapid()
                      local HomeX1 = EgtGetAxisHomePos( 'X1')
                      EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
                      EmitMoveStartHead( 1, 'EA1')
+                     EmitMoveWaitHead( 1)
                   else
                      local HomeX2 = EgtGetAxisHomePos( 'X2')
                      EmitMoveDataHead( 2, { X=-EMT.PREVHOMEX_H2, Z=MaxZ2, B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
                      EmitMoveStartHead( 2, 'EA1')
+                     EmitMoveWaitHead( 2)
                   end
                else
                   if GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC1' or GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC2' then
                      EmitMoveDataHead( 1, { X=-ParkCSawX1S, Z=MaxZ1, B=HomeR2, C=HomeR1, TPos='50'})
                      EmitMoveStartHead( 1, 'EA1')
+                     EmitMoveWaitHead( 1)
                   else
                      EmitMoveDataHead( 2, { X=-ParkCSawX2S, Z=MaxZ2, B=HomeR2, C=HomeR1, TPos='50'})
                      EmitMoveStartHead( 2, 'EA1')
+                     EmitMoveWaitHead( 2)
                   end
                end
             end
@@ -1214,14 +1225,14 @@ function OnRapid()
             if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                -- se fresa o lama
                if not HeadIsChainSaw( EMT.HEAD) then
-                  local CurrX1 = EMT.L1pp or ( -LimX1RotSaw)
+                  local CurrX1 = EMT.L1pp or ( -LimX1PlRotSaw)
                   local CurrZ1 = EMT.L3pp or MyMaxZ1
                   local CurrB1 = PrevR2
                   local CurrC1 = PrevR1
 
                   local bMoveZbeforeX = false
                   local dZref = EMT.L3
-                  if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+                  if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                      dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                   end
                   -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -1304,14 +1315,14 @@ function OnRapid()
                if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                   -- se fresa o lama
                   if not HeadIsChainSaw( EMT.HEAD) then
-                     local CurrX1 = EMT.L1pp or ( -LimX1RotSaw)
+                     local CurrX1 = EMT.L1pp or ( -LimX1PlRotSaw)
                      local CurrZ1 = EMT.L3pp or MyMaxZ1
                      local CurrB1 = PrevR2
                      local CurrC1 = PrevR1
 
                      local bMoveZbeforeX = false
                      local dZref = EMT.L3
-                     if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+                     if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                         dZref = min( dSafeZ1 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ1)
                      end
                      -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -1368,14 +1379,14 @@ function OnRapid()
                if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                   -- se fresa o lama
                   if not HeadIsChainSaw( EMT.HEAD) then
-                     local CurrX2 = EMT.L1pp or ( -LimX1RotSaw)
+                     local CurrX2 = EMT.L1pp or ( -LimX2RotSaw)
                      local CurrZ2 = EMT.L3pp or MyMaxZ2
                      local CurrB2 = PrevR2
                      local CurrC2 = PrevR1
 
                      local bMoveZbeforeX = false
                      local dZref = EMT.L3
-                     if EMT.HEAD == 'H22' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, EMT.L2 < -LimX1RotSaw, EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+                     if EMT.HEAD == 'H22' and ( EgtIf( BD.RIGHT_LOAD, EMT.L2 > -LimX2RotSaw, EMT.L2 < -LimX2RotSaw) or EMT.R2 < -91) then
                         dZref = min( dSafeZ2 + GetZExtra( EMT.HEAD, EMT.R2) - 100, MyMaxZ2)
                      end
                      -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -2691,7 +2702,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             -- 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 EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, -EMT.L2o < -LimX1RotSaw, -EMT.L2o > -LimX1RotSaw) then
+               if EgtIf( BD.RIGHT_LOAD, -EMT.L2o < -LimX1RotSaw, -EMT.L2o > -LimX1RotSaw) then
                   dZref = dZref - EgtIf( not Mortiser, 100, 370)
                end
                dZref = min( dZref, dMaxZ1)
@@ -2954,7 +2965,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 +2976,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 +3038,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)
@@ -3231,12 +3242,12 @@ end
 function EmitBeamHeadData( BhData)
    if not BhData.Pz5 then
    local sOut = 'G152'
-   if BhData.T then sOut = sOut .. ' Y' .. EmtLenToString( BhData.T, 3) end
-   if BhData.Y1 then sOut = sOut .. ' EY' .. EmtLenToString( BhData.Y1, 3) end
-   if BhData.Y2 then sOut = sOut .. ' EV' .. EmtLenToString( BhData.Y2, 3) end
-   if BhData.V1 then sOut = sOut .. ' B' .. EmtLenToString( BhData.V1, 3) end
-   if BhData.V2 then sOut = sOut .. ' C' .. EmtLenToString( BhData.V2, 3) end
-         if BhData.W then sOut = sOut .. ' EW' .. EmtLenToString( BhData.W, 3) end
+      if BhData.T then sOut = sOut .. ' Y' .. EmtLenToString( BhData.T, 3) end
+      if BhData.Y1 then sOut = sOut .. ' EY' .. EmtLenToString( BhData.Y1, 3) end
+      if BhData.Y2 then sOut = sOut .. ' EV' .. EmtLenToString( BhData.Y2, 3) end
+      if BhData.V1 then sOut = sOut .. ' B' .. EmtLenToString( BhData.V1, 3) end
+      if BhData.V2 then sOut = sOut .. ' C' .. EmtLenToString( BhData.V2, 3) end
+      if BhData.W then sOut = sOut .. ' EW' .. EmtLenToString( BhData.W, 3) end
       if BhData.ViseY1 then sOut = sOut .. ' EA' .. EgtNumToString( BhData.ViseY1, 0) end
       if BhData.ViseY2 then sOut = sOut .. ' EB' .. EgtNumToString( BhData.ViseY2, 0) end
       if BhData.SetHead then sOut = sOut .. ' EC' .. EgtNumToString( BhData.SetHead, 0) end

Common_ONE-PF.mlpe

@@ -119,6 +119,8 @@ function OnSimulStart()
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'TRAV'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'COL1'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'COL2'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'TC1'},
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'TC2'},
                      { Grp = 'Base', Sub = 'BELT', Name = 'COLLISION'}}
    -- gruppo CHSAW si attiva solo se progress, one con BIT mortiser o PF
    if Progress or Mortiser or EgtGetHeadId( 'H21') then
@@ -132,6 +134,10 @@ function OnSimulStart()
    if Progress and EgtGetHeadId( 'H21') then
       table.insert( McdData, { Grp = 'Base', Sub = 'COLLISION', Name = 'SAW1'})
    end
+   -- se non è Progress ed è una ONE, aggiungo collisioni magazzino speciale
+   if not Progress and not EgtGetHeadId( 'H21') then
+      table.insert( McdData, { Grp = 'Base', Sub = 'COLLISION', Name = 'MTC'})
+   end
 
    if Clamp5 then
       table.insert( McdData, { Grp = 'W', Sub = 'COLLISION', Name = 'STM1'})
@@ -988,7 +994,7 @@ function OnSimulMoveStart()
                local bMoveZbeforeX = false
                
                local dZref = EMT.L3
-               if EMT.HEAD == 'H12' and ( EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, -EMT.L2 < -LimX1RotSaw, -EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
+               if EMT.HEAD == 'H12' and ( EgtIf( BD.RIGHT_LOAD, -EMT.L2 < -LimX1RotSaw, -EMT.L2 > -LimX1RotSaw) or EMT.R2 < -91) then
                   dZref = Z1Home + GetZExtra( EMT.HEAD, EMT.R2) - 100
                end
                -- se la quota di lavoro è più in alta della posizione a ZHOME della testa, prima si va alla Z di lavoro e poi si approccia il pezzo
@@ -1003,7 +1009,7 @@ function OnSimulMoveStart()
                elseif not bMoveZbeforeX then
                   SimulMoveAxis( 'X1', dXref, MCH_SIM_STEP.RAPID)
                else
-                  SimulMoveAxis( 'X1', LimX1RotSaw, MCH_SIM_STEP.RAPID)
+                  SimulMoveAxis( 'X1', LimX1PlRotSaw, MCH_SIM_STEP.RAPID)
                end
 
                -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
@@ -1069,6 +1075,8 @@ function OnSimulMoveStart()
                   end
                   if not bMoveZbeforeX then
                      SimulMoveAxis( 'X1', EMT.L2, MCH_SIM_STEP.RAPID)
+                  else
+                     SimulMoveAxis( 'X1', LimX1RotSawTC2, MCH_SIM_STEP.RAPID)
                   end
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 400")
                   if EMT.HEAD == 'H12' and abs( C1Pos - EMT.R1) > 1 and ( abs( C1Home - EMT.R1) > 30.1 or abs(B1Home - EMT.R2) > 30.1) then
@@ -1138,6 +1146,8 @@ function OnSimulMoveStart()
                   end
                   if not bMoveZbeforeX then
                      SimulMoveAxis( 'X2', EMT.L2, MCH_SIM_STEP.RAPID)
+                  else
+                     SimulMoveAxis( 'X2', LimX2RotSaw, MCH_SIM_STEP.RAPID)
                   end
                   -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379")
                   if EMT.HEAD == 'H22' and abs( C2Pos - EMT.R1) > 1 and ( abs( C2Home - EMT.R1) > 30.1 or abs(B2Home - EMT.R2) > 30.1) then
@@ -1585,7 +1595,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
          if not HeadIsChainSaw( EMT.HEAD) then
             if abs( HomeC - CurrC) > 0.1 or abs( HomeB - CurrB) > 0.1 then
                local dZref = HomeZ + GetZExtra( EMT.HEAD, CurrB)
-               if EgtIf( not EgtGetHeadId( 'H21') or  BD.RIGHT_LOAD, -CurrX < -LimX1RotSaw, -CurrX > -LimX1RotSaw) then
+               if EgtIf( BD.RIGHT_LOAD, -CurrX < -LimX1RotSaw, -CurrX > -LimX1RotSaw) then
                   dZref = dZref - EgtIf( not Mortiser, 100, 370)
                end
                SimulMoveAxes( 'Z1', EgtIf( dZref > CurrZ, dZref, CurrZ), MCH_SIM_STEP.RAPID, 'B1', EgtClamp( CurrB, -90, 90), MCH_SIM_STEP.COLLROT)
@@ -1853,7 +1863,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 +1893,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-ONE.mlde

@@ -66,12 +66,18 @@
 --                      Aggiunta file note tool e machining
 -- 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
+-- 2024/09/13 ver 2.6i2 Allineamento con common ver. 2.6i2
+--                      Inseriti in NGE solidi collisione TC, Aggiunta avriabile LimX1RotSawTC2
+-- 2024/09/18 ver 2.6i3 Modificato YAML per comunicazione versioni a LiMan. Aggiunta PP_NVER, versione in formato numerico.
+-- 2024/09/27 ver 2.6i4 Quota parcheggio ParkFrnX1 portato a 300mm
 
 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6h2'
+PP_VER = '2.6i4_DEV'
+PP_NVER = '2.6.9.4'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-ONE'
 
@@ -144,14 +150,15 @@ MaxB1 = 127
 MinB1b = -119
 MaxB1b = 119
 ParkX1 = MaxX1
-ParkFrnX1 = 200
+ParkFrnX1 = 300
 ParkZ1 = -535
 ParkC1 = 90
 ParkFrnC1 = -90
 ParkB1 = 90
 ParkFrnB1 = -90
-LimX1RotSaw = 2900
+LimX1RotSaw = 800
 LimX1PlRotSaw = 1970
+LimX1RotSawTC2 = 800
 SafeCSaw0X1 = 1350
 ParkCSawX1 = 1350
 ParkCSawX1S = MinX1

UpdateLog.txt

@@ -1,5 +1,14 @@
            ==== Common_ONE-PF Update Log ====
 
+Versione 2.6i2 (13/09/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-MLDE-GEN-SIM) Aggiunto solidi collisione TC.  Corretto movimento a Y di sicurezza con lama. Ticket#2042
+- (NGE-SIM) Aggiunta collisione magazzino motosega ONE
+
+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.6i2',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }