Merge branch 'develop'

Cambio versione per rilascio a cliente
Aggiunto controllo C in base a carico Dx o Sx durante il cambio utensile
2025-12-10 09:46:35 +01:00 · 2025-12-10 09:46:22 +01:00 · 2025-12-10 09:40:16 +01:00 · 2025-12-02 15:01:34 +01:00 · 2025-11-27 09:11:10 +01:00 · 2025-11-27 09:09:07 +01:00
6 changed files with 99 additions and 60 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
@@ -863,13 +866,13 @@ function OnRapid()
         local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3)
         local sET = GetET( EMT.HEAD, EMT.TCPOS, EMT.R3)
         local sES = ' ES'..EgtNumToString( EMT.S, 0)
-         local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
-                      ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B' .. EgtNumToString( dBAxis, 3) ..
+                      ' C' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
         EmtOutput( sOut)
         EmtOutput( 'G101 ET1001')
         EmtOutput( 'G101 ET2001')
-         sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
-                ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B' .. EgtNumToString( dBAxis, 3) ..
+                ' C' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
         EmtOutput( sOut)
         EmtOutput( 'G101 ET1001')
         EmtOutput( 'G101 ET2001')
@@ -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
@@ -945,13 +948,13 @@ function OnRapid()
         local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3)
         local sET = GetET( EMT.HEAD, EMT.TCPOS, EMT.R3)
         local sES = ' ES'..EgtNumToString( EMT.S, 0)
-         local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
-                      ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B' .. EgtNumToString( dBAxis, 3) ..
+                      ' C' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
         EmtOutput( sOut)
         EmtOutput( 'G101 ET1001')
         EmtOutput( 'G101 ET2001')
-         sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
-                ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B' .. EgtNumToString( dBAxis, 3) ..
+                ' C' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
         EmtOutput( sOut)
         EmtOutput( 'G101 ET1001')
         EmtOutput( 'G101 ET2001')
@@ -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
@@ -7,9 +7,6 @@ EgtEnableDebug( false)
 -- carico librerie
 local BD = require( 'BeamData')

-LONG_TOOL_MINLEN = 221
-BIG_TOOL_DIAM = 300
-
 ---------------------------------------------------------------------
 -- *** GENERATION ***
 ---------------------------------------------------------------------
@@ -82,6 +79,14 @@ function OnSimulStart()
         for j = 1, #( vTools or {}) do
            if vTools[j] ~= '' then
               EgtLoadTool( vTcPos[i], j, vTools[j])
+               -- Aggiunto controllo lunghezza lama minima * 0.9 per ricavare la tolleranza del VMILL
+               if EgtTdbSetCurrTool(vTools[j]) then -- set utensile corrente
+                  if EgtTdbGetCurrToolParam( MCH_TP.TYPE) == MCH_TY.SAW_STD or EgtTdbGetCurrToolParam( MCH_TP.TYPE) == MCH_TY.SAW_FLAT then -- controllo tipo utensile sega
+                     local dCurrSawLen = EgtTdbGetCurrToolParam( MCH_TP.LEN) * 0.9
+                     -- se non definito o minore del valore precedente aggiorna la tolleranza
+                     EMT.VMILLTOL = EgtIf( not EMT.VMILLTOL or dCurrSawLen < EMT.VMILLTOL, dCurrSawLen, EMT.VMILLTOL) 
+                  end
+               end
            end
         end
         ShowToolInTcPos( vTcPos[i], true)
@@ -118,7 +123,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
@@ -215,7 +221,7 @@ function OnSimulDispositionStart()
            -- determino la risoluzione dello Zmap
            local dTol = 4.71
            if EmtGetVMillStep then
-               dTol = EmtGetVMillStep( b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), 4.71)
+               dTol = EmtGetVMillStep( b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), dTol)
            else
               local dArea = b3Raw:getDimX() * b3Raw:getDimY() + b3Raw:getDimX() * b3Raw:getDimZ() + b3Raw:getDimY() * b3Raw:getDimZ()
               if dArea < 0.075e6 then
@@ -232,6 +238,7 @@ function OnSimulDispositionStart()
                  dTol = 3.77
               end
            end
+            dTol = min( dTol, EMT.VMILLTOL or dTol) -- imposto dTol al valore minore tra quello per volume e quello per spessore lama
            -- creo lo Zmap
            local VMillId = EgtVolZmapBox( nPartRawId, b3Raw:getMin(), b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), dTol, true, GDB_RT.GLOB)
            if VMillId then
@@ -558,9 +565,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)
@@ -570,12 +577,12 @@ function OnSimulToolDeselect()
         SimulMoveAxis( 'X', 0, MCH_SIM_STEP.RAPID)
      -- movimento scarico rinvio
      elseif EMT.HEAD == 'H5' or EMT.HEAD == 'H6' then
-         SimulMoveAxes( 'B', 0, MCH_SIM_STEP.COLLROT, 'C', -90, MCH_SIM_STEP.COLLROT)
+         SimulMoveAxes( 'B', 0, MCH_SIM_STEP.COLLROT, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), MCH_SIM_STEP.COLLROT)
         SimulMoveAxis( 'X', 0, MCH_SIM_STEP.RAPID)
      -- movimento scarico aggregato BlockHaus
      elseif EMT.HEAD == 'H7' then
         SimulMoveAxis( 'X', 0, MCH_SIM_STEP.RAPID)
-         SimulMoveAxes( 'B', 90, MCH_SIM_STEP.COLLROT, 'C', -90, MCH_SIM_STEP.COLLROT)
+         SimulMoveAxes( 'B', 90, MCH_SIM_STEP.COLLROT, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), MCH_SIM_STEP.COLLROT)
      -- movimento scarico punta lunga su T111
      elseif EMT.TOTLEN > LONG_TOOL_MINLEN then
         -- se su cambio utensile T111
@@ -586,9 +593,9 @@ function OnSimulToolDeselect()
         else
            SimulMoveAxis( 'X', 0, MCH_SIM_STEP.RAPID)
            if GetTCSet( EMT.TCPOS) == 1 then
-               SimulMoveAxes( 'B', 90, MCH_SIM_STEP.COLLROT, 'C', -90, MCH_SIM_STEP.COLLROT)
+               SimulMoveAxes( 'B', 90, MCH_SIM_STEP.COLLROT, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), MCH_SIM_STEP.COLLROT)
            else
-               SimulMoveAxes( 'B', -90, MCH_SIM_STEP.COLLROT, 'C', -90, MCH_SIM_STEP.COLLROT)
+               SimulMoveAxes( 'B', -90, MCH_SIM_STEP.COLLROT, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), MCH_SIM_STEP.COLLROT)
            end
         end
      -- movimento scarico utensile di grosso diametro (su T111)
@@ -805,14 +812,15 @@ 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 ( bZmax and EMT.TOTLEN > 200)) and 
+         ( EMT.HT > BeamHeightForFixRot  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
@@ -1213,11 +1221,11 @@ end
 --   *** ESTIMATION T&L ***
 ---------------------------------------------------------------------
 local ESTIMATION_RAPID_COEFF = EstimationRapidMultiplier or 1
-local RAPID_X_FEED =  75000 / ESTIMATION_RAPID_COEFF    -- mm/min
+local RAPID_X_FEED =  100000 / ESTIMATION_RAPID_COEFF   -- mm/min
 local RAPID_Y_FEED = 100000 / ESTIMATION_RAPID_COEFF    -- mm/min
-local RAPID_Z_FEED =  50000 / ESTIMATION_RAPID_COEFF    -- mm/min
-local RAPID_C_FEED =  15000 / ESTIMATION_RAPID_COEFF    -- deg/min
-local RAPID_B_FEED =  15000 / ESTIMATION_RAPID_COEFF    -- deg/min
+local RAPID_Z_FEED =  100000 / ESTIMATION_RAPID_COEFF   -- mm/min
+local RAPID_C_FEED =  12000 / ESTIMATION_RAPID_COEFF    -- deg/min
+local RAPID_B_FEED =  12000 / ESTIMATION_RAPID_COEFF    -- deg/min
 local RAPID_MIN_T = 0.1 * ESTIMATION_RAPID_COEFF       -- s
 local LOAD_T = 2  * ESTIMATION_RAPID_COEFF              -- s
 local CHAR_ONE_MOVE_T = 1  * ESTIMATION_RAPID_COEFF     -- s
@@ -1527,15 +1535,15 @@ function OnEstimRapid()
   EMT.MCHEXTLEN = EMT.MCHEXTLEN + dLen
   -- calcolo tempo
   local dTime = RAPID_MIN_T
-   local dT1 = CalcMoveTime( abs( dL1), RAPID_X_FEED, EMT.SPLIT)
+   local dT1 = CalcMoveTime( abs( dL1), EMT.FMAXPINZE, EMT.SPLIT)
   if dT1 > dTime then dTime = dT1 end
-   local dT2 = CalcMoveTime( abs( dL2), EMT.FMAXPINZE, EMT.SPLIT)
+   local dT2 = abs( dL2) / ( RAPID_X_FEED / 60) -- CalcMoveTime( abs( dL2), RAPID_X_FEED, EMT.SPLIT)
   if dT2 > dTime then dTime = dT2 end
-   local dT3 = CalcMoveTime( abs( dL3), RAPID_Z_FEED, EMT.SPLIT)
+   local dT3 = abs( dL3) / ( RAPID_Z_FEED * 60) -- CalcMoveTime( abs( dL3), RAPID_Z_FEED, EMT.SPLIT)
   if dT3 > dTime then dTime = dT3 end
-   local dT4 = abs( dR1) / RAPID_C_FEED * 60
+   local dT4 = abs( dR1) / ( RAPID_C_FEED / 60)
   if dT4 > dTime then dTime = dT4 end
-   local dT5 = abs( dR2) / RAPID_B_FEED * 60
+   local dT5 = abs( dR2) / ( RAPID_B_FEED / 60)
   if dT5 > dTime then dTime = dT5 end
   EMT.MCHEXTTIME = EMT.MCHEXTTIME + dTime
   EgtOutLog( string.format( '  G0 Len=%.0f Rot=%.0f° Time=%.2f', dLen, abs( dR1) + abs( dR2), dTime), 5)
@@ -1553,7 +1561,7 @@ function OnEstimLinear()
   local dLen = sqrt( dL1 * dL1 + dL2 * dL2 + dL3 * dL3)
   EMT.MCHCUTLEN = EMT.MCHCUTLEN + dLen
   -- calcolo tempo
-   local dTime = CalcMoveTime( dLen, EMT.F, EMT.SPLIT)
+   local dTime = dLen / ( EMT.F / 60) -- CalcMoveTime( dLen, EMT.F, EMT.SPLIT)
   EMT.MCHCUTTIME = EMT.MCHCUTTIME + dTime
   EgtOutLog( string.format( '  G1 Len=%.0f Time=%.2f', dLen, dTime), 5)
   -- aggiorno valori come precedenti
@@ -1,5 +1,25 @@
           ==== Common_FAST Update Log ====

+Versione 2.7l1 (10/12/2025)
+- (SIM) Aggiornata risoluzione VMillTol in funzione dello spessore lama
+- (EST) Modifiche a calcolo stima tempi, da verificare.
+- (SIM) Corretto movimento in simulazione che non rispettava movimento generato.
+- (GEN) Con controllo NUM/NUM_PLUS nella scrittura della coordinata tolto il simbolo '='
+- (SIM) Aggiunto controllo C in base a carico Dx o Sx durante il cambio utensile
+
+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.
+
 Versione 2.7i2 (17/09/2025)
 - (EST) Stima tempi considerando accelerazioni
 - (SIM) Prelievo e deposito motosega con gli angoli comunicati da Essetre
@@ -3,7 +3,7 @@

 local InfoCommon_STD_PP = {
   NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.7i2',                 -- versione script
+   VERSION = '2.7l1',                 -- versione script
   MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }
Author	SHA1	Message	Date
andrea.villa	523c5a99ce	Merge branch 'develop'	2025-12-10 09:46:35 +01:00
andrea.villa	db68ad1a90	Cambio versione per rilascio a cliente	2025-12-10 09:46:22 +01:00
daniele.nicoli	9259b6e633	Aggiunto controllo C in base a carico Dx o Sx durante il cambio utensile	2025-12-10 09:40:16 +01:00
andrea.villa	0c2387c901	Con controllo NUM/NUM_PLUS nella scrittura della coordinata tolto il simbolo '='	2025-12-02 15:01:34 +01:00
andrea.villa	24ea5db4f5	Merge remote-tracking branch 'origin/origin/VMill_Tol' into develop	2025-11-27 09:11:10 +01:00
andrea.villa	fb3d203f77	Corretto movimento in simulazione che non rispettava movimento macchina generato	2025-11-27 09:09:07 +01:00
daniele.nicoli	9fab4f9330	Aggiornato UpdateLog	2025-11-20 17:09:35 +01:00
daniele.nicoli	f1faaa1eda	Aggiornata risoluzione VMillTol in funzione dello spessore lama	2025-11-20 17:09:01 +01:00
andrea.villa	c9469ee7e2	Modifiche a calcolo stima tempi, da verificare	2025-11-19 16:38:56 +01:00
andrea.villa	108c6d2d8e	Merge remote-tracking branch 'origin/main' into develop	2025-11-10 16:13:31 +01:00
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
andrea.villa	b06d6d4afe	Merge remote-tracking branch 'origin/develop'	2025-09-23 11:25:49 +02:00
andrea.villa	36efe11298	Spostate costanti dimensioni utensili in MLDE	2025-09-23 11:25:32 +02:00
andrea.villa	5447eca3c3	Merge branch 'main' into develop	2025-09-17 09:21:20 +02:00