- Allineamento con common ver. 2.6i3

- Aggiunta PP_NVER, versione macchina in formato numerico.

.gitlab-ci.yml

@@ -2,19 +2,26 @@ 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#"
+
 
 #Note compilazione LUA:
 # lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols
@@ -38,12 +45,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\$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 +77,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
 
@@ -86,22 +111,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 +137,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 +164,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
@@ -158,6 +196,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
@@ -186,6 +251,8 @@ LuaCompile:build:
    - *LuaCompile
    - *ZipClean
    - *ReplicaR
+   - *ReplicaStor01
+   - *SendToVersionsLog
 
 LuaCompileDev:build:
  stage: build
@@ -233,4 +300,5 @@ LuaCompileDev: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

Common_FAST.NUM.mlpe

@@ -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

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

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) ..

Common_FAST.mlpe

@@ -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

Essetre-FAST.mlde

@@ -61,11 +61,17 @@
 -- 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.
+-- 2024/09/23 AV ver 2.6i7 Allineamento con common ver. 2.6i3
 
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6i2'
+PP_VER = '2.6i7'
+PP_NVER = '2.6.9.7'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'
 

UpdateLog.txt

@@ -1,5 +1,14 @@
            ==== Common_FAST Update Log ====
 
+Versione 2.6i3 (23/09/2024)
+- (SIM-GEN) Aggiunta nuova strategia riposizionamento morse
+- (SIM-GEN) Aggiunta lettura flag NEWCLAMPING in BeamData, per abilitare nuova strategia riposizionamento. Se false o nil, funziona con metodo vecchio.
+- (SIM-GEN) Aggiunta lettura flag FASTCLAMPING. Se false, al carico prende al massimo 1000mm, per evitare collisioni durante ciclo di lettura laser e prima lavorazione.
+
+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.
 

Version.lua

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