- Modificato YAML per comunicazione versioni a LiMan.

- Aggiunta PP_NVER, versione macchina in formato numerico.

.gitlab-ci.yml

@@ -1,16 +1,27 @@
 variables:
  VERS_MAIN: '1.0'
  MACH_NAME: ''
+ MACH_NAME_TEST: ''
  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'
- DEPLOY_PATH: 'C:\MachinesDeploy'
+ TEMP_PATH: 'C:\MachinesDeploy'
+ MACHINES_PATH_R: 'R:\EgtData\Machines'
+ DEST_MACHINES_PATH_R: 'R:\EgtData\Machines\zTestYAML'
+ DEST_MACHINES_PATH_H: 'H:\Beam & Wall - Essetre\test'
  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#"
+
 
 #Note compilazione LUA:
 # lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols
@@ -21,62 +32,154 @@ variables:
       net use S: /delete
       SLEEP 2
       net use S: $env:NET_SHARE_S /u:$env:NET_USERQ $SDRIVE_PASSWD
-      ROBOCOPY /MIR $env:BASE_PATH S:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\ /XD "bin"
+      ROBOCOPY /MIR $env:BASE_PATH S:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\ /XD "bin" /XD "$env:MACH_NAME_TEST"
       SLEEP 2
       net use S: /delete
 
-# helper copia script verso cartella di rete R:\ delle cartelle bin
+# helper copia script verso cartella di rete R:\
 .ReplicaR: &ReplicaR
    - |
       net use R: /delete
       SLEEP 2
-      net use R: $env:NET_SHARE_S /u:$env:NET_USERQ $SDRIVE_PASSWD
-      ROBOCOPY /MIR $env:BASE_PATH R:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\
+      net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
+      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"
+      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
+      $destinationPath = "$env:DEST_MACHINES_PATH_H\$env:MACH_NAME" + "\"
+      echo $destinationPath
+      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
+   - |
+      net use R: /delete
+      SLEEP 2
+      net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
+      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"
+      SLEEP 2
+      net use R: /delete
+
+#helper copia sorgenti da R a percorso temporaneo
+.CreateBaseFolder: &CreateBaseFolder
+   - |   
+      net use R: /delete
+      SLEEP 2
+      net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
+      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"
       SLEEP 2
       net use R: /delete
 
 # helper compilazione LUA a 32 e 64 bit
 .LuaCompile: &LuaCompile
   - |
-    Set-Alias lua54  C:\Tools\Lua32\luac54
-    echo "Copia file preliminare"
-    ROBOCOPY . "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt"
-    ROBOCOPY . "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
-    echo "Compilazione file *.lua 32/64bit"
-    $FileList = Get-ChildItem("Common-*")
-    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"
-    }
+     Set-Alias lua54  C:\Tools\Lua32\luac54
+     echo "-----------------------"
+     echo "   Copia file su macchina virtuale"
+     echo "-----------------------"
+     ROBOCOPY . "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
+     ROBOCOPY . "$env:TEST_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
+     Rename-Item -Path "$env:TEST_PATH\$env:MACH_NAME.mlde" -NewName "$env:MACH_NAME_TEST.mlde"
+     Rename-Item -Path "$env:TEST_PATH\$env:MACH_NAME.ini" -NewName "$env:MACH_NAME_TEST.ini"
+     ROBOCOPY . "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
+     echo "-----------------------"
+     echo "   Compilazione file *.lua 32/64bit"
+     echo "-----------------------"
+     $FileList = Get-ChildItem("Common_*")
+     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
 .machName-fix: &machName-fix
    - |
+      echo "-----------------------"
+      echo "   Recupero nome macchina"
+      echo "-----------------------"
       $fileName = dir *.mlde
       $env:MACH_NAME = $fileName.BaseName
+      $env:MACH_NAME_TEST = $env:MACH_NAME + ".TEST"
 
 # helper calcolo versione
 .version-fix: &version-fix
    - |
+      echo "-----------------------"
+      echo "   Calcolo versione"
+      echo "-----------------------"
+
+      # calcolo versione formato stringa
       $fPath = "$env:MACH_NAME.mlde";
       $vLine = Select-String -path $fPath -Pattern 'PP_VER';
       $comp = $vLine -split "=";
       $env:MACH_VERS = $comp[1].Replace("'","").Trim()
+      # 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
+   - |
+      echo "-----------------------"
+      echo "   Calcolo versione - DEV"
+      echo "-----------------------"
+      $commitAuthor = $CI_COMMIT_AUTHOR -split " "
+      $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
    - |
-      $env:SRC_PATH = "$env:DEPLOY_PATH\$env:MACH_NAME\$env:MACH_VERS\$env:MACH_NAME";
-      $env:BASE_PATH = "$env:DEPLOY_PATH\$env:MACH_NAME\$env:MACH_VERS";
+      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: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";
       Write-Output  $env:BASE_PATH;     
       if (Test-Path $env:BASE_PATH) { Remove-Item -Path "$env:BASE_PATH\*" -R -Force };
+      Write-Output  $env:TEST_PATH;
 
 # helper compressione e pulizia folders 
 .ZipClean: &ZipClean
    - |
+      "  Compressione file su macchina virtuale"
       $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe";
       if (-not (Test-Path -Path $7zipPath -PathType Leaf)) {
           throw "7 zip file '$7zipPath' not found"
@@ -88,6 +191,33 @@ 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 = ""
+      # se critico scrive tag
+      if ( $CI_COMMIT_MESSAGE | Select-String -Pattern $env:CRITICAL_STRING) {
+      $tags = "CRITICAL"
+      }
+      $body =
+      @{
+            codInst = "EgalWare"
+            codApp = $env:MACH_NAME
+            uplAppId = "UpdateManager"
+            masterKey = $LiMan_Key
+            tipo = "Machine"
+            versNum = $env:MACH_VERS_NUM
+            versText = $env:MACH_VERS
+            releaseDate = (Get-Date).toString("yyyy-MM-ddTHH:mm:ss.fffZ")
+            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
@@ -105,17 +235,35 @@ LuaCompile:build:
  only:
    - main
    - master
-   - develop
  tags:
    - win
  before_script:
    - *machName-fix
    - *version-fix
    - *folder-fix
- script:    
+ script:
+   - *CreateBaseFolder    
    - *LuaCompile
    - *ZipClean
-   - *ReplicaS
+   - *ReplicaR
+   - *ReplicaStor01
+   - *SendToVersionsLog
+
+LuaCompileDev:build:
+ stage: build
+ only:
+   - develop
+ tags:
+   - win
+ before_script:
+   - *machName-fix
+   - *version-fix_DEV
+   - *folder-fix
+ script:
+   - *CreateBaseFolder    
+   - *LuaCompile
+   - *ZipClean
+   - *ReplicaR_DEV
 
 # LuaCompile:test:
 #  stage: test
@@ -147,4 +295,5 @@ LuaCompile:build:
 #  script:    
 #    - *LuaCompile
 #    - *ZipClean
-#    - *ReplicaR
+#    - *ReplicaR
+

Beam/BeamData.lua

@@ -68,7 +68,10 @@ local BeamData = {
    MAX_LEN_BH_FROM_BOTTOM = 195,            -- massima lunghezza lavorabile da un lato di block haus da sotto
    MAX_DIST_BH_FROM_BOTTOM = 395,           -- massima distanza tra naso mandrino e sopra della trave senza collisione
    BH_MACHINE = false,                      -- flag che indica la tipologia di macchina configurata BlockHaus
-   ANG_TRASM = false                        -- presenza rinvio angolare per lavorazioni da sotto
+   ANG_TRASM = false,                       -- presenza rinvio angolare per lavorazioni da sotto
+   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
 }
 
 -- Aggiornamento con dati da TechnoEssetre7
@@ -93,6 +96,9 @@ if EgtExistsFile( sData) then
         BeamData.DIM_STRIP_SMALL = Machine.Offsets.DIM_STRIP_SMALL or BeamData.DIM_STRIP_SMALL
         BeamData.DIM_TO_CENTER_STRIP = Machine.Offsets.DIM_TO_CENTER_STRIP or BeamData.DIM_TO_CENTER_STRIP
         BeamData.MAXDIAM_POCK_CORNER = Machine.Offsets.MAXDIAM_POCK_CORNER or BeamData.MAXDIAM_POCK_CORNER
+        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
       end
       if Machine.Trave then
          BeamData.MIN_WIDTH = Machine.Trave.XMIN or BeamData.MIN_WIDTH
@@ -117,6 +123,15 @@ if EgtExistsFile( sData) then
       end
    end
 end
+---------------------------------------------------------------------
+local function GetMaxLenRidgeLapFromBottom( dHRaw)
+   if dHRaw < BeamData.MIN_DIM_HBEAM then
+      return BeamData.MAX_LEN_RIDGELAP_FROM_BOTTOM + 0.01
+   else
+      return BeamData.MAX_LEN_RIDGELAP_FROM_BOTTOM_HBEAM + 0.01
+   end
+end
+BeamData.GetMaxLenRidgeLapFromBottom = GetMaxLenRidgeLapFromBottom
 
 ---------------------------------------------------------------------
 local function GetBlockedAxis( sHead, nToolType, sBlockedAxis)
@@ -147,14 +162,50 @@ end
 BeamData.GetBlockedAxis = GetBlockedAxis
 
 ---------------------------------------------------------------------
-local function GetMaxLenRidgeLapFromBottom( dHRaw)
-   if dHRaw < BeamData.MIN_DIM_HBEAM then
-      return BeamData.MAX_LEN_RIDGELAP_FROM_BOTTOM + 0.01
+local function GetChainSawInitAngs( vtN, vtO)
+   if vtN:getY() > 0 and vtO:getX() > 0 then
+      return 'C=0'
    else
-      return BeamData.MAX_LEN_RIDGELAP_FROM_BOTTOM_HBEAM + 0.01
+      return ''
    end
 end
-BeamData.GetMaxLenRidgeLapFromBottom = GetMaxLenRidgeLapFromBottom
+BeamData.GetChainSawInitAngs = GetChainSawInitAngs
+
+---------------------------------------------------------------------
+local function GetSetupInfo( sHead)
+   local SetupInfo = {}
+
+   -- dati comuni
+   SetupInfo.bIsCSymmetric = false
+   SetupInfo.dCAxisEncumbrance = 180
+   SetupInfo.bToolOnAggregate = false
+
+   -- testa 5 assi da sopra
+   if sHead == 'H1' then
+      SetupInfo.bIsTopHead = true
+      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
+      SetupInfo.dMaxNegativeAngle = sin( -45)
+   -- lama su testa 5 assi da sopra
+   elseif sHead == 'H2' then
+      SetupInfo.bIsTopHead = true
+      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
+      SetupInfo.dMaxNegativeAngle = sin( -45)
+   -- motosega
+   elseif sHead == 'H3' then
+      SetupInfo.bIsTopHead = true
+      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
+      SetupInfo.dMaxNegativeAngle = 0
+   -- rinvio angolare 90° (considerato come fosse una testa da sotto)
+   elseif sHead == 'H5' then
+      SetupInfo.bToolOnAggregate = true
+      SetupInfo.bIsBottomHead = true
+      SetupInfo.bIsTopHead = not SetupInfo.bIsBottomHead
+      SetupInfo.dMaxPositiveAngle = 0
+   end
+
+   return SetupInfo
+end
+BeamData.GetSetupInfo = GetSetupInfo
 
 ---------------------------------------------------------------------
 return BeamData

Beam/MachData.ini

@@ -35,6 +35,7 @@ Name=Offsets
 30=l,OFFSETZ_RINV_1,347,OFFSETZ_RINV_1
 31=l,OFFSETX_RINV_2,150,OFFSETX_RINV_2
 32=l,OFFSETZ_RINV_2,347,OFFSETZ_RINV_2
+33=l,MIN_JOIN_SS,100,MIN_JOIN_SS
 
 [2]
 Name=Trave

Beam/MachiningTypes.ini

@@ -8,6 +8,7 @@
 3=Pocket
 4=Pocket_AT
 5=AngleDrill
+6=Predrill
 
 [Milling]
 1=Prof

Beam/NestingData.ini

@@ -0,0 +1,3 @@
+[BEAM]
+StartOffset=10
+Offset=5.4

Common_FAST.NUM.mlpe

@@ -182,7 +182,7 @@ function OnDispositionEnd()
       -- calcolo dati pinze
       local MinAccPinze = 0.3
       local MaxAccPinze = 4
-      local KgMtCubo= 550           -- densità legno in Kg / metro cubo
+      local KgMtCubo= WoodDensity or 550           -- densità legno in Kg / metro cubo
       local Massa = ( HTrave * STrave * LBarra * KgMtCubo ) / 1000000000
       local FMaxPinze = EMT.FMAXPINZE
       local ForzaAtrito = 700 / 2   -- Serve per regolare P32 (700 valore reale pistone)
@@ -627,7 +627,7 @@ function OnRapid()
       local MyZHome = EgtGetAxisHomePos( 'Z')
       local bZmax = ( #EMT.AUXSTR > 0  or  EMT.TOOL ~= EMT.PREVTOOL  or  EMT.L3 > -1)
       -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti
-      if EMT.PREVHEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.PREVHEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. 
                                        ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES
@@ -649,7 +649,7 @@ function OnRapid()
       local sES = ' ES'..EgtNumToString( EMT.S, 0)
 
       -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
-      if EMT.HEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.HEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sEEPreMove = ' EE' .. EgtIf( bZmax, '3', '4')
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        EmtGetAxis( 'R2') .. EmtGetAxis( 'R1') .. sEE .. sEL .. sER .. sET .. sES
@@ -930,8 +930,12 @@ function OnArc()
    local sFeed = EmtGetFeed()
    -- tipo arco
    local sArc = 'G' .. EgtNumToString(EMT.MOVE,0)
-   -- emetto arco
-   EmtOutput( sArc..sAxes..sRad..sFeed)
+   -- se arco molto grande, approssimo con una retta
+   if EMT.RR > 99999 then
+      EmtOutput( "G1"..sAxes..sFeed)
+   else
+      EmtOutput( sArc..sAxes..sRad..sFeed)
+   end
 
    -- aggiorno valori come precedenti
    EmtUpdatePrev()

Common_FAST.NUM_PLUS.mlpe

@@ -668,7 +668,7 @@ function OnRapid()
       local MyZHome = EgtGetAxisHomePos( 'Z')
       local bZmax = ( #EMT.AUXSTR > 0  or  EMT.TOOL ~= EMT.PREVTOOL  or  EMT.L3 > -1)
       -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti
-      if EMT.PREVHEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.PREVHEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        ' B' .. EmtLenToString( EMT.R2pp, 3) .. ' C' .. EmtLenToString( EMT.R1pp, 3) .. 
                                        ' EE' .. EgtIf( bZmax, '3', '4') .. EMT.PREVsEL .. EMT.PREVsER .. EMT.PREVsET .. EMT.PREVsES
@@ -713,7 +713,7 @@ function OnRapid()
       local sES = ' ES'..EgtNumToString( EMT.S, 0)
 
       -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
-      if EMT.HEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.HEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sEEPreMove = ' EE' .. EgtIf( bZmax, '3', '4')
          local sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
                                        EmtGetAxis( 'R2') .. EmtGetAxis( 'R1') .. sEE .. sEL .. sER .. sET .. sES
@@ -843,7 +843,7 @@ function OnRapid()
          sOut = 'G112 EA'..sA..' EB'..sB..EmtGetAxis('L1')..' EY'..sY..' EV'..sV..' EF'..GetFmaxClamp()
          EmtOutput( sOut)
          -- se taglio di coda senza residuo da scaricare, emetto M175 per accelerare il carico della barra successiva
-         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') then
+         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') and ( IsEndPhase( EMT.PHASE+1) or IsEnd2Phase( EMT.PHASE+1)) then
             EmtOutput( '(M175)')
          end
          if not bHeadFirst then
@@ -1009,8 +1009,12 @@ function OnArc()
    local sFeed = EmtGetFeed()
    -- tipo arco
    local sArc = 'G' .. EgtNumToString(EMT.MOVE,0)
-   -- emetto arco
-   EmtOutput( sArc..sAxes..sRad..sFeed)
+   -- se arco molto grande, approssimo con una retta
+   if EMT.RR > 99999 then
+      EmtOutput( "G1"..sAxes..sFeed)
+   else
+      EmtOutput( sArc..sAxes..sRad..sFeed)
+   end
 
    -- aggiorno valori come precedenti
    EmtUpdatePrev()
@@ -1020,7 +1024,7 @@ end
 function CalcDinamicaPinze( dH, dS, dL)
    local MinTempoAcc = 0.3                         -- [s]
    local MaxTempoAcc = 4.0                         -- [s]
-   local KgMtCubo= 550                             -- densità legno [Kg / metro cubo]
+   local KgMtCubo= WoodDensity or 550              -- densità legno [Kg / metro cubo]
    local Massa = ( dH * dS * dL * KgMtCubo ) / 1e9 -- massa [Kg]
    local FMaxPinze = EMT.FMAXPINZE                 -- Feed massima pinze [mm/min]
    local ForzaAttrito = 350 * 9.8 * 0.2            -- Forza chiusura pinze [Kgf] * g * Coeff_Attrito -> [N]

Common_FAST.TPA.mlpe

@@ -647,7 +647,7 @@ function OnRapid()
       local MyZHome = EgtGetAxisHomePos( 'Z')
       local bZmax = ( #EMT.AUXSTR > 0  or  EMT.TOOL ~= EMT.PREVTOOL  or EMT.L3 > -1)
       -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti
-      if EMT.PREVHEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.PREVHEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, 3) .. ' P3=' .. EmtLenToString( MyZHome, 3) ..
                                  ' P4=' .. EgtNumToString( EMT.R2pp, 3) .. ' P5=' .. EgtNumToString( EMT.R1pp, 3) .. 
                                  ' P6=' .. EgtNumToString( EMT.PREVTCPOS, 3) .. ' P7=' .. EgtNumToString( EMT.PREVS, 0) ..
@@ -663,7 +663,7 @@ function OnRapid()
       end
 
       -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
-      if EMT.HEAD == 'H3' and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
+      if ( EMT.HEAD == 'H3' or EMT.TTOTLEN > 200) and EMT.ST > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, 3) .. ' P3=' .. EmtLenToString( MyZHome, 3) ..
                                  ' P4=' .. EgtNumToString( EMT.R2, 3) .. ' P5=' .. EgtNumToString( EMT.R1, 3) .. 
                                  ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
@@ -774,7 +774,7 @@ function OnRapid()
             sB = '2'
          end
          -- se taglio di coda senza residuo da scaricare, emetto M175 per accelerare il carico della barra successiva
-         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') then
+         if EMT.MCHUSERNOTES and EMT.MCHUSERNOTES:find( 'Cut') and ( IsEndPhase( EMT.PHASE+1) or IsEnd2Phase( EMT.PHASE+1)) then
             EmtOutput( 'M175')
          end
          if bHeadFirst then
@@ -985,7 +985,7 @@ end
 function CalcDinamicaPinze( dH, dS, dL)
    local MinTempoAcc = 0.3                         -- [s]
    local MaxTempoAcc = 4.0                         -- [s]
-   local KgMtCubo= 550                             -- densità legno [Kg / metro cubo]
+   local KgMtCubo= WoodDensity or 550              -- densità legno [Kg / metro cubo]
    local Massa = ( dH * dS * dL * KgMtCubo ) / 1e9 -- massa [Kg]
    local FMaxPinze = EMT.FMAXPINZE                 -- Feed massima pinze [mm/min]
    local ForzaAttrito = 350 * 9.8 * 0.2            -- Forza chiusura pinze [Kgf] * g * Coeff_Attrito -> [N]

Common_FAST.mlpe

@@ -15,11 +15,11 @@ BIG_TOOL_DIAM = 300
 ---------------------------------------------------------------------
 local sBaseDir = EgtGetCurrMachineDir()
 if NumericalControl == 'NUM' then
-   dofile( sBaseDir .. '\\Common-FAST.NUM.mlpe')
+   dofile( sBaseDir .. '\\Common_FAST.NUM.mlpe')
 elseif NumericalControl == 'TPA' then
-   dofile( sBaseDir .. '\\Common-FAST.TPA.mlpe')
+   dofile( sBaseDir .. '\\Common_FAST.TPA.mlpe')
 elseif NumericalControl == 'NUM_PLUS' then
-   dofile( sBaseDir .. '\\Common-FAST.NUM_PLUS.mlpe')
+   dofile( sBaseDir .. '\\Common_FAST.NUM_PLUS.mlpe')
 else
    EmtSetLastError( 1201, 'Numerical Control error : unkwnown type')
 end
@@ -130,7 +130,7 @@ function OnSimulStart()
       local nId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( nGrpId or GDB_ID.NULL, McdData[i].Sub) or GDB_ID.NULL, McdData[i].Name)
       if nId then
          table.insert( EMT.MCODET, nId)
-         EgtOutLog( 'Element ' .. McdData[i].Grp .. '/' .. McdData[i].Sub .. '/' .. McdData[i].Name .. ' is ok', 4)
+         EgtOutLog( 'Element ' .. McdData[i].Grp .. '/' .. McdData[i].Sub .. '/' .. McdData[i].Name .. ' (' .. tostring( nId) .. ') is ok', 4)
       else
          nMcdNullCnt = nMcdNullCnt + 1
          EgtOutLog( 'Element ' .. McdData[i].Grp .. '/' .. McdData[i].Sub .. '/' .. McdData[i].Name .. ' is null', 4)
@@ -752,7 +752,7 @@ function OnSimulMoveStart()
       -- con pezzi alti aggiorno gli assi rotanti prima di muovermi sopra il pezzo
       if not EMT.LOAD and EMT.MOVE == 0 and EMT.HB > BeamHeightForFixRot and EMT.FLAG2 == 1 then
          -- se motosega mi muovo a X di sicurezza per ruotare
-         if EMT.HEAD == 'H3'then
+         if EMT.HEAD == 'H3' or EMT.TOTLEN > 200 then
             SimulMoveAxes( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID, 'C', EMT.R1, MCH_SIM_STEP.COLLROT, 'B', EMT.R2, MCH_SIM_STEP.COLLROT)
          end
       end
@@ -1524,6 +1524,12 @@ function IsStartOrRestPhase( nPhase)
    return ( sVal == 'START' or sVal == 'REST')
 end
 
+---------------------------------------------------------------------
+function IsEndPhase( nPhase)
+   local sVal = GetPhaseType( nPhase)
+   return ( sVal == 'END')
+end
+
 ---------------------------------------------------------------------
 function IsMidPhase( nPhase)
    local sVal = GetPhaseType( nPhase)

Common_FAST.mlse

@@ -32,11 +32,11 @@ local DELTA_TOL_FIXED = 50
 local DeltaTol = DELTA_TOL_S
 local DELTA_SIC = 1
 local AGG_LOAD = 50
-local MIN_JOIN_VV = 75
-local MIN_JOIN_SS = 100
-local MIN_JOIN_LS = 290
-local MIN_JOIN_SL = 100
-local MIN_JOIN_LL = 400
+local MIN_JOIN_VV = EgtClamp( MinJoinVV or 75, 60, 150)
+local MIN_JOIN_SS = EgtClamp( MinJoinSS or 100, 80, 200)
+local MIN_JOIN_LS = EgtClamp( MinJoinLS or 290, 250, 400)
+local MIN_JOIN_SL = EgtClamp( MinJoinSL or 100, 80, 200)
+local MIN_JOIN_LL = EgtClamp( MinJoinLL or 400, 300, 600)
 local MinJoin = MIN_JOIN_SS
 local MinOther = abs( MinY) + abs( MaxV) + MinJoin
 
@@ -445,6 +445,7 @@ function OnPostApplyMachining()
          EMC.YDELTA = nil
          EMC.VDELTA = nil
          EMC.HCING_IGNORE = true
+         EMC.CNT = 1
       elseif IsStartOrRestPhase( EMC.PHASE) then
          -- carico le posizioni
          local dPosT = EgtGetInfo( nPrevOpeId, 'TPOS', 'd')
@@ -461,6 +462,7 @@ function OnPostApplyMachining()
             EMC.VDELTA = nil
          end
          EMC.HCING_IGNORE = true
+         EMC.CNT = nil
       else
          -- aggiornamento posizioni (da lavorazione precedente a disposizione)
          local nPrev2OpeId = EgtGetPrevActiveOperation( nPrevOpeId)
@@ -478,8 +480,8 @@ function OnPostApplyMachining()
          if #vAxes > 0 then EMC.TPOS = vAxes[1] end
          EMC.YDELTA = EgtGetInfo( nLastPathId, 'YDELTA', 'd')
          EMC.VDELTA = EgtGetInfo( nLastPathId, 'VDELTA', 'd')
+         EMC.CNT = nil
       end
-      EMC.CNT = nil
    -- altrimenti precedente operazione è lavorazione
    else
       -- aggiornamento posizioni
@@ -906,7 +908,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
       elseif abs( vtTool:getZ()) < 0.93 then
          if vtTool:getX() > 0 and abs( vtTool:getY()) < 0.2 and ptMax:getZ() > EMC.ZMIN + BD.VICE_MINH then
             dHeadBack = 180
-         elseif vtTool:getX() > -0.05 then
+         elseif vtTool:getX() > -0.06 then
             dHeadBack = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())
          elseif vtTool:getX() > -0.3 then
             dHeadBack = 250
@@ -915,7 +917,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
          elseif vtTool:getX() > -0.8667 then
             dHeadBack = 450
          else
-            dHeadBack = 650
+            dHeadBack = 660
          end
       else
          dHeadBack = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())
@@ -997,7 +999,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
       elseif abs( vtTool:getZ()) < 0.93 then
          if vtTool:getX() < 0 and abs( vtTool:getY()) < 0.2 and ptMax:getZ() > EMC.ZMIN + BD.VICE_MINH then
             dHeadFront = 180
-         elseif vtTool:getX() < 0.05 then
+         elseif vtTool:getX() < 0.06 then
             dHeadFront = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())
          elseif vtTool:getX() < 0.3 then
             dHeadFront = 250
@@ -1006,7 +1008,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, ptMin, ptMax, bSaw, bChain, dTLen,
          elseif vtTool:getX() < 0.8667 then
             dHeadFront = 450
          else
-            dHeadFront = 650
+            dHeadFront = 660
          end
       else
          dHeadFront = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX())

Essetre-FAST.mlde

@@ -48,11 +48,29 @@
 -- 2024/03/28 DS ver 2.6c9 Modificata posizione supporto rinvio.
 -- 2024/03/28 AV ver 2.6d1 Allineamento con common ver. 2.6c8
 -- 2024/04/15 AV ver 2.6d2 Allineamento con common ver. 2.6d1
+-- 2024/04/18 AV ver 2.6d3 Allineamento con common ver. 2.6d2
+-- 2024/04/30 AV ver 2.6e1 Allineamento con common ver. 2.6e1
+--                         Aggiunta variabile WoodDensity per gestione WOOD_DENSITY
+-- 2024/05/06 AV ver 2.6e2 Allineamento con common ver. 2.6e2
+-- 2024/05/06 AV ver 2.6e3 Allineamento con common ver. 2.6e3
+--                         Aggiunte variabili MinJoin(xx) per gestione MIN_JOIN_(xx) 
+-- 2024/06/03 AV ver 2.6f1 Aggiunta funzione GetSetupInfo a BeamData per nuovo automatismo
+-- 2024/06/13 LM ver 2.6f2 Aggiunta lettura NewTopC da offset Ts3
+-- 2024/06/13 AV ver 2.6f3_Dev Per controllo NUM, se arco maggiore di 99999mm, si approssima con una retta.
+-- 2024/07/03 AV ver 2.6g1 Allineamento con common ver. 2.6g1
+-- 2024/07/04 LM ver 2.6g2 In MachData.ini aggiunto MIN_JOIN_SS
+-- 2024/09/02 AV ver 2.6i1 Allineamento con common ver. 2.6i1, Rimossi file "Common-"
+-- 2024/09/02 AV ver 2.6i2 Corretto file YML per compilare file "Common_"
+-- 2024/09/05 LM ver 2.6i3 In BeamData aggiunte costanti MIN_HEIGHT_ADDED_CUTS, PRECUT_HEAD, PRECUT_TAIL
+-- 2024/09/06 LM ver 2.6i4 In BeamData le costanti sopra sono configurabili anche da offsets Ts3v7
+-- 2024/09/16 AV ver 2.6i5 Allineamento con common ver. 2.6i2
+-- 2024/09/18 LM ver 2.6i6 Modificato YAML per comunicazione versioni a LiMan. Aggiunta PP_NVER, versione in formato numerico.
 
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6d2'
+PP_VER = '2.6i6'
+PP_NVER = '2.6.9.6'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'
 
@@ -173,6 +191,13 @@ if EgtExistsFile( sData) then
          if Machine.Offsets.RIB_AUTO then AutomaticRotation = ( Machine.Offsets.RIB_AUTO == 1) end
          if Machine.Offsets.NOULOAD then MaxUnloadLen = Machine.Offsets.NOULOAD end
          if Machine.Offsets.DEFTCPOS then DefTcPos = ( 'T' .. Machine.Offsets.DEFTCPOS) end
+         if Machine.Offsets.WOOD_DENSITY then WoodDensity = Machine.Offsets.WOOD_DENSITY end
+         if Machine.Offsets.MIN_JOIN_VV then MinJoinVV = Machine.Offsets.MIN_JOIN_VV end
+         if Machine.Offsets.MIN_JOIN_SS then MinJoinSS = Machine.Offsets.MIN_JOIN_SS end
+         if Machine.Offsets.MIN_JOIN_LS then MinJoinLS = Machine.Offsets.MIN_JOIN_LS end
+         if Machine.Offsets.MIN_JOIN_SL then MinJoinSL = Machine.Offsets.MIN_JOIN_SL end
+         if Machine.Offsets.MIN_JOIN_LL then MinJoinLL = Machine.Offsets.MIN_JOIN_LL end
+         if Machine.Offsets.NEWTOPC then NewTopC = ( Machine.Offsets.NEWTOPC == 1) end
       end
    end
 end
@@ -186,8 +211,8 @@ EmtGeneral {
       ExitMaxAdjust = 30,
       ExitMaxRotAdj = 0.5,
       AngDeltaMinForHome = 165,
-      Special = 'Common-FAST.mlse',
-      Processor = 'Common-FAST.mlpe'}
+      Special = 'Common_FAST.mlse',
+      Processor = 'Common_FAST.mlpe'}
 local BaseId = EmtBase {
       Name = 'Base',
       Geo='BASE/GEO',

MachNotes.ini

@@ -0,0 +1,50 @@
+; Commento per evitare BOM con UTF-8
+;Index = Type, Description, Default Value
+; Type : b=boolean, d=double, l=lenght, s=string
+
+[Drilling]
+
+[Sawing]
+
+[Milling]
+0=d,MaxElev,0
+1=d,OutRaw,0
+2=d,SideElev,0
+3=d,TrimExt,0
+4=sr,VtFaceUse,0,0,0
+
+[Pocketing]
+0=d,MaxElev,0
+1=b,Open,0
+2=d,OpenMinSave,0
+3=d,OpenOutRaw,0
+4=d,MaxOptSize,0
+
+[Mortising]
+0=d,MaxElev,0
+
+[Chiseling]
+
+[SawRoughing]
+
+[SawFinishing]
+
+[GenMachining]
+0=l,LinTol,0.1
+1=l,MaxLen,2
+2=s,Type,ZigZag
+3=d,SideAng,90
+4=l,Step,10
+5=l,OffsProj,0
+6=l,LiTang,0
+7=l,LiOrth,0
+8=l,LiElev,0
+9=l,LoTang,0
+10=l,LoOrth,0
+11=l,LoElev,0
+12=b,DirFromGuide,1
+
+[SurfRoughing]
+
+[SurfFinishing]
+0=b,SkipMaxDown,1

ToolNotes.ini

@@ -0,0 +1,41 @@
+; Commento per evitare BOM con UTF-8
+; Index, Type, Description, Value
+; Index = 0,1,..,n
+; Type : d=double, l=lenght, s=string, b=boolean, dr=double recalc, sr= string recalc, lr=lenght recalc, br=boolean recalc, th=toolholder
+; Description : STEP, SIDESTEP, ...
+
+[DRILL_STD]
+0=th,TH,
+1=d,STEP
+2=s,DOUBLE
+
+[SAW_STD]
+0=th,TH,
+1=d,STEP
+2=d,SIDESTEP
+3=b,LONGCUT
+
+[SAW_FLAT]
+0=th,TH,
+1=d,STEP
+2=d,SIDESTEP
+3=b,LONGCUT
+
+[MILL_STD]
+0=th,TH,
+1=d,STEP
+2=d,SIDESTEP
+3=d,SIDEDEPTH
+4=s,DOUBLE
+
+[MILL_NOTIP]
+0=th,TH,
+1=d,STEP
+2=d,SIDESTEP
+3=d,SIDEDEPTH
+4=s,DOUBLE
+
+[MORTISE_STD]
+0=b,MORTISE
+1=d,STEP
+2=d,SIDESTEP

UpdateLog.txt

@@ -1,5 +1,29 @@
            ==== Common_FAST Update Log ====
 
+Versione 2.6i2 (16/09/2024)
+- (SIM-GEN) Se utensili più lunghi di 200mm, si ruota in home e poi si approccia il pezzo.  Ticket#2038
+- (SIM-GEN) Aumentata distanza ingombro da 650mm a 660mm. In casi di utensile abbastanza lungo poteva andare in colisione. Ticket#2041
+
+Versione 2.6i1 (02/09/2024)
+- (MLDE-SIM-GEN) Rinominato file da "Common-" a "Common_" per uniformità con i file common delle altre macchine. Serve modifica a MLDE macchina.
+
+Versione 2.6g1 (03/07/2024)
+- (GEN) Corretto chiamata macro precarico in caso di taglio finale, ma con ribaltamento successivo. Ora si chiama solo se la fase successiva è una "END". Ticket#1881
+- (GEN) Per controllo NUM, se arco maggiore di 99999mm, si approssima con una retta. Ticket#1888
+
+Versione 2.6e3 (06/05/2024)
+- (MLDE-SIM-GEN) Gestione facoltativa parametri MIN_JOIN_xx settabili in Ts3. Ticket#1794
+
+Versione 2.6e2 (06/05/2024)
+- (SIM-GEN) Modificata tolleranza calcolo ingombri lavorazioni per posizionamento pinze. Ticket#1790
+
+Versione 2.6e1 (30/04/2024)
+- (MLDE-GEN) Gestione facoltativa parametro WOOD_DENSITY settabile in Ts3. In MLDE, mettere il valore di WOOD_DENSITY nella nostra variabile 'WoodDensity'.
+
+Versione 2.6d2 (18/04/2024)
+- (SIM-GEN) In MLSE, quando c'è una rotazione, viene settato EMT.CNT=1 per considerare i 50mm di compensazione laser.
+- (SIM) Nel file di log dove c'è stampa gruppi di collisione, viene scritto anche ID del gruppo
+
 Versione 2.6d1 (15/04/2024)
 - (GEN) Aggiunta gestione aggregato doppia uscita per controllo NUM_PLUS
 - (GEN) Con aggregato con si possono fare archi, se OnArc con aggregato, dà errore.

Version.lua

@@ -2,8 +2,8 @@
 -- Gestione della versione dei file comuni post-processori macchine FAST e FASTrl di Essetre
 
 local InfoCommon_STD_PP = {
-   NAME = 'Common-FAST',            -- nome script PP standard
-   VERSION = '2.6d1',                 -- versione script
+   NAME = 'Common_FAST',            -- nome script PP standard
+   VERSION = '2.6i2',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }