- Allineamento con common ver. 2.6d2

- copia sorgenti e zip compilati in percorso di prova in S, ordinati per versione
- copia sorgenti in R, in percorso di prova, ultima versione macchina e macchina di test

.gitlab-ci.yml

@@ -0,0 +1,236 @@
+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_USERQ: 'steamw\egalware'
+ MACH_VERS: '0.0.0.0'
+ TEMP_PATH: 'C:\MachinesDeploy'
+ MACHINES_PATH_R: 'R:\EgtData\Machines'
+ DEST_MACHINES_PATH_R: 'R:\EgtData\Machines\zTestYAML'
+ SRC_PATH: ''
+ BASE_PATH: ''
+ TEST_PATH: ''
+
+#Note compilazione LUA:
+# lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols
+
+# helper copia script verso cartella di rete S:\ delle cartelle bin
+.ReplicaS: &ReplicaS
+   - |
+      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" /XD "$env:MACH_NAME_TEST"
+      SLEEP 2
+      net use S: /delete
+
+# helper copia script verso cartella di rete R:\
+.ReplicaR: &ReplicaR
+   - |
+      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"
+      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 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 "-----------------------"
+     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 "-----------------------"
+      $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
+      Write-Output $env:MACH_VERS;
+
+# 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;
+
+# helper creazione folders 
+.folder-fix: &folder-fix
+   - |
+      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"
+      }
+      Set-Alias 7zip $7zipPath
+      $Target = "$env:BASE_PATH\$env:MACH_NAME.zip"
+      cd "$env:SRC_PATH\bin\"
+      $Source = "*"
+      7zip a -tzip $Target $Source  
+      Write-Output "called ZIP $Source --> $Target"
+
+
+# helper esecuzione test 
+.RunTest: &RunTest
+   - |
+      Write-Output "Test done!"      
+
+
+stages:
+ - build
+#  - test
+#  - deploy
+
+LuaCompile:build:
+ stage: build
+ only:
+   - main
+   - master
+ tags:
+   - win
+ before_script:
+   - *machName-fix
+   - *version-fix
+   - *folder-fix
+ script:
+   - *CreateBaseFolder    
+   - *LuaCompile
+   - *ZipClean
+   - *ReplicaR
+
+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
+#  needs: ["LuaCompile:build"]
+#  only:
+#    - main
+#    - master
+#    - develop
+#  tags:
+#    - win
+#  before_script:
+#    - *version-fix
+#    - *folder-fix
+#  script:    
+#    - *LuaCompile
+#    - *RunTest
+   
+# LuaCompile:deploy:
+#  stage: deploy
+#  needs: ["LuaCompile:test"]
+#  only:
+#    - main
+#    - master
+#  tags:
+#    - win
+#  before_script:
+#    - *version-fix
+#    - *folder-fix
+#  script:    
+#    - *LuaCompile
+#    - *ZipClean
+#    - *ReplicaR

Common-FAST.NUM.mlpe

@@ -43,7 +43,7 @@ function OnProgramStart()
    EmtOutput( '%'..EgtNumToString( nPatt, 0)..'.0')
 
    -- aggiungo prefisso per commentae commenti iniziali se la macchina è utilizzata per fare i test
-   local sPrefixCommentLine = '' ; if IS_TEST_MACHINE then sPrefixCommentLine = '//' end
+   local sPrefixCommentLine = '' ; if IS_TEST_MACHINE or EgtEndsWith( EgtGetCurrMachineDir(), '.TEST') then sPrefixCommentLine = '//' end
 
    if EMT.INFO then
       EmtOutput( sPrefixCommentLine..'('..EMT.INFO..')')

Common-FAST.NUM_PLUS.mlpe

@@ -43,7 +43,7 @@ function OnProgramStart()
    EmtOutput( '%'..EgtNumToString( nPatt, 0)..'.0')
 
    -- aggiungo prefisso per commentae commenti iniziali se la macchina è utilizzata per fare i test
-   local sPrefixCommentLine = '' ; if IS_TEST_MACHINE then sPrefixCommentLine = '//' end
+   local sPrefixCommentLine = '' ; if IS_TEST_MACHINE or EgtEndsWith( EgtGetCurrMachineDir(), '.TEST') then sPrefixCommentLine = '//' end
 
    if EMT.INFO then
       EmtOutput( sPrefixCommentLine..'('..EMT.INFO..')')
@@ -137,6 +137,14 @@ function OnToolData()
       if EMT.TDIST and abs( EMT.TDIST) < 0.1 then EMT.TDIST = nil end
       local sOut = 'L11='..EgtNumToString( EMT.SMAX, 0)..' L12='..EmtLenToString( ( EMT.TDIST or ChSawLen), 1)..' G76H9998.1N301N304'
       EmtOutput( sOut)
+   -- emissione dati rinvio
+   elseif EMT.HEAD == 'H5' or EMT.HEAD == 'H6' then
+      local nPos = EgtIf( EMT.HEAD == 'H5', 91, 93)
+      if EMT.EXIT == 2 then nPos = nPos + 1 end
+      local sPos = 'N2' .. tostring(nPos)
+      local sOut = 'L11=' .. EmtLenToString( EMT.SMAX, 3) .. ' L12=' .. EmtLenToString( AngTr1Offs, 1)..' G76H9998.1'..sPos..sPos
+      EmtOutput( sOut)
+   -- altro non previsto
    end
 end
 
@@ -155,7 +163,7 @@ function OnDispositionStart()
                    ' EG'..EmtLenToString( SawOffs, 2)..' EI'..EmtLenToString( ParkY, 2)..' EL'..EmtLenToString( ParkV, 2)..
                    ' EM'..EmtLenToString( TurnerOffs, 2)..' EN'..EmtLenToString( -DeltaTabY, 2)..' EO'..EmtLenToString( DeltaTabZ, 2)
       if SecondSupport >= 3 then
-         sOut = sOut ..' EP'..EmtLenToString( AngTr1Len, 2) ..' EQ'..EmtLenToString( AngTr1Offs + MillOffs,2)
+         sOut = sOut ..' EP'..EmtLenToString( AngTr1Len, 2) ..' EQ'..EmtLenToString( AngTr1Offs,2)
       end
       EmtOutput( '\n' .. sOut .. '\n')
       -- carico barra
@@ -422,6 +430,10 @@ function OnMachiningStart()
    -- sistemazione speed
    if EMT.HEAD == 'H2' then
       EMT.S = EMT.S * 6
+   elseif EMT.HEAD == 'H5' and EMT.EXIT == 1 then
+      EMT.S = -EMT.S
+   elseif EMT.HEAD == 'H6' and EMT.EXIT == 1 then
+      EMT.S = -EMT.S
    end
    -- determino subito se taglio di separazione di pezzo a caduta
    EMT.PREFALLCUT = nil
@@ -672,8 +684,31 @@ function OnRapid()
 
       -- ricavo i dati per la lavorazione
       local sEE = ' EE' .. EgtIf( bZmax, '3', '4')
-      local sEL = ' EL' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TLEN, ( EMT.TDIST or ChSawLen)), 3)
-      local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3)
+      
+      local sEL = ' EL'
+       -- se motosega
+      if EMT.HEAD == 'H3' then
+         sEL = sEL..EmtLenToString( ( EMT.TDIST or ChSawLen), 3)
+      -- se aggregato
+      elseif EMT.HEAD == 'H5' or EMT.HEAD == 'H6' then
+         sEL = sEL..EmtLenToString( AngTr1Offs, 3)
+      -- se testa normale  ( H1 or H2)
+      else
+         sEL = sEL..EmtLenToString( EMT.TLEN, 3)
+      end
+
+      local sER = ' ER'
+       -- se motosega
+      if EMT.HEAD == 'H3' then
+         sER = sER..EmtLenToString( EMT.TLEN, 3)
+      -- se aggregato
+      elseif EMT.HEAD == 'H5' or EMT.HEAD == 'H6' then
+         sER = sER..EmtLenToString( EMT.TLEN + AngTr1Len, 3)
+      -- se testa normale  ( H1 or H2)
+      else
+         sER = sER..EmtLenToString( EMT.TDIAM / 2, 3)
+      end
+
       local sET = GetET( EMT.HEAD, EMT.TCPOS, EMT.R3)
       local sES = ' ES'..EgtNumToString( EMT.S, 0)
 
@@ -943,6 +978,11 @@ end
 
 ---------------------------------------------------------------------
 function OnArc()
+   -- con aggregato non si possono fare archi. Deve essere tutto spezzato
+   if EMT.HEAD == 'H5' or EMT.HEAD == 'H6' then
+      EmtSetLastError( 1211, "With aggregate, the arcs must be splitted")
+   end
+
    MyBackupAxes()
    EMT.TLAST = EMT.L1
    -- non modale su archi
@@ -1522,16 +1562,24 @@ function MyAdjustLinearAxes()
 
    if EMT.REFLOC then
       local vtE
-      if EMT.HEAD ~= 'H3' then
+      if EMT.HEAD == 'H1' or EMT.HEAD == 'H2' then
          local Len = EMT.TLEN + EgtIf( EMT.HEAD == 'H1', MillOffs, abs( SawOffs))
          local LenRef = MillOffs
          vtE = Vector3d( EMT.EXTR) * Len - Z_AX() * LenRef
-      else
+      elseif EMT.HEAD == 'H3' then
          local LenAux = ( EMT.TDIST or ChSawLen) + MillOffs
          local LenRef = MillOffs
          local vtAux = EgtGetCalcAuxDirFromAngles( EMT.R1, EMT.R2, EMT.R3)
          vtE = vtAux * LenAux - Z_AX() * LenRef
+      elseif  EMT.HEAD == 'H5' then
+         local LenAux = AngTr1Offs + MillOffs
+         local LenRef = MillOffs
+         local vtAux = EgtGetCalcAuxDirFromAngles( EMT.R1, EMT.R2, EMT.R3)
+         vtE = vtAux * LenAux - Z_AX() * LenRef
+      else
+         EmtSetLastError( 1211, 'Head not allowed ' .. EMT.HEAD)
       end
+
       EMT.L1 = EMT.L1 - vtE:getX()
       EMT.L2 = EMT.L2 - DeltaTabY - vtE:getY()
       EMT.L3 = EMT.L3 - DeltaTabZ - vtE:getZ()
@@ -1571,7 +1619,7 @@ function CalcInterpPlane()
    local ptS = Point3d( xS, 0, 0)
    -- calcolo per piano generico
    local vtE
-   if EMT.HEAD ~= 'H3' then
+   if EMT.HEAD == 'H1' or EMT.HEAD == 'H2' then
       vtE = Vector3d( EMT.EXTR)
    else
       vtE = EgtGetCalcAuxDirFromAngles( EMT.R1, EMT.R2, EMT.R3)
@@ -1622,7 +1670,7 @@ end
 
 ---------------------------------------------------------------------
 function GetET( sHead, sTcPos, dAxR3)
-   if sHead == 'H1' then
+   if sHead == 'H1' or sHead == 'H5' or sHead == 'H6' then
       return ' E'..sTcPos
    elseif sHead == 'H2' then
       return ' ET42'

Common-FAST.TPA.mlpe

@@ -40,7 +40,7 @@ end
 function OnProgramStart()
 
    -- aggiungo prefisso per commentae commenti iniziali se la macchina è utilizzata per fare i test
-   local sPrefixCommentLine = '' ; if IS_TEST_MACHINE then sPrefixCommentLine = '//' end
+   local sPrefixCommentLine = '' ; if IS_TEST_MACHINE or EgtEndsWith( EgtGetCurrMachineDir(), '.TEST') then sPrefixCommentLine = '//' end
 
    -- Intestazioni
    if EMT.INFO then

Common-FAST.mlpe

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

Common-FAST.mlse

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

Essetre-FAST.mlde

@@ -47,11 +47,13 @@
 -- 2024/03/12 AV ver 2.6c8 Allineamento con common ver. 2.6c7.
 -- 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
 
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6d1'
+PP_VER = '2.6d3'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'
 

UpdateLog.txt

@@ -1,5 +1,14 @@
            ==== Common_FAST Update Log ====
 
+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.
+- (GEN) Chiamando la macchina con un nome che termini con '.TEST' si abilita come macchina per test interni, equivalente a settare 'IS_TEST_MACHINE' (che comunque rimane)
+
 Versione 2.6c8 (28/03/2024)
 - (MLSE) Possibilità di lavorazione da X- tra le pinze, se abilitata da flag (User.ENABLE_TOOL_BETWEEN_VICES == 1).
 - (MLDE-GEN) Aggiunto parametro 'IS_TEST_MACHINE' FACOLTATIVO. Se non esiste o 'false' è macchina standard, se 'true' è una macchina utilizzata per i test Egalware interni

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common-FAST',            -- nome script PP standard
-   VERSION = '2.6c8',                 -- versione script
+   VERSION = '2.6d2',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }