Cambio nome versione

Si manda in home utensile precedente solo se lama. Gli altri stanno a ZMAX
In preselezione testa attende che sia terminato il movimento
2024-10-02 15:12:54 +02:00 · 2024-10-02 15:12:21 +02:00 · 2024-10-02 12:21:53 +02:00 · 2024-10-02 12:20:55 +02:00 · 2024-09-27 10:29:03 +02:00 · 2024-09-25 13:12:50 +02:00
4 changed files with 136 additions and 47 deletions
@@ -15,4 +15,3 @@
 /Wall/PocketingData.lua
 /Wall/SawingData.lua
 /Wall/Ts3Data.lua
-.vscode/settings.json
@@ -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
+
@@ -1140,37 +1140,45 @@ function OnRapid()
            local nHSet = GetHeadSet( EMT.HEAD)
            local nPrevHSet = GetHeadSet( EMT.PREVHEAD)

-            -- se successivo non è sega a catena e la testa è la stessa, vado in home con utensile succesivo
-            if not HeadIsChainSaw( EMT.HEAD) and nHSet == nPrevHSet then
-               if nHSet == 1 then
-                  local HomeX1 = EgtGetAxisHomePos( 'X1')
-                  EmitMoveDataHead( 1, { X=-HomeX1, Z=MaxZ1, B=ParkB1, C=ParkC1})
-                  EmitMoveStartHead( 1, 'EA1')
-               else
-                  local HomeX2 = EgtGetAxisHomePos( 'X2')
-                  EmitMoveDataHead( 2, { X=-HomeX2, Z=MaxZ2, B=ParkB2, C=ParkC2})
-                  EmitMoveStartHead( 2, 'EA1')
-               end
-            else
-               if not HeadIsChainSaw( EMT.PREVHEAD) then
+            -- se successivo non è sega a catena e la testa è la stessa, vado in home con utensile successivo
+         --   if not HeadIsChainSaw( EMT.HEAD) and nHSet == nPrevHSet then
+         --      if nHSet == 1 then
+         --         local HomeX1 = EgtGetAxisHomePos( 'X1')
+         --         EmitMoveDataHead( 1, { X=-HomeX1, Z=MaxZ1, B=ParkB1, C=ParkC1})
+         --         EmitMoveStartHead( 1, 'EA1')
+         --         EmitMoveWaitHead( 1)
+         --      else
+         --         local HomeX2 = EgtGetAxisHomePos( 'X2')
+         --         EmitMoveDataHead( 2, { X=-HomeX2, Z=MaxZ2, B=ParkB2, C=ParkC2})
+         --         EmitMoveStartHead( 2, 'EA1')
+         --         EmitMoveWaitHead( 2)
+         --      end
+         --   else
+               -- vado in parcheggio sempre con utensile precedente
+         --      if not HeadIsChainSaw( EMT.PREVHEAD) then
+               if EMT.PREVHEAD == 'H12' or EMT.PREVHEAD == 'H22' then
                  if nPrevHSet == 1 then
                     local HomeX1 = EgtGetAxisHomePos( 'X1')
                     EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
                     EmitMoveStartHead( 1, 'EA1')
+                     EmitMoveWaitHead( 1)
                  else
                     local HomeX2 = EgtGetAxisHomePos( 'X2')
                     EmitMoveDataHead( 2, { X=-EMT.PREVHOMEX_H2, Z=MaxZ2, B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
                     EmitMoveStartHead( 2, 'EA1')
+                     EmitMoveWaitHead( 2)
                  end
-               else
-                  if GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC1' or GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC2' then
-                     EmitMoveDataHead( 1, { X=-ParkCSawX1S, Z=MaxZ1, B=HomeR2, C=HomeR1, TPos='50'})
-                     EmitMoveStartHead( 1, 'EA1')
-                  else
-                     EmitMoveDataHead( 2, { X=-ParkCSawX2S, Z=MaxZ2, B=HomeR2, C=HomeR1, TPos='50'})
-                     EmitMoveStartHead( 2, 'EA1')
-                  end
-               end
+          --     else
+          --        if GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC1' or GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC2' then
+          --           EmitMoveDataHead( 1, { X=-ParkCSawX1S, Z=MaxZ1, B=HomeR2, C=HomeR1, TPos='50'})
+          --           EmitMoveStartHead( 1, 'EA1')
+          --           --EmitMoveWaitHead( 1)
+          --        else
+          --           EmitMoveDataHead( 2, { X=-ParkCSawX2S, Z=MaxZ2, B=HomeR2, C=HomeR1, TPos='50'})
+          --           EmitMoveStartHead( 2, 'EA1')
+          --           --EmitMoveWaitHead( 2)
+          --        end
+          --     end
            end

            EMT.TO_XHOME = nil
@@ -69,12 +69,15 @@
 -- 2024/09/02 ver 2.6i1 Allineamento con common ver. 2.6i1
 -- 2024/09/13 ver 2.6i2 Allineamento con common ver. 2.6i2
 --                      Inseriti in NGE solidi collisione TC, Aggiunta avriabile LimX1RotSawTC2
+-- 2024/09/18 ver 2.6i3 Modificato YAML per comunicazione versioni a LiMan. Aggiunta PP_NVER, versione in formato numerico.
+-- 2024/09/27 ver 2.6i4 Quota parcheggio ParkFrnX1 portato a 300mm

 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)

-PP_VER = '2.6i2'
+PP_VER = '2.6i4_DEV2'
+PP_NVER = '2.6.9.4'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-ONE'

@@ -147,7 +150,7 @@ MaxB1 = 127
 MinB1b = -119
 MaxB1b = 119
 ParkX1 = MaxX1
-ParkFrnX1 = 200
+ParkFrnX1 = 300
 ParkZ1 = -535
 ParkC1 = 90
 ParkFrnC1 = -90
Author	SHA1	Message	Date
andrea.villa	95da880f98	Cambio nome versione	2024-10-02 15:12:54 +02:00
andrea.villa	5d07852adc	Si manda in home utensile precedente solo se lama. Gli altri stanno a ZMAX	2024-10-02 15:12:21 +02:00
andrea.villa	c5fd05f77f	In preselezione testa attende che sia terminato il movimento	2024-10-02 12:21:53 +02:00
andrea.villa	b4eae3eae5	Merge remote-tracking branch 'origin/master' into develop	2024-10-02 12:20:55 +02:00
andrea.villa	17002d66f6	Quota parcheggio ParkFrnX1 portato a 300mm	2024-09-27 10:29:03 +02:00
luca.mazzoleni	7830cb8e9f	update gitignore e YAML	2024-09-25 13:12:50 +02:00
luca.mazzoleni	463ac23f9f	update gitignore	2024-09-24 14:52:33 +02:00
luca.mazzoleni	e4b8d2e478	update gitignore e YAML	2024-09-24 14:52:10 +02:00
luca.mazzoleni	623b0e7abc	- Modificato YAML per comunicazione versioni a LiMan. - Aggiunta PP_NVER, versione in formato numerico.	2024-09-18 15:32:52 +02:00