Merge branch 'develop' into EstimateWithAcceleration

Common_PF1250.TPA.mlpe

@@ -1628,24 +1628,6 @@ function OnArc()
    EmtUpdatePrev()
 end
 
----------------------------------------------------------------------
-function CalcDinamicaPinze( dH, dS, dL)
-   local MinTempoAcc = EMT.MINACC        -- [ms] ~600
-   local MaxTempoAcc = EMT.MAXACC        -- [ms] ~6000
-   local KgMtCubo= WoodDensity or 550              -- densità legno [Kg / metro cubo]
-   local Massa = ( dH * dS * dL * KgMtCubo ) / 1e9 -- massa [Kg]
-   local FMaxPinze = EMT.FMAXPINZE                 -- Feed massima pinze [mm/min]
-   local ForzaAttrito = 350 * 9.8 * 0.2            -- Forza chiusura pinze [Kgf] * g * Coeff_Attrito -> [N]
-   local TempoAcc = EgtClamp( ( Massa * FMaxPinze) / ( 60 * ForzaAttrito), MinTempoAcc, MaxTempoAcc)
-   local RidFeed = 100 / Massa * 100
-   if RidFeed > 100 then
-      RidFeed = 100
-   elseif RidFeed < 10 then
-      RidFeed = 10
-   end
-   return TempoAcc, MinTempoAcc, RidFeed
-end
-
 ---------------------------------------------------------------------
 function CalcForzaPinze( dH, dS, dL, dT)
    local MassaRef = 1500                              -- [Kg]

Common_PF1250.mlpe

@@ -2187,6 +2187,9 @@ local FALL_T = 2 * ESTIMATION_RAPID_COEFF               -- s
 ---------------------------------------------------------------------
 function OnEstimStart()
    EMT.INCHES = not EgtUiUnitsAreMM()      -- unità di misura mm/inches
+   EMT.FMAXPINZE = EgtClamp( MaxFeedPinze or 116000, 20000, 130000)  -- feed massima pinze
+   EMT.MAXACC = MaxAcc or 6000    -- accelerazione massima pinze. In realtà è il tempo in millisecondi, quindi MAXACC corrisponde al tempo massimo per raggiungere la velocità desiderata
+   EMT.MINACC = MinAcc or 600     -- accelerazione minima pinze. In realtà è il tempo in millisecondi, quindi MINACC corrisponde al tempo massimo per raggiungere la velocità desiderata
 end
 
 ---------------------------------------------------------------------
@@ -2272,6 +2275,15 @@ function OnEstimDispositionEnd()
    EMT.OPEISDISP = false
 end
 
+---------------------------------------------------------------------
+function OnEstimRawMoveData()
+   -- se start del pezzo
+   if IsStartOrRestPhase( EMT.PHASE) then
+      EMT.SPLIT = false
+   end
+   OnRawMoveData()
+end
+
 ---------------------------------------------------------------------
 function OnEstimToolSelect()
    -- reset indice utensile in tabella lunghezze
@@ -2328,6 +2340,12 @@ function OnEstimMachiningEnd()
       EMT.TLE_NAME = nil
       EMT.TLE_TIME = nil
    end
+
+   EMT.MCHUSERNOTES = EgtGetMachiningParam( MCH_MP.USERNOTES) or ''
+   EMT.MCHSPLIT = ( EMT.MCHUSERNOTES:find( 'Split;', 1, true) ~= nil)
+   if EMT.MCHSPLIT then
+      EMT.SPLIT = true
+   end
 end
 
 ---------------------------------------------------------------------
@@ -2453,17 +2471,20 @@ function OnEstimRapid()
    EMT.MCHEXTLEN = EMT.MCHEXTLEN + dLen
    -- calcolo tempo
    local dTime = RAPID_MIN_T
-   local dT1 = abs( dL1) / RAPID_X_FEED * 60
+   
+   local dT1 = CalcMoveTime( abs( dL1), RAPID_X_FEED, EMT.SPLIT)
    if dT1 > dTime then dTime = dT1 end
-   local dT2 = abs( dL2) / RAPID_Y_FEED * 60
+   local dT2 = CalcMoveTime( abs( dL2), EMT.FMAXPINZE, EMT.SPLIT)
    if dT2 > dTime then dTime = dT2 end
-   local dT3 = abs( dL3) / RAPID_Z_FEED * 60
+   local dT3 = CalcMoveTime( abs( dL3), RAPID_Z_FEED, EMT.SPLIT)
    if dT3 > dTime then dTime = dT3 end
    local dT4 = abs( dR1) / RAPID_C_FEED * 60
    if dT4 > dTime then dTime = dT4 end
    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)
    -- aggiorno valori come precedenti
    EmtUpdatePrev()
@@ -2479,7 +2500,7 @@ function OnEstimLinear()
    local dLen = sqrt( dL1 * dL1 + dL2 * dL2 + dL3 * dL3)
    EMT.MCHCUTLEN = EMT.MCHCUTLEN + dLen
    -- calcolo tempo
-   local dTime = dLen / EMT.F * 60
+   local dTime = 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
@@ -2753,5 +2774,38 @@ function GetCmdAxMove( Cmd, sAx)
    end
 end
 
+---------------------------------------------------------------------
+function CalcDinamicaPinze( dH, dS, dL)
+   local MinTempoAcc = EMT.MINACC        -- [ms] ~600
+   local MaxTempoAcc = EMT.MAXACC        -- [ms] ~6000
+   local KgMtCubo= WoodDensity or 550              -- densità legno [Kg / metro cubo]
+   local Massa = ( dH * dS * dL * KgMtCubo ) / 1e9 -- massa [Kg]
+   local FMaxPinze = EMT.FMAXPINZE                 -- Feed massima pinze [mm/min]
+   local ForzaAttrito = 350 * 9.8 * 0.2            -- Forza chiusura pinze [Kgf] * g * Coeff_Attrito -> [N]
+   local TempoAcc = EgtClamp( ( Massa * FMaxPinze) / ( 60 * ForzaAttrito), MinTempoAcc, MaxTempoAcc)
+   local RidFeed = 100 / Massa * 100
+   if RidFeed > 100 then
+      RidFeed = 100
+   elseif RidFeed < 10 then
+      RidFeed = 10
+   end
+   return TempoAcc, MinTempoAcc, RidFeed
+end
+
+---------------------------------------------------------------------
+function CalcMoveTime( dPathLen, dFeed, bIsSplitted)
+   local dTime
+   local dFeedInSec = dFeed / 60
+   local dTempoAcc, _, _ = CalcDinamicaPinze( EMT.HB, EMT.SB, EgtIf( bIsSplitted, EMT.LT, EMT.LB))
+   dTempoAcc = dTempoAcc / 1000
+   -- se si raggiunge la velocità massima
+   if dPathLen >= dFeedInSec * dTempoAcc then
+      dTime = dTempoAcc * 2 + ( ( dPathLen - dFeedInSec * dTempoAcc) / dFeedInSec)
+   else
+      dTime = 2 * sqrt( (dPathLen * dTempoAcc) / dFeedInSec)
+   end
+   return dTime
+end
+
 ---------------------------------------------------------------------
 -- *** END GENERAL ***