Merge remote-tracking branch 'origin/develop'

Corretto set variabili info utensile prima del movimento in home in caso di pezzi alti per NUM/NUM_PLUS
Merge commit '5ff538314a85a4709e41584bc130c5d7403028f1' into develop
2025-11-10 16:13:11 +01:00 · 2025-11-10 16:12:58 +01:00 · 2025-11-10 16:09:25 +01:00 · 2025-10-08 16:10:13 +02:00 · 2025-10-06 15:55:53 +02:00 · 2025-10-06 15:55:35 +02:00
6 changed files with 56 additions and 34 deletions
@@ -635,15 +635,24 @@ function OnRapid()
         bGoToHome = true
      end

+      -- 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 sES = ' ES'..EgtNumToString( EMT.S, 0)
+
      -- primo posizionamento
      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 not EMT.LOAD and EMT.PREVHEAD == 'H3' and (EMT.ST > BeamHeightForFixRot or bGoToHome) and EMT.FLAG2 == 1 then
+      if not EMT.LOAD and EMT.PREVHEAD == 'H3' 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
         EmtOutput( sOutPreMove)
+         sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
+                                       ' B' .. EgtNumToString( 0, 3) .. ' C' .. EgtNumToString( EMT.R1pp, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOutPreMove)
         EmtOutput( 'G101 ET1001')
         EmtOutput( 'G101 ET2001')
      end
@@ -653,12 +662,6 @@ function OnRapid()
         EmtOutput( '( *** ' .. sOut .. ' *** )')
      end

-      -- 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 sES = ' ES'..EgtNumToString( EMT.S, 0)
-
      -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
      if not EMT.LOAD and ( EMT.HEAD == 'H3' or ( bZmax and EMT.TTOTLEN > 200)) and
         ( EMT.ST > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TTOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
@@ -684,24 +684,6 @@ function OnRapid()
         bGoToHome = true
      end

-      -- primo posizionamento
-      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 not EMT.LOAD and EMT.PREVHEAD == 'H3' and ( EMT.ST > BeamHeightForFixRot or bGoToHome) 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
-         EmtOutput( sOutPreMove)
-         EmtOutput( 'G101 ET1001')
-         EmtOutput( 'G101 ET2001')
-      end
-
-      if not EMT.LOAD then
-         local sOut = string.gsub( string.gsub( EMT.MCHNAME..'/'..EMT.TOOL, '%(', '-'), '%)', '-')
-         EmtOutput( '( *** ' .. sOut .. ' *** )')
-      end
-
      -- ricavo i dati per la lavorazione
      local sEE = ' EE' .. EgtIf( bZmax, '3', '4')
      
@@ -731,6 +713,27 @@ function OnRapid()

      local sES = ' ES'..EgtNumToString( EMT.S, 0)

+      -- primo posizionamento
+      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 not EMT.LOAD and EMT.PREVHEAD == 'H3' 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
+         EmtOutput( sOutPreMove)
+         sOutPreMove = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. ' Z' .. EmtLenToString( MyZHome, 3) ..
+                                       ' B' .. EgtNumToString( 0, 3) .. ' C' .. EgtNumToString( EMT.R1, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOutPreMove)
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
+      end
+
+      if not EMT.LOAD then
+         local sOut = string.gsub( string.gsub( EMT.MCHNAME..'/'..EMT.TOOL, '%(', '-'), '%)', '-')
+         EmtOutput( '( *** ' .. sOut .. ' *** )')
+      end
+
      -- se carico motosega, ruoto in zona sicura prima di approcciare la lavorazione
      if not EMT.LOAD and ( EMT.HEAD == 'H3' or ( bZmax and EMT.TTOTLEN > 200)) and 
         ( EMT.ST > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TTOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
@@ -669,12 +669,17 @@ 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 not EMT.LOAD and EMT.PREVHEAD == 'H3' and ( EMT.ST > BeamHeightForFixRot or bGoToHome) and EMT.FLAG2 == 1 then
+      if not EMT.LOAD and EMT.PREVHEAD == 'H3' and EMT.FLAG2 == 1 then
         local sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZHome, EMT.DECMACRO) ..
                                 ' P4=' .. EgtNumToString( EMT.R2pp, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1pp, EMT.DECMACRO) .. 
                                 ' P6=' .. EgtNumToString( EMT.PREVTCPOS, EMT.DECMACRO) .. ' P7=' .. EgtNumToString( EMT.PREVS, 0) ..
                                 ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4')
         EmtOutput( sOutPreMove)
+         sOutPreMove = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, EMT.DECMACRO) .. ' P3=' .. EmtLenToString( MyZHome, EMT.DECMACRO) ..
+                                 ' P4=' .. EgtNumToString( 0, EMT.DECMACRO) .. ' P5=' .. EgtNumToString( EMT.R1pp, EMT.DECMACRO) .. 
+                                 ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
+                                 ' P8=0' .. ' P9=0' .. ' P10=' .. EgtIf( bZmax, '3', '4')
+         EmtOutput( sOutPreMove)
         EmtOutput( 'M101 P1=2')
         EmtOutput( 'M101 P1=3')
      end
@@ -115,7 +115,8 @@ function OnSimulStart()
                     { Grp = 'V', Sub = 'COLLISION', Name = 'VOL2'},
                     { Grp = 'PV', Sub = 'COLLISION', Name = 'VOL'},
                     { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE1'},
-                     { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE2'}}
+                     { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE2'},
+                     { Grp = 'C', Sub = 'COLLISION2', Name = 'C_TOP'}}
   EgtOutLog( 'MCODET Objects :', 4)
   local nMcdNullCnt = 0
   for i = 1, #McdData do
@@ -555,9 +556,9 @@ function OnSimulToolDeselect()
      -- movimento scarico sega a catena
      if EMT.HEAD == 'H3' then
         -- se avevo motosega, torno in zona sicura senza ruotare assi rotanti
-         if  EMT.HT > BeamHeightForFixRot then
-            SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID)
-         end
+         SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID)
+         -- raddrizzo asse B prima di ruotare il C
+         SimulMoveAxis( 'B', 0, MCH_SIM_STEP.COLLROT)
         local dPosA = EgtGetAxisPos( 'A')
         if abs( dPosA) < 0.1 then
            SimulMoveAxes( 'B', 0, MCH_SIM_STEP.COLLROT, 'C', EgtIf( BD.RIGHT_LOAD, -180, 0), MCH_SIM_STEP.COLLROT)
@@ -802,14 +803,14 @@ function OnSimulMoveStart()
      EMT.MCHFIRST = false
      local bZmax = ( EMT.TOOL ~= EMT.PREVTOOL  or EMT.L3 > -1)
      -- con pezzi alti aggiorno gli assi rotanti prima di muovermi sopra il pezzo
-      if not EMT.LOAD and EMT.MOVE == 0 and ( EMT.HT > BeamHeightForFixRot or ( EMT.HEAD == 'H1' and EMT.TOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
+      if not EMT.LOAD and EMT.MOVE == 0 and ( EMT.HEAD == 'H3' or ( EMT.HEAD == 'H1' and EMT.TOTLEN > 350) or bGoToHome) and EMT.FLAG2 == 1 then
         -- se motosega mi muovo a X di sicurezza per ruotare, prima si raddrizza B e poi C in posizione
-         if EMT.HEAD == 'H3' and bGoToHome then
+         if EMT.HEAD == 'H3' or bGoToHome then
            SimulMoveAxis( 'X', SafeXRotAxes, MCH_SIM_STEP.RAPID)
            SimulMoveAxis( 'B', 0, MCH_SIM_STEP.COLLROT)
            SimulMoveAxis( 'C', EMT.R1, MCH_SIM_STEP.COLLROT)
            SimulMoveAxis( 'B', EMT.R2, MCH_SIM_STEP.COLLROT)
-         elseif ( EMT.HEAD == 'H3' or ( bZmax and EMT.TOTLEN > 200)) then
+         elseif ( bZmax and 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
@@ -1,5 +1,15 @@
           ==== Common_FAST Update Log ====

+Versione 2.7k1 (10/11/2025)
+- (GEN) Corretto set variabili info utensile prima del movimento in home in caso di pezzi alti per NUM/NUM_PLUS.
+
+Versione 2.7j2 (08/10/2025)
+- (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C. Ora sempre e non solo se pezzo alto.
+
+Versione 2.7j1 (06/10/2025)
+- (SIM-GEN) Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C.
+- (MLDE-SIM) Controllo collisione tra utensile e TOP testa C. Serve CAM5 2.7j1
+
 Versione 2.7i3 (23/09/2025)
 - (MLDE-ALL) Spostate costanti dimensioni utensili in MLDE.

@@ -3,7 +3,7 @@

 local InfoCommon_STD_PP = {
   NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.7i3',                 -- versione script
+   VERSION = '2.7k1',                 -- versione script
   MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }
Author	SHA1	Message	Date
andrea.villa	052f6aa18e	Merge remote-tracking branch 'origin/develop'	2025-11-10 16:13:11 +01:00
andrea.villa	d4376dfa8e	Corretto set variabili info utensile prima del movimento in home in caso di pezzi alti per NUM/NUM_PLUS	2025-11-10 16:12:58 +01:00
andrea.villa	f25d90518d	Merge commit '5ff538314a85a4709e41584bc130c5d7403028f1' into develop	2025-11-10 16:09:25 +01:00
andrea.villa	5ff538314a	Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C. Ora sempre e non solo se pezzo alto	2025-10-08 16:10:13 +02:00
andrea.villa	db91129c66	Aggiornato UpdateLog	2025-10-06 15:55:53 +02:00
andrea.villa	8f124af521	Merge remote-tracking branch 'origin/main' into develop	2025-10-06 15:55:35 +02:00
andrea.villa	fbd5f170de	Quando si scarica motosega, si raddrizza prima l'asse B e poi si muove il C	2025-10-06 15:53:55 +02:00
andrea.villa	00fffeb388	Controllo collisione tra utensile e TOP testa C. Rilasciare dopo che è stata pubblicata nuova versioen CAM5 27j1	2025-09-25 12:45:11 +02:00
andrea.villa	0f6e9b9899	Merge remote-tracking branch 'origin/main' into develop	2025-09-25 12:43:12 +02:00