- 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

@@ -1,6 +1,7 @@
 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'
@@ -8,9 +9,12 @@ variables:
  NET_SHARE_R: '\\10.74.82.201\EgwTech'
  NET_USERQ: 'steamw\egalware'
  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'
  SRC_PATH: ''
  BASE_PATH: ''
+ TEST_PATH: ''
 
 #Note compilazione LUA:
 # lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols
@@ -21,44 +25,90 @@ 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 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 "-----------------------"
       $fPath = "$env:MACH_NAME.mlde";
       $vLine = Select-String -path $fPath -Pattern 'PP_VER';
       $comp = $vLine -split "=";
@@ -66,17 +116,37 @@ variables:
       # 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
    - |
-      $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"
@@ -105,17 +175,33 @@ LuaCompile:build:
  only:
    - main
    - master
-   - develop
  tags:
    - win
  before_script:
    - *machName-fix
    - *version-fix
    - *folder-fix
- script:    
+ script:
+   - *CreateBaseFolder    
    - *LuaCompile
    - *ZipClean
-   - *ReplicaS
+   - *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

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

@@ -48,11 +48,12 @@
 -- 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.6d2'
+PP_VER = '2.6d3'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'
 

UpdateLog.txt

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

Version.lua

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