Merge branch 'develop' into feature/DeepDtMortise

LuaLibs/ProcessDtMortise.lua

@@ -20,6 +20,7 @@ local ProcessDtMortise = {}
 require( 'EgtBase')
 local BL = require( 'BeamLib')
 local Cut = require( 'ProcessCut')
+local Probe = require( 'ProcessProbing')
 
 EgtOutLog( ' ProcessDtMortise started', 1)
 
@@ -291,6 +292,7 @@ function ProcessDtMortise.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
    local dToolDiam = 100
    local dMaxMat = 30
    local dSideAng = 0
+   local sHeadTool = 'H1'
    local bCW = true
    local bMillOnAggregate = sMchExt == '_AT'
    if EgtMdbSetCurrMachining( sMilling) then
@@ -300,6 +302,7 @@ function ProcessDtMortise.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
          dToolDiam = max( dToolDiam, 10)
          dMaxMat = EgtTdbGetCurrToolParam( MCH_TP.MAXMAT) or dMaxMat
          dSideAng = EgtTdbGetCurrToolParam( MCH_TP.SIDEANG) or dSideAng
+         sHeadTool = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
          local dSpeed = EgtMdbGetCurrMachiningParam( MCH_MP.SPEED) or 0
          bCW = ( dSpeed >= 0)
       end
@@ -354,6 +357,11 @@ function ProcessDtMortise.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
       bMultipleZPasses = true
    end
    
+
+   -- tastatura se richiesta
+   local Info = { vtProbe = vtExtr, ptProbe = ptBC,  sType = 'DTMortise', sHead = sHeadTool}
+   local bProbeExecuted, sErr = Probe.Make( Proc, nPartId, Info)
+
    -- se con tasca, la lavoro (mai in doppio)
    if bPocket then
       -- recupero il contorno della tasca (seconda curva ausiliaria)
@@ -634,7 +642,7 @@ function ProcessDtMortise.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
          end
       end
       -- se necessario, imposto SCC
-      if nSCC then 
+      if nSCC then
          EgtSetMachiningParam( MCH_MP.SCC, nSCC)
       end
       -- dichiaro massima elevazione e assenza sfridi per VMill
@@ -655,6 +663,10 @@ function ProcessDtMortise.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
             sUserNotes = EgtSetValInNotes( sUserNotes, 'StartZmax', 2)
          end
       end
+      -- se c'è stata tastatura, si disattiva sull'ultima lavorazione
+      if bProbeExecuted and i == 1 then
+         sUserNotes = EgtSetValInNotes( sUserNotes, 'END-PROBE', true)
+      end
       EgtSetMachiningParam( MCH_MP.USERNOTES, sUserNotes)
       -- eseguo
       if not ML.ApplyMachining( true, false) then