Prima versione funzionante Motori 23 KW

- 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_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
@@ -1300,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

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'},

Essetre-PF1250MAX.mlde

@@ -63,12 +63,15 @@
 -- 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.6i2'
+PP_VER = '2.6j1'
+PP_NVER = '2.6.10.1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-PF1250MAX'
 
@@ -208,11 +211,12 @@ MaxForzaPinze = 1000                             -- [Kgf]
 Tc2Active = true                                 -- magazzino prima sega a catena
 SecondSaw = true                                 -- seconda lama su aggregato su TC3 presente
 SecondChain = true                               -- magazzino seconda sega a catena
-TcSpecialTools = true                            -- magarzzino per utensili speciali. In genere truciolatore
+TcSpecialTools = true                            -- magazzino per utensili speciali. In genere truciolatore
 TcAggreBladeUnder = true                         -- lama su aggregato per testa da sotto
 EmitAccClamps = true
 WriteAllCoordsOnFirstM101 = true
 ForceToCloseRollersGate = false
+Motors23KW = true
 
 -- Aggiornamento con dati da TechnoEssetre7
 local sTs3Data = EgtGetStringFromIni( 'Beam', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-PF1250MAX.data"
@@ -296,6 +300,7 @@ if EgtExistsFile( sDataBeam) then
          if Machine.Offsets.MAXPRESS then MaxForzaPinze = Machine.Offsets.MAXPRESS end
          if Machine.Offsets.CHIUDI_PINZE_2_3_SCAMBIO then ForceToCloseRollersGate = Machine.Offsets.CHIUDI_PINZE_2_3_SCAMBIO == 1 end
          if Machine.Offsets.WOOD_DENSITY then WoodDensity = Machine.Offsets.WOOD_DENSITY end
+         if Machine.Offsets.MOTORS23KW then Motors23KW = Machine.Offsets.MOTORS23KW end
 
          -- aggiustamenti
          MinY1 = MinV1 + MinDeltaYV
@@ -315,6 +320,7 @@ if EgtExistsFile( sDataBeam) then
    end
 end
 SecondSaw = ( SecondSaw and Tc2Active)
+local vtOffset23KW = Vector3d( 0, 0, EgtIf( Motors23KW, 37, 0))
 
 EmtGeneral {
       File='Essetre-PF1250.nge',
@@ -350,7 +356,7 @@ local X1Id = EmtAxis {
       Geo = 'X1_AXIS/GEO',
       Aux = {'X1_AXIS/SOLID', 'X1_AXIS/COLLISION'}}
 --  *** Testa 1 ***
-EmtAxis {
+local Z1Id = EmtAxis {
       Name = 'Z1',
       Parent = 'X1',
       Token = 'Z',
@@ -370,8 +376,8 @@ EmtAxis {
       Pos = Point3d(0.0,0.0,503.0),
       Stroke = {MinC1, MaxC1},
       Home = ParkC1,
-      Geo = 'C1_AXIS/GEO',
-      Aux = {'C1_AXIS/SOLID', 'C1_AXIS/COLLISION'}}
+      Geo = EgtIf( Motors23KW, 'C1_AXIS_23KW/GEO', 'C1_AXIS/GEO'),
+      Aux = {EgtIf( Motors23KW, 'C1_AXIS_23KW/SOLID', 'C1_AXIS/SOLID'), EgtIf( Motors23KW, 'C1_AXIS_23KW/COLLISION', 'C1_AXIS/COLLISION')}}
 EmtAxis {
       Name = 'B1',
       Parent = 'C1',
@@ -381,8 +387,8 @@ EmtAxis {
       Pos = Point3d(-108.4,0.0,MillOffs),
       Stroke = {MinB1, MaxB1},
       Home = ParkB1,
-      Geo = 'B1_AXIS/GEO',
-      Aux = {'B1_AXIS/SOLID', 'B1_AXIS/COLLISION'}}
+      Geo = EgtIf( Motors23KW, 'B1_AXIS_23KW/GEO', 'B1_AXIS/GEO'),
+      Aux = {EgtIf( Motors23KW, 'B1_AXIS_23KW/SOLID', 'B1_AXIS/SOLID'), EgtIf( Motors23KW, 'B1_AXIS_23KW/COLLISION', 'B1_AXIS/COLLISION')}}
 -- Frese
 local H11Id = EmtHead {
       Name = 'H11',
@@ -489,8 +495,8 @@ local C2Id = EmtAxis {
       Pos = Point3d( Head2X, Head2Y, Head2Z-485),
       Stroke = {MinC2, MaxC2},
       Home = ParkC2,
-      Geo = 'C2_AXIS/GEO',
-      Aux = {'C2_AXIS/SOLID', 'C2_AXIS/COLLISION'}}
+      Geo = EgtIf( Motors23KW, 'C2_AXIS_23KW/GEO', 'C2_AXIS/GEO'),
+      Aux = {EgtIf( Motors23KW, 'C2_AXIS_23KW/SOLID', 'C2_AXIS/SOLID'), EgtIf( Motors23KW, 'C2_AXIS_23KW/COLLISION', 'C2_AXIS/COLLISION')}}
 local B2Id = EmtAxis {
       Name = 'B2',
       Parent = 'C2',
@@ -500,8 +506,8 @@ local B2Id = EmtAxis {
       Pos = Point3d( Head2X, Head2Y, Head2Z-Mill2Offs),
       Stroke = {MinB2, MaxB2},
       Home = ParkB2,
-      Geo = 'B2_AXIS/GEO',
-      Aux = {'B2_AXIS/SOLID', 'B2_AXIS/COLLISION'}}
+      Geo = EgtIf( Motors23KW, 'B2_AXIS_23KW/GEO', 'B2_AXIS/GEO'),
+      Aux = {EgtIf( Motors23KW, 'B2_AXIS_23KW/SOLID', 'B2_AXIS/SOLID'), EgtIf( Motors23KW, 'B2_AXIS_23KW/COLLISION', 'B2_AXIS/COLLISION')}}
 EmtAxis {
       Name = 'A2',
       Parent = 'B2',
@@ -514,11 +520,11 @@ EmtAxis {
       Geo = 'A2_AXIS/GEO'}
       
 local vtMoveZ2 = Vector3d( 0, 0, Head2Z + 1781.0)
-EgtMove( EgtGetFirstNameInGroup( Z2Id, 'SOLID'), vtMoveZ2, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( Z2Id, 'COLLISION'), vtMoveZ2, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( Z2Id, 'SOLID'), vtMoveZ2 - vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( Z2Id, 'COLLISION'), vtMoveZ2 - vtOffset23KW, GDB_RT.GLOB)
 local vtMoveX2 = Vector3d( 0, Head2Y - 3735.9, Head2Z + 1781.0)
-EgtMove( EgtGetFirstNameInGroup( X2Id, 'SOLID'), vtMoveX2, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( X2Id, 'COLLISION'), vtMoveX2, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( X2Id, 'SOLID'), vtMoveX2 - vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( X2Id, 'COLLISION'), vtMoveX2 - vtOffset23KW, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( C2Id, 'SOLID'), vtMoveX2, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( C2Id, 'COLLISION'), vtMoveX2, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( B2Id, 'SOLID'), vtMoveX2, GDB_RT.GLOB)
@@ -676,7 +682,7 @@ EmtTable {
       Geo = 'TABLE/GEO',
       Aux = 'TABLE/SOLID'}
 -- *** ToolChanger ***
-local ptTc1 = Point3d( 150, -151, -221 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTc1 = Point3d( 150, -151, -221 + ( DeltaTabZ - DeltaRulliTraveZ + 55)) + vtOffset23KW
 local vtDt1 = Vector3d( 0, 0, - 102.5)
 EmtTcPos {
       Name = 'T1',
@@ -771,7 +777,7 @@ EmtTcPos {
       Geo = 'BASE/T13'}
                   
 if Tc2Active then
-   local ptTc2 = Point3d( 150, 3917, -221 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+   local ptTc2 = Point3d( 150, 3917, -221 + ( DeltaTabZ - DeltaRulliTraveZ + 55)) + vtOffset23KW
    local vtDt2 = Vector3d( 0, 0, - 102.5)
    EmtTcPos {
          Name = 'T21',
@@ -844,7 +850,7 @@ if Tc2Active then
          ADir = X_AX(),
          Geo = 'BASE/T30'}
 end
-local ptTc3 = Point3d( 600, 529, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTc3 = Point3d( 600, 529, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55)) + vtOffset23KW
 EmtTcPos {
       Name = 'T101',
       Parent = 'Base',
@@ -852,7 +858,7 @@ EmtTcPos {
       TDir = -X_AX(),
       ADir = Z_AX(),
       Geo = 'BASE/T101'}
-local ptTc4 = Point3d( 750, 909, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTc4 = Point3d( 750, 909, -200.8 + ( DeltaTabZ - DeltaRulliTraveZ + 55)) + vtOffset23KW
 EmtTcPos {
       Name = 'T111',
       Parent = 'Base',
@@ -860,7 +866,7 @@ EmtTcPos {
       TDir = -X_AX(),
       ADir = Z_AX(),
       Geo = 'BASE/T111'}
-local ptTc5 = Point3d( 750, 1309, -115 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTc5 = Point3d( 750, 1309, -115 + ( DeltaTabZ - DeltaRulliTraveZ + 55)) + vtOffset23KW
 EmtTcPos {
       Name = 'T121',
       Parent = 'Base',
@@ -868,7 +874,7 @@ EmtTcPos {
       TDir = Z_AX(),
       ADir = X_AX(),
       Geo = 'BASE/T121'}
-local ptTcS = Point3d( -1, -22.3, -1723 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTcS = Point3d( -1, -22.3, -1723 + ( DeltaTabZ - DeltaRulliTraveZ + 55)) + vtOffset23KW
 EmtTcPos {
    Name = 'T201',
    Parent = 'Base',
@@ -876,7 +882,7 @@ EmtTcPos {
    TDir = -Z_AX(),
    ADir = Y_AX(),
    Geo = 'BASE/T201'}
-local ptTcR = Point3d( -0.5, 4115, -1871.15 + ( DeltaTabZ - DeltaRulliTraveZ + 55))
+local ptTcR = Point3d( -0.5, 4115, -1871.15 + ( DeltaTabZ - DeltaRulliTraveZ + 55)) + vtOffset23KW
 EmtTcPos {
       Name = 'T220',
       Parent = 'Base',
@@ -957,18 +963,20 @@ EmtTcPos {
 
 -- Aggiusto posizioni geometriche
 local vtMovB = Vector3d( 0, 0, ( DeltaTabZ - DeltaRulliTraveZ + 55))
-EgtMove( EgtGetFirstNameInGroup( BaseId, 'SOLID'), vtMovB, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( BaseId, 'COLLISION'), vtMovB, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( BaseId, 'SIGN') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC1') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC2') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC3') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB)
-if TcSpecialTools then EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC4') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB) end
-if SecondChain then EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC5') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB) end
-EgtMove( EgtGetFirstNameInGroup( BaseId, 'TCR') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB)
-if TcSpecialTools then EgtMove( EgtGetFirstNameInGroup( BaseId, 'TCS') or GDB_ID.NULL, vtMovB, GDB_RT.GLOB) end
-EgtMove( EgtGetFirstNameInGroup( X1Id, 'SOLID'), vtMovB, GDB_RT.GLOB)
-EgtMove( EgtGetFirstNameInGroup( X1Id, 'COLLISION'), vtMovB, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( BaseId, 'SOLID'), vtMovB + vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( BaseId, 'COLLISION'), vtMovB + vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( BaseId, 'SIGN') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC1') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC2') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC3') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB)
+if TcSpecialTools then EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC4') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB) end
+if SecondChain then EgtMove( EgtGetFirstNameInGroup( BaseId, 'TC5') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB) end
+EgtMove( EgtGetFirstNameInGroup( BaseId, 'TCR') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB)
+if TcSpecialTools then EgtMove( EgtGetFirstNameInGroup( BaseId, 'TCS') or GDB_ID.NULL, vtMovB + vtOffset23KW, GDB_RT.GLOB) end
+EgtMove( EgtGetFirstNameInGroup( X1Id, 'SOLID'), vtMovB + vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( X1Id, 'COLLISION'), vtMovB + vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( Z1Id, 'SOLID'), vtOffset23KW, GDB_RT.GLOB)
+EgtMove( EgtGetFirstNameInGroup( Z1Id, 'COLLISION'), vtOffset23KW, GDB_RT.GLOB)
 local vtMove = Vector3d( 0, ( DeltaTabY - 2550.0), ( DeltaTabZ + 1258.0))
 EgtMove( EgtGetFirstNameInGroup( BaseId, 'CONVOYER'..sGeomConvoyer), vtMove, GDB_RT.GLOB)
 EgtMove( EgtGetFirstNameInGroup( Y1Id, 'SOLID'), vtMove, GDB_RT.GLOB)

UpdateLog.txt

@@ -1,5 +1,10 @@
            ==== 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
 

Version.lua

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