Aggiunta lettura quote parcheggio

Beam/BeamData.lua

@@ -110,8 +110,8 @@ if EgtExistsFile( sData) then
          if Machine.Offsets.MAX_ANGLE_DRILL_CUT then BeamData.MAX_ANGLE_DRILL_CUT = EgtClamp( Machine.Offsets.MAX_ANGLE_DRILL_CUT, 1, 89) end
          if Machine.Offsets.ROT90 ~= nil then BeamData.ROT90 = ( Machine.Offsets.ROT90 == 1) end
          if Machine.Offsets.CUT_SIC then BeamData.CUT_SIC = EgtClamp( Machine.Offsets.CUT_SIC, 15, 50) end
-         if Machine.Offsets.MIN_JOIN_S then BeamData.MIN_JOIN_S = EgtClamp( Machine.Offsets.MIN_JOIN_S, 80, 150) end
+         if Machine.Offsets.MIN_JOIN_S then BeamData.MIN_JOIN_S = Machine.Offsets.MIN_JOIN_S end
-         if Machine.Offsets.MIN_JOIN_L then BeamData.MIN_JOIN_L = EgtClamp( Machine.Offsets.MIN_JOIN_L, 300, 450) end
+         if Machine.Offsets.MIN_JOIN_L then BeamData.MIN_JOIN_L = Machine.Offsets.MIN_JOIN_L end
       end
       if Machine.Trave then
          BeamData.MIN_WIDTH = Machine.Trave.XMIN or BeamData.MIN_WIDTH

Common_ONE-PF.NUM.mlpe

@@ -27,7 +27,7 @@ function OnStart()
    --EMT.LINEINC = 1        -- incremento numerazione linee
    --EMT.Ft = 'F'           -- token per feed
    --EMT.St = 'S'           -- token per speed
-   EMT.FMAXPINZE = EgtClamp( MaxFeedPinze or 102000, 20000, 102000)  -- feed massima pinze
+   EMT.FMAXPINZE = EgtClamp( MaxFeedPinze or 102000, 20000, 155000)  -- feed massima pinze
    EMT.MAXACC = MaxAcc or ( EMT.FMAXPINZE / ( 60 * 0.3))  -- accelerazione massima pinze
    EMT.MINACC = MinAcc or ( EMT.FMAXPINZE / ( 60 * 4))    -- accelerazione minima pinze
 
@@ -421,6 +421,7 @@ function OnToolSelect()
       if MCH_TP.DIST then EMT.TDIST = EgtTdbGetCurrToolParam( MCH_TP.DIST) end
       if EMT.TDIST and abs( EMT.TDIST) < 0.1 then EMT.TDIST = nil end
       EMT.TUSERNOTES = EgtTdbGetCurrToolParam( MCH_TP.USERNOTES)
+      EMT.ISPROBING = HeadIsProbe( EMT.HEAD)
    end
 end
 
@@ -454,6 +455,7 @@ function OnMachiningStart()
       local MyParkCSawC2 = GetChainSawCHomeFromVirtualAxis( dPosA)
       EmtModifyAxisHome( 'C2', MyParkCSawC2)
    end
+
    -- gestione eventuale lavorazione in doppio
    local nDouType = EgtGetValInNotes( EMT.MCHUSERNOTES, 'DOUBLE', 'i')
    if nDouType == 2 or nDouType == 3 then
@@ -821,8 +823,8 @@ function OnRapid()
       EMT.IPLGL = false
       MyAdjustLinearAxes()
       EmtAdjustRotaryAxes()
-      local HomeR1 = EgtGetAxisHomePos( EgtIf( nHSet == 1, 'C1', 'C2'))
+      local HomeR1 = EgtGetAxisHomePos( EgtIf( nHSet == 1 or nHSet == 11, 'C1', 'C2'))
-      local HomeR2 = EgtGetAxisHomePos( EgtIf( nHSet == 1, 'B1', 'B2'))
+      local HomeR2 = EgtGetAxisHomePos( EgtIf( nHSet == 1 or nHSet == 11, 'B1', 'B2'))
       local PrevR1 = EMT.R1p or EMT.R1pp or HomeR1
       local PrevR2 = EMT.R2p or EMT.R2pp or HomeR2
       EmtResetPrev()
@@ -832,6 +834,101 @@ function OnRapid()
             EMT.L3 = EMT.L3s
          end
       end
+
+      -- se tastatore
+      if EMT.ISPROBING then
+         local nSetHead = GetHeadSet( EMT.HEAD)
+         local bIsFirstHead = ( nSetHead == 1 or nSetHead == 11)
+         local idProbeMachining = EMT.MCHID
+         local bFound = false
+         local nProbeHead = GetHeadSet( EMT.HEAD)
+         local idProbeNextMachining = EgtGetNextActiveOperation( idProbeMachining)
+         while not bFound do
+            if idProbeNextMachining then
+               EgtSetCurrMachining( idProbeNextMachining)
+               local sToolNameNextProbe = EgtGetMachiningParam( MCH_MP.TOOL)
+               if sToolNameNextProbe then
+                  local sToolHeadNextProbe, sToolTcPosNextProbe = GetToolHead( sToolNameNextProbe)
+                  local nToolHead = GetHeadSet( sToolHeadNextProbe)
+                  -- se sono sulla stessa testa
+                  if bIsFirstHead and nProbeHead == 11 then
+                     EMT.PROBENEXTTOOL_H1 = sToolNameNextProbe
+                     EMT.PROBENEXTHEAD_H1 = sToolHeadNextProbe
+                     EMT.PROBENEXTTCPOS_H1 = sToolTcPosNextProbe
+                     bFound = true
+                  elseif not bIsFirstHead and nProbeHead == 21 then
+                     EMT.PROBENEXTTOOL_H2 = sToolNameNextProbe
+                     EMT.PROBENEXTHEAD_H2 = sToolHeadNextProbe
+                     EMT.PROBENEXTTCPOS_H2 = sToolTcPosNextProbe
+                     bFound = true
+                  end
+               end
+            else
+               break
+            end
+            idProbeNextMachining = EgtGetNextActiveOperation( idProbeNextMachining)
+         end
+         -- ripristino lavorazione corrente
+         EgtSetCurrMachining( EMT.MCHID)
+
+         local bChanged = true
+         if bIsFirstHead then
+            -- se prossimo utensile compatibile, lo prelevo
+            if IsToolCompatibleWithProbe( EMT.PROBENEXTTOOL_H1, EMT.TOOL) then
+               EMT.TCPOS = EMT.PROBENEXTTCPOS_H1
+               EMT.HEAD = EMT.PROBENEXTHEAD_H1
+               EMT.TOOL = EMT.PROBENEXTTOOL_H1
+            else
+               -- se vecchio utensile compatibile, tengo quello caricato
+               if IsToolCompatibleWithProbe( EMT.PREVTOOL_H1, EMT.TOOL) then
+                  bChanged = false
+                  EMT.TCPOS = EMT.PREVTCPOS_H1
+                  EMT.HEAD = EMT.PREVHEAD_H1
+                  EMT.TOOL = EMT.PREVTOOL_H1
+               -- altrimenti si seleziona utensile di default
+               else
+                  ExecMoveZmax( EMT.MCHSPLIT, true)
+                  EMT.TCPOS = DefTcPos1
+                  EMT.TOOL = GetToolNameFromTcPos( DefTcPos1)
+                  EMT.HEAD, _ = GetToolHead( EMT.TOOL)
+               end
+            end
+            -- se cambiato utensile, si setta subito nome precedente
+            if bChanged then
+               EMT.PREVTOOL_H1 = EMT.TOOL
+               EMT.PREVHEAD_H1 = EMT.HEAD
+               EMT.PREVTCPOS_H1 = EMT.TCPOS
+            end
+         else
+            -- se prossimo utensile compatibile, lo prelevo
+            if IsToolCompatibleWithProbe( EMT.PROBENEXTTOOL_H2, EMT.TOOL) then
+               EMT.TCPOS = EMT.PROBENEXTTCPOS_H2
+               EMT.HEAD = EMT.PROBENEXTHEAD_H2
+               EMT.TOOL = EMT.PROBENEXTTOOL_H2
+            else
+               -- se vecchio utensile compatibile, tengo quello caricato
+               if IsToolCompatibleWithProbe( EMT.PREVTOOL_H2, EMT.TOOL) then
+                  bChanged = false
+                  EMT.TCPOS = EMT.PREVTCPOS_H2
+                  EMT.HEAD = EMT.PREVHEAD_H2
+                  EMT.TOOL = EMT.PREVTOOL_H2
+               -- altrimenti si seleziona utensile di default
+               else
+                  ExecMoveZmax( EMT.MCHSPLIT, true)
+                  EMT.TCPOS = DefTcPos2
+                  EMT.TOOL = GetToolNameFromTcPos( DefTcPos2)
+                  EMT.HEAD, _ = GetToolHead( EMT.TOOL)
+               end
+            end
+            -- se cambiato utensile, si setta subito nome precedente
+            if bChanged then
+               EMT.PREVTOOL_H2 = EMT.TOOL
+               EMT.PREVHEAD_H2 = EMT.HEAD
+               EMT.PREVTCPOS_H2 = EMT.TCPOS
+            end
+         end
+      end
+
       -- se prima lavorazione
       if EMT.LOAD then
          EMT.V2POS = ParkV2
@@ -1189,8 +1286,8 @@ function OnRapid()
             EMT.TO_XHOME = nil
             EMT.L1pp = nil
             EMT.L3pp = nil
-            PrevR1 = EgtGetAxisHomePos( EgtIf( nHSet == 1, 'C1', 'C2'))
+            PrevR1 = EgtGetAxisHomePos( EgtIf( nHSet == 1 or nHSet == 11, 'C1', 'C2'))
-            PrevR2 = EgtGetAxisHomePos( EgtIf( nHSet == 1, 'B1', 'B2'))
+            PrevR2 = EgtGetAxisHomePos( EgtIf( nHSet == 1 or nHSet == 11, 'B1', 'B2'))
          end
          -- calcolo Movimento Pinze (potrebbe richiedere movimento testa in Home)
          for i = 1, #EMT.AUXCMD do
@@ -1205,7 +1302,7 @@ function OnRapid()
                local nPrevHSet = GetHeadSet( EMT.PREVHEAD)
                -- vado in parcheggio sempre con utensile precedente
                if not HeadIsChainSaw( EMT.PREVHEAD) then
-                  if nPrevHSet == 1 then
+                  if nPrevHSet == 1 or nPrevHSet == 11 then
                      local HomeX1 = EgtGetAxisHomePos( 'X1')
                      EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=EMT.PREVHOMEB_H1, C=EMT.PREVHOMEC_H1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
                      EmitMoveStartHead( 1, 'EA1')
@@ -1580,6 +1677,12 @@ function OnRapid()
       EMT.ZMAX = false
    -- se standard
    elseif EMT.FLAG == 0 or EMT.FLAG == 1 or EMT.FLAG == 2 then
+      if EMT.ISPROBING then
+         -- emetto movimenti in Zero macchina
+         EmitMoveDataHead( GetHeadSet( EMT.HEAD), { X=-EMT.L2, Z=EMT.L3, B=EMT.R2, C=EMT.R1, S=Speed})
+         EmitMoveStartHead( GetHeadSet( EMT.HEAD))
+         EmitMoveWaitHead( GetHeadSet( EMT.HEAD))
+      else
          local sPostMove = ''
          if EMT.MCHFIRST then
             local sOut = string.gsub( string.gsub( EMT.MCHNAME..'/'..EMT.TOOL, '%(', '['), '%)', ']')
@@ -1640,7 +1743,8 @@ function OnRapid()
             EMT.L2p = nil
             EMT.L3p = nil
             local sDouFlag = EgtIf( EMT.DOU_TYPE, ' EE1', '')
-         EmtOutput( 'G142'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..EMT.IPLGLSTR..EgtIf( nHSet~=2, ' EU1', ' EU2')..sDouFlag..' EF'..GetFmaxClamp())
+            EmtOutput( 'G142'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..EMT.IPLGLSTR
+                             ..EgtIf( nHSet~=2 and nHSet~=22, ' EU1', ' EU2')..sDouFlag..' EF'..GetFmaxClamp())
             -- forzo successiva emissione assi rotanti
             EMT.R1p = nil
             EMT.R2p = nil
@@ -1656,6 +1760,7 @@ function OnRapid()
          if #sPostMove > 0 then
             EmtOutput( 'G157 EA2' .. sPostMove)
          end
+      end
    -- se altrimenti risalita a Z max a fine lavorazione
    elseif EMT.FLAG == 3 then
       EMT.REFLOC = nil
@@ -1669,12 +1774,15 @@ function OnRapid()
                        ( EMT.HEAD == 'H12' and EMT.TOOL ~= sNextTool ) or ( EMT.HEAD == 'H22' and EMT.TOOL ~= sNextTool) or EMT.MCHSPLIT
       local CurrL3o = EMT.L3o
       EMT.L3o = EMT.L3op
-      EmitZmax( true, true, bToXhome, EMT.R1p, EMT.R2p, EMT.MCHSPLIT)
+      local bZMax = EmitZmax( true, true, bToXhome, EMT.R1p, EMT.R2p, EMT.MCHSPLIT)
       EMT.L3o = CurrL3o
       -- aggiorno quota finale trave dopo Zmax
       EMT.L1o = EMT.TPOS
+      if bZMax then
          EMT.ZMAX = true
          ToolPreSelectionSingleHead( EMT.MCHID)
+      end
+
    -- se altrimenti movimento in Home
    elseif EMT.FLAG == 4 then
       -- non previsto
@@ -1689,6 +1797,30 @@ end
 
 ---------------------------------------------------------------------
 function OnLinear()
+   -- se tastatore
+   if EMT.ISPROBING then
+      if not EMT.PROBE then
+         local p3FirstPoint = Point3d( EMT.L1, EMT.L2, EMT.L3)
+         local p3SecondPoint = Point3d( EMT.L1p, EMT.L2p, EMT.L3p)
+         local dProbingDist = dist( p3FirstPoint, p3SecondPoint) * 2
+         local vtE = Vector3d( EMT.EXTR)
+         local sFace, ProbePosZ
+         if AreSameVectorApprox( vtE, Y_AX()) then
+            sFace = EgtIf( BD.RIGHT_LOAD, 4, 2)
+         elseif AreSameVectorApprox( vtE, -Y_AX()) then
+            sFace = EgtIf( BD.RIGHT_LOAD, 2, 4)
+         elseif AreSameVectorApprox( vtE, Z_AX()) then
+            sFace = 3
+         else
+            error( "PROBING DIRECTION NOT MANAGED")
+         end
+         local sProbeHead = ' ET' .. GetHeadSet( EMT.HEAD)
+         EmtOutput( 'G145 Z-'.. EgtNumToString( dProbingDist).. ' EF'..sFace..sProbeHead)
+
+         -- tastatura attivata
+         EMT.PROBE = true
+      end
+   else
       -- se necessario, impostazione riferimento locale
       if EMT.REFLOC == 0 then
          -- gruppo della testa
@@ -1711,7 +1843,8 @@ function OnLinear()
          EMT.L2p = nil
          EMT.L3p = nil
          local sDouFlag = EgtIf( EMT.DOU_TYPE, ' EE1', '')
-      EmtOutput( 'G142'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..EMT.IPLGLSTR..EgtIf( nHSet~=2, ' EU1', ' EU2')..sDouFlag..' EF'..GetFmaxClamp())
+         EmtOutput( 'G142'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..EMT.IPLGLSTR
+                          ..EgtIf( nHSet~=2 and nHSet~=22, ' EU1', ' EU2')..sDouFlag..' EF'..GetFmaxClamp())
          EMT.PLANEACTIVE = true
          -- emissione movimento
          local sOut = 'G0'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..
@@ -1770,6 +1903,7 @@ function OnLinear()
       EMT.TPOS = EMT.L1o
       EmtUpdatePrev()
    end
+end
 
 ---------------------------------------------------------------------
 function OnArc()
@@ -1795,7 +1929,8 @@ function OnArc()
       EMT.L2p = nil
       EMT.L3p = nil
       local sDouFlag = EgtIf( EMT.DOU_TYPE, ' EE1', '')
-      EmtOutput( 'G142'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..EMT.IPLGLSTR..EgtIf( nHSet~=2, ' EU1', ' EU2')..sDouFlag..' EF'..GetFmaxClamp())
+      EmtOutput( 'G142'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..EMT.IPLGLSTR
+                       ..EgtIf( nHSet~=2 and nHSet~=22, ' EU1', ' EU2')..sDouFlag..' EF'..GetFmaxClamp())
       EMT.PLANEACTIVE = true
       -- emissione movimento
       local sOut = 'G0'..EmtGetAxis('L1')..EmtGetAxis('L2')..EmtGetAxis('L3')..
@@ -2516,12 +2651,13 @@ end
 
 ---------------------------------------------------------------------
 function GetDiffRotAxAtStart( R1, R2)
-   local HomeR1 = EgtGetAxisHomePos( EgtIf( nHSet == 1, 'C1', 'C2'))
+   local nHSet = GetHeadSet( EMT.HEAD)
+   local HomeR1 = EgtGetAxisHomePos( EgtIf( nHSet == 1 or nHSet == 11, 'C1', 'C2'))
    local PrevR1 = EMT.R1p or EMT.R1pp or HomeR1
    if not R1 or not PrevR1 or abs( R1 - PrevR1) > 0.1 then
       return true
    end
-   local HomeR2 = EgtGetAxisHomePos( EgtIf( nHSet == 1, 'B1', 'B2'))
+   local HomeR2 = EgtGetAxisHomePos( EgtIf( nHSet == 1 or nHSet == 11, 'B1', 'B2'))
    local PrevR2 = EMT.R2p or EMT.R2pp or HomeR2
    if not R2 or not PrevR2 or abs( R2 - PrevR2) > 0.1 then
       return true
@@ -2537,12 +2673,12 @@ function MyAdjustLinearAxes()
 
    if EMT.REFLOC then
       local vtE
-      if EMT.HEAD == 'H11' or EMT.HEAD == 'H12' then
+      if EMT.HEAD == 'H11' or EMT.HEAD == 'H12' or EMT.HEAD == 'H19' then
          local dAddLen = EgtIf( EMT.HEAD == 'H12', -SawOffsZ, 0)
          local Len = EMT.TLEN + dAddLen + MillOffs
          local LenRef = MillOffs
          vtE = Vector3d( EMT.TDIR) * Len - Z_AX() * LenRef
-      elseif EMT.HEAD == 'H21' or EMT.HEAD == 'H22' then
+      elseif EMT.HEAD == 'H21' or EMT.HEAD == 'H22' or EMT.HEAD == 'H29' then
          local dAddLen = EgtIf( EMT.HEAD == 'H22', -Saw2OffsZ, 0)
          local Len = EMT.TLEN + dAddLen + Mill2Offs
          local LenRef = Mill2Offs
@@ -2563,7 +2699,7 @@ function MyAdjustLinearAxes()
       else
          EmtSetLastError( 1211, 'Head not defined ' .. ( EMT.HEAD or ''))
       end
-      if EMT.HEAD == 'H11' or EMT.HEAD == 'H12' or EMT.HEAD == 'H13' or EMT.HEAD == 'H15' or sHead == 'H17' then
+      if EMT.HEAD == 'H11' or EMT.HEAD == 'H12' or EMT.HEAD == 'H13' or EMT.HEAD == 'H15' or sHead == 'H17' or  EMT.HEAD == 'H19' then
          EMT.L1 = EMT.L1 - vtE:getX()
          EMT.L2 = EMT.L2 - DeltaTabY - vtE:getY()
          EMT.L3 = EMT.L3 - DeltaTabZ - vtE:getZ()
@@ -2772,13 +2908,40 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
    if bReset then
       EmitResetMachining()
    end
+
+   if EMT.ISPROBING then
+      -- se lavorazione successiva con stessa testa non si va a Z massima
+      local nSetHead = GetHeadSet( EMT.HEAD)
+      local bIsFirstHead = ( nSetHead == 1 or nSetHead == 11)
+      local sToolNameNextProbe
+      local idProbeNextMachining = EgtGetNextActiveOperation( EMT.MCHID)
+      if idProbeNextMachining then
+         EgtSetCurrMachining( idProbeNextMachining)
+         sToolNameNextProbe = EgtGetMachiningParam( MCH_MP.TOOL)
+         EgtSetCurrMachining( EMT.MCHID)
+      end
+      if sToolNameNextProbe and bIsFirstHead and EMT.PREVTOOL_H1 == sToolNameNextProbe then
+         return false
+      elseif sToolNameNextProbe and not bIsFirstHead and EMT.PREVTOOL_H2 == sToolNameNextProbe then
+         return false
+      end
+   end
+
+   -- se tastatura attiva, si disabilita la tastatura
+   -- gestione eventuale tastatura
+   local bStopProbing = EgtGetValInNotes( EMT.MCHUSERNOTES, 'PROBE', 'b') or EgtGetValInNotes( EMT.MCHUSERNOTES, 'END-PROBE', 'b')
+   if EMT.PROBE and bStopProbing then
+      EmtOutput( 'G145 Z-10 EF0')
+      EMT.PROBE = nil
+   end
+
    -- gruppo della testa
    local nHSet = GetHeadSet( EMT.HEAD)
    local dXPos = EgtIf( bUsePrevDelta, EMT.L2pp or EMT.L2o, EMT.L2o)
    -- reset stato di testa in home
    EMT.XHOME = nil
    -- se testa 1
-   if nHSet == 1 then
+   if nHSet == 1 or nHSet == 11 then
       -- posizioni sicure
       local dMaxZ1 = EgtGetAxisMax( 'Z1')
       local dSafeX1 = EgtGetAxisHomePos( 'X1')
@@ -2978,6 +3141,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
          EmitMoveWaitHead( 2)
       end
    end
+   return true
 end
 
 ---------------------------------------------------------------------
@@ -3007,7 +3171,7 @@ function EmitXhome()
    -- gruppo della testa
    local nHSet = GetHeadSet( EMT.HEAD)
    -- se testa 1
-   if nHSet == 1 then
+   if nHSet == 1 or nHSet == 11 then
       local dMaxZ1 = EgtGetAxisMax( 'Z1')
       local dSafeX1 = EgtGetAxisHomePos( 'X1')
       local dSafeZ1 = EgtGetAxisHomePos( 'Z1')
@@ -3039,7 +3203,7 @@ end
 
 ---------------------------------------------------------------------
 function EmitResetMachining()
-   if EMT.PLANEACTIVE then
+   if EMT.PLANEACTIVE and not EMT.ISPROBING then
       -- se non sono a Z massima e operatore deve entrare in cabina spango sempre
       if not EMT.ZMAX and ( GetSpecUnloading( EMT.PATHID) or GetFall( EMT.PATHID)) then
          EmtOutput( 'M05')

Common_ONE-PF.mlpe

@@ -96,6 +96,10 @@ function OnSimulStart()
    if DefTcPos2 then
       LoadFirstTool( 2, DefTcPos2)
    end
+
+   -- se presenti, nascondo i tastatori
+   DeactivateProbeTool()
+
    ExecStartHome()
    -- Se reset o home, esco
    if EMT.SIM1ST then return end
@@ -130,7 +134,8 @@ function OnSimulStart()
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'TC1'},
                      { Grp = 'Base', Sub = 'COLLISION', Name = 'TC2'},
                      { Grp = 'Base', Sub = 'BELT', Name = 'COLLISION'},
-                     { Grp = 'X1', Sub = 'COLLISION', Name = 'STM'}}
+                     { Grp = 'X1', Sub = 'COLLISION', Name = 'STM'},
+                     { Grp = 'X1', Sub = 'COLLISION', Name = 'STM2'}}
    
    if EgtGetHeadId( 'H21') then
       table.insert( McdData, { Grp = 'X2', Sub = 'COLLISION', Name = 'STM'})
@@ -513,9 +518,11 @@ function OnSimulToolSelect( dPosA)
    EMT.TDIAM = EgtTdbGetCurrToolParam( MCH_TP.DIAM)
    EMT.TUSERNOTES = EgtTdbGetCurrToolParam( MCH_TP.USERNOTES)
    local nSetHead = GetHeadSet( EMT.HEAD)
+   local bIsFirstHead = ( nSetHead == 1 or nSetHead == 11)
+   EMT.ISPROBING = HeadIsProbe( EMT.HEAD)
    -- se ho due teste, verifico che l'altra sia dalla parte opposta
    if EgtGetHeadId( 'H21') then
-      if nSetHead == 1 then
+      if bIsFirstHead then
          EgtSetAxisPos( 'X2', MinX2)
       else
          EgtSetAxisPos( 'X1', MaxX1)
@@ -551,6 +558,75 @@ function OnSimulToolSelect( dPosA)
       -- Imposto visualizzazione
       EgtSetMode( EgtGetHeadId( EMT.HEAD) or GDB_ID.NULL, GDB_MD.STD)
    end
+
+   -- se tastatore
+   if HeadIsProbe( EMT.HEAD) then
+      local bChanged = true
+      if bIsFirstHead then
+         -- se prossimo utensile compatibile, lo prelevo
+         if IsToolCompatibleWithProbe( EMT.PROBENEXTTOOL_H1, EMT.TOOL) then
+            ShowToolInTcPos( EMT.PREVTCPOS_H1, true)
+            EgtLoadTool( EMT.PROBENEXTHEAD_H1, 1, EMT.PROBENEXTTOOL_H1)
+            EMT.TCPOS = EMT.PROBENEXTTCPOS_H1
+            EMT.HEAD = EMT.PROBENEXTHEAD_H1
+            EMT.TOOL = EMT.PROBENEXTTOOL_H1
+         else
+            -- se vecchio utensile compatibile, tengo quello caricato
+            if IsToolCompatibleWithProbe( EMT.PREVTOOL_H1, EMT.TOOL) then
+               bChanged = false
+               EMT.TCPOS = EMT.PREVTCPOS_H1
+               EMT.TOOL = EMT.PREVTOOL_H1
+               EMT.HEAD = EMT.PREVHEAD_H1
+            -- altrimenti si seleziona utensile di default
+            else
+               ExecMoveZmax( EMT.MCHSPLIT, true)
+               EMT.TCPOS = DefTcPos1
+               EMT.TOOL = GetToolNameFromTcPos( DefTcPos1)
+               EMT.HEAD, _ = GetToolHead( EMT.TOOL)
+               ShowToolInTcPos( EMT.PREVTCPOS_H1, true)
+               EgtLoadTool( EMT.HEAD, 1, EMT.TOOL)
+            end
+         end
+         -- se cambiato utensile, si setta subito nome precedente
+         if bChanged then
+            EMT.PREVTOOL_H1 = EMT.TOOL
+            EMT.PREVHEAD_H1 = EMT.HEAD
+            EMT.PREVTCPOS_H1 = EMT.TCPOS
+         end
+      else
+         -- se prossimo utensile compatibile, lo prelevo
+         if IsToolCompatibleWithProbe( EMT.PROBENEXTTOOL_H2, EMT.TOOL) then 
+            ShowToolInTcPos( EMT.PREVTCPOS_H2, true)
+            EgtLoadTool( EMT.PROBENEXTHEAD_H2, 1, EMT.PROBENEXTTOOL_H2)
+            EMT.TCPOS = EMT.PROBENEXTTCPOS_H2
+            EMT.HEAD = EMT.PROBENEXTHEAD_H2
+            EMT.TOOL = EMT.PROBENEXTTOOL_H2
+         else
+            -- se vecchio utensile compatibile, tengo quello caricato
+            if IsToolCompatibleWithProbe( EMT.PREVTOOL_H2, EMT.TOOL) then
+               bChanged = false
+               EMT.TCPOS = EMT.PREVTCPOS_H2
+               EMT.TOOL = EMT.PREVTOOL_H2
+               EMT.HEAD = EMT.PREVHEAD_H2
+            -- altrimenti si seleziona utensile di default
+            else
+               ExecMoveZmax( EMT.MCHSPLIT, true)
+               EMT.TCPOS = DefTcPos2
+               EMT.TOOL = GetToolNameFromTcPos( DefTcPos2)
+               EMT.HEAD, _ = GetToolHead( EMT.TOOL)
+               ShowToolInTcPos( EMT.PREVTCPOS_H2, true)
+               EgtLoadTool( EMT.HEAD, 1, EMT.TOOL)
+            end
+         end
+         -- se cambiato utensile, si setta subito nome precedente
+         if bChanged then
+            EMT.PREVTOOL_H2 = EMT.TOOL
+            EMT.PREVHEAD_H2 = EMT.HEAD
+            EMT.PREVTCPOS_H2 = EMT.TCPOS
+         end
+      end
+   end
+   
    -- carico utensile, con breve pausa
    EgtPause( 100)
    EgtOutText( '')
@@ -619,10 +695,57 @@ function OnSimulToolDeselect( dPrevA)
          LoadNextTool( 2, DefTcPos2)
       end
    end
+
+   -- se presenti, nascondo i tastatori
+   DeactivateProbeTool()
+   local bSkipToolChange = false
+   -- se prossima lavorazione è tastatura, si controlla compatibilità con utensile successivo
+   if HeadIsProbe( EMT.NEXTHEAD) then
+      local idProbeMachining = EgtGetNextActiveOperation( EMT.MCHID)
+      local bFound = false
+      local nProbeHead = GetHeadSet( EMT.NEXTHEAD)
+      local idProbeNextMachining = EgtGetNextActiveOperation( idProbeMachining)
+      while not bFound do
+         if idProbeNextMachining then
+            EgtSetCurrMachining( idProbeNextMachining)
+            local sToolNameNextProbe = EgtGetMachiningParam( MCH_MP.TOOL)
+            if sToolNameNextProbe then
+               local sToolHeadNextProbe, sToolTcPosNextProbe = GetToolHead( sToolNameNextProbe)
+               local nToolHead = GetHeadSet( sToolHeadNextProbe)
+               -- se sono sulla stessa testa
+               if nToolHead == 1 and nProbeHead == 11 then
+                  EMT.PROBENEXTTOOL_H1 = sToolNameNextProbe
+                  EMT.PROBENEXTHEAD_H1 = sToolHeadNextProbe
+                  EMT.PROBENEXTTCPOS_H1 = sToolTcPosNextProbe
+                  bFound = true
+               elseif nToolHead == 2 and nProbeHead == 21 then
+                  EMT.PROBENEXTTOOL_H2 = sToolNameNextProbe
+                  EMT.PROBENEXTHEAD_H2 = sToolHeadNextProbe
+                  EMT.PROBENEXTTCPOS_H2 = sToolTcPosNextProbe
+                  bFound = true
+               end
+            end
+         else
+            break
+         end
+         idProbeNextMachining = EgtGetNextActiveOperation( idProbeNextMachining)
+      end
+      -- ripristino lavorazione corrente
+      EgtSetCurrMachining( EMT.MCHID)
+
+      if nProbeHead == 11 and not( IsToolCompatibleWithProbe( EMT.PREVTOOL_H1, EMT.TOOL)) then
+         ;
+      elseif nProbeHead == 21 and not( IsToolCompatibleWithProbe( EMT.PREVTOOL_H2, EMT.TOOL)) then
+         ; 
+      else
+         bSkipToolChange = true
+      end
+   end
+
    -- reset flag sega a catena già depositata
    EMT.CHSAW_OUT = nil
    -- se utensile non cambia e non è sega a catena, esco
-   if ( EMT.NEXTTOOL == EMT.PREVTOOL_H1 or EMT.NEXTTOOL == EMT.PREVTOOL_H2) and not HeadIsChainSaw( EMT.NEXTHEAD) then return end
+   if bSkipToolChange or ( ( EMT.NEXTTOOL == EMT.PREVTOOL_H1 or EMT.NEXTTOOL == EMT.PREVTOOL_H2) and not HeadIsChainSaw( EMT.NEXTHEAD)) then return end
    -- deposito utensile
    EgtOutText( 'Tool change in progress...')
    -- se prossimo utensile sega a catena, devo mettere in home testa 1 e depositare l'utensile sulla testa 2 o viceversa
@@ -631,7 +754,7 @@ function OnSimulToolDeselect( dPrevA)
       -- se ci sono due teste
       if EgtGetHeadId( 'H21') then
          local nSetHead = GetHeadSet( EMT.NEXTHEAD)
-         if nSetHead == 1 then
+         if nSetHead == 1 or nSetHead == 11 then
             -- porto in home testa 1
             SimulMoveAxis( 'X1', MaxX1, MCH_SIM_STEP.RAPID)
             -- deposito utensile fresa
@@ -687,7 +810,7 @@ function OnSimulToolDeselect( dPrevA)
       if nSetHead == 1 and EMT.PREVHEAD_H1 then
          local MyParkX1 = EgtIf( GetHeadTCSet( EMT.HEAD, EMT.TCPOS) == 'Head1_TC1', ParkX1, ParkFrnX1)
          SimulMoveAxis( 'X1', MyParkX1, MCH_SIM_STEP.RAPID)
-      elseif EMT.PREVHEAD_H2 then
+      elseif nSetHead == 2 and EMT.PREVHEAD_H2 then
          SimulMoveAxis( 'X2', ParkX2, MCH_SIM_STEP.RAPID)
       end
    end
@@ -718,7 +841,7 @@ function OnSimulToolDeselect( dPrevA)
          SimulMoveAxis( 'Z2', ParkCSawZ2, MCH_SIM_STEP.RAPID)
       end
    -- per prossima testa gruppo 1
-   else
+   elseif nNextSetHead == 1 then
       -- visualizzo utensile su TcPos
       ShowToolInTcPos( EMT.PREVTCPOS_H1, true)
       -- nascondo l'utensile sulla testa
@@ -851,6 +974,7 @@ function OnSimulMachiningEnd()
    EMT.DOU_TOOL = nil
    -- salvo dati utensile
    local nSetHead = GetHeadSet( EMT.HEAD)
+
    -- se non ho già tolto la sega a catena, aggiorno valori
    if not EMT.CHSAW_OUT then
    -- per gruppo testa 1
@@ -1657,16 +1781,50 @@ function ExecMoveZmax( bMchSplit, btoXHome)
    -- set della testa
    local nSetHead = GetHeadSet( EMT.HEAD)
    if nSetHead == 0 then return end
+   local bIsFirstHead = ( nSetHead == 1 or nSetHead == 11)
+
+   if EMT.ISPROBING then
+      -- se lavorazione successiva con stessa testa non si va a Z massima
+      local sToolNameNextProbe
+      local idProbeNextMachining = EgtGetNextActiveOperation( EMT.MCHID)
+      if idProbeNextMachining then
+         EgtSetCurrMachining( idProbeNextMachining)
+         sToolNameNextProbe = EgtGetMachiningParam( MCH_MP.TOOL)
+         EgtSetCurrMachining( EMT.MCHID)
+      end
+      local bMoveToZMax = true
+      if sToolNameNextProbe and bIsFirstHead and EMT.PREVTOOL_H1 == sToolNameNextProbe then
+         bMoveToZMax = false
+      elseif sToolNameNextProbe and not bIsFirstHead and EMT.PREVTOOL_H2 == sToolNameNextProbe then
+         bMoveToZMax = false
+      end
+      -- se non serve alzarsi
+      if not bMoveToZMax then
+         local vtE = Vector3d( EMT.EXTR)
+         local ProbePosZ
+         -- ci si riporta in posizione fuori ingombro pezzo
+         if AreSameVectorApprox( vtE, Y_AX()) or AreSameVectorApprox( vtE, -Y_AX()) then
+            ProbePosZ = EMT.TABORI1[3] + EMT.SB
+            if nSetHead == 1 then
+               SimulMoveAxis( 'Z1', ProbePosZ, MCH_SIM_STEP.RAPID)
+            else
+               SimulMoveAxis( 'Z2', ProbePosZ, MCH_SIM_STEP.RAPID)
+            end
+         end
+         return
+      end
+   end
+
    -- posizioni correnti degli assi testa
-   local CurrX = EgtGetAxisPos( EgtIf( nSetHead == 1, 'X1', 'X2'))
+   local CurrX = EgtGetAxisPos( EgtIf( bIsFirstHead, 'X1', 'X2'))
-   local CurrZ = EgtGetAxisPos( EgtIf( nSetHead == 1, 'Z1', 'Z2'))
+   local CurrZ = EgtGetAxisPos( EgtIf( bIsFirstHead, 'Z1', 'Z2'))
-   local CurrC = EgtGetAxisPos( EgtIf( nSetHead == 1, 'C1', 'C2'))
+   local CurrC = EgtGetAxisPos( EgtIf( bIsFirstHead, 'C1', 'C2'))
-   local CurrB = EgtGetAxisPos( EgtIf( nSetHead == 1, 'B1', 'B2'))
+   local CurrB = EgtGetAxisPos( EgtIf( bIsFirstHead, 'B1', 'B2'))
    -- posizioni home degli assi testa
-   local HomeX = EgtGetAxisHomePos( EgtIf( nSetHead == 1, 'X1', 'X2'))
+   local HomeX = EgtGetAxisHomePos( EgtIf( bIsFirstHead, 'X1', 'X2'))
-   local HomeZ = EgtGetAxisHomePos( EgtIf( nSetHead == 1, 'Z1', 'Z2'))
+   local HomeZ = EgtGetAxisHomePos( EgtIf( bIsFirstHead, 'Z1', 'Z2'))
-   local HomeC = EgtGetAxisHomePos( EgtIf( nSetHead == 1, 'C1', 'C2'))
+   local HomeC = EgtGetAxisHomePos( EgtIf( bIsFirstHead, 'C1', 'C2'))
-   local HomeB = EgtGetAxisHomePos( EgtIf( nSetHead == 1, 'B1', 'B2'))
+   local HomeB = EgtGetAxisHomePos( EgtIf( bIsFirstHead, 'B1', 'B2'))
    -- verifico se necessario ruotare la testa
    local bRot = ( abs( HomeC - CurrC) > 1 or abs( HomeB - CurrB) > 1)
    -- se necessario ruotare la testa, allargo i carrelli
@@ -1677,7 +1835,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
       ExecParkRoller( nil, nil, nil, nil, bMchSplit, bAgg)
    end
    -- se testa 1
-   if nSetHead == 1 then
+   if bIsFirstHead then
       -- se fresa o lama
       if GetHeadTCSet( EMT.HEAD, EMT.TCPOS) == 'Head1_TC1' then
          if not HeadIsChainSaw( EMT.HEAD) then
@@ -1764,9 +1922,6 @@ function ExecMoveZmax( bMchSplit, btoXHome)
                ShowToolInTcPos( EMT.TCPOS, true)
                -- nascondo l'utensile sulla testa
                EgtSetMode( EgtGetHeadId( EMT.HEAD or '') or GDB_ID.NULL, GDB_MD.HIDDEN)
-               EMT.PREVTOOL_H1 = nil
-               EMT.PREVHEAD_H1 = nil
-               EMT.PREVTCPOS_H1 = nil
                EMT.CHSAW_OUT = true
                EMT.XHOME = true
             end
@@ -2520,6 +2675,14 @@ function LoadNextTool( nHSet, sTcPosDef, bFirst)
    return sTool
 end
 
+---------------------------------------------------------------------
+function DeactivateProbeTool()
+   if Probe then
+      EgtSetMode( EgtGetHeadId( 'H19') or GDB_ID.NULL, GDB_MD.HIDDEN)
+      EgtSetMode( EgtGetHeadId( 'H29') or GDB_ID.NULL, GDB_MD.HIDDEN)
+   end
+end
+
 ---------------------------------------------------------------------
 --   *** ESTIMATION T&L ***
 ---------------------------------------------------------------------
@@ -2944,7 +3107,7 @@ function GetHeadSetFromTcPos( sTcPos)
    local TCPOS_2A = {}
    local TCPOS_2B = {}
    if EgtGetHeadId( 'H21') then
-      TCPOS_1A = { 'T1', 'T3', 'T4', 'T5', 'T6', 'T7', 'T8', 'T9', 'T10'}
+      TCPOS_1A = { 'T1', 'T3', 'T4', 'T5', 'T6', 'T7', 'T8', 'T9', 'T10', '501'}
       TCPOS_1B = { 'T101'}
       TCPOS_2A = { 'T11', 'T12', 'T13', 'T14', 'T15', 'T16', 'T17', 'T18', 'T19', 'T20'}
       TCPOS_2B = { 'T111'}
@@ -2952,7 +3115,7 @@ function GetHeadSetFromTcPos( sTcPos)
       TCPOS_1A = { 'T1', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7', 'T8', 'T9', 'T10'}
       TCPOS_1B = { 'T101', 'T201'}
       TCPOS_1C = { 'T301'}
-      TCPOS_2A = { 'T11', 'T12', 'T13', 'T14', 'T15', 'T16', 'T17', 'T18', 'T19', 'T20'}
+      TCPOS_2A = { 'T11', 'T12', 'T13', 'T14', 'T15', 'T16', 'T17', 'T18', 'T19', 'T20', '502'}
    end
    for _, sVal in ipairs( TCPOS_1A) do
       if sVal == sTcPos then return 1, 1 end

Common_ONE-PF.mlse

@@ -4,6 +4,12 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
+---------------------------------------------------------------------
+-- *** Generic Machinings ***
+---------------------------------------------------------------------
+require( 'EmtGenMachining')
+---------------------------------------------------------------------
+
 -- Carico libreria
 local BD = require( 'BeamData')
 
@@ -267,6 +273,13 @@ function OnSpecialMoveZup()
             EMC.MODIF = true
          end
       end
+   elseif HeadIsChainSaw( EMC.HEAD) then
+      EMC.TTOTLEN = EgtTdbGetCurrToolParam( MCH_TP.TOTLEN)
+      if EMC.TDIR[3] < -0.15 and EMC.L3 > - EMC.TTOTLEN then
+         EMC.L3 = EMC.TTOTLEN * EMC.TDIR[3]
+         -- dichiaro modificato
+         EMC.MODIF = true
+      end
    end
 end
 
@@ -737,8 +750,48 @@ function OnSpecialApplyMachining()
    -- Inizializzo codice di errore
    EMC.ERR = 0
    
-   -- Recupero la posizione della trave e dei carrelli al termine della precedente operazione
+   -- Recupero la precedente operazione
    local nPrevOpeId = EgtGetPrevActiveOperation( EMC.MCHID)
+
+   -- Se esiste lavorazione precedente ed è una tastatura
+   if nPrevOpeId and EgtGetOperationType( nPrevOpeId) == MCH_OY.PROBING then
+      -- se stessa testa e montato già utensile corretto
+      -- recupero valori assi alla fine della lavorazione precedente e all'inizio della corrente
+      local vPrevAxes = EmtGetFinalAxesPos( nPrevOpeId, true)
+      local vCurrAxes = EmtGetInitialAxesPos( EMC.MCHID, true)
+      -- info lavorazione precedente
+      EgtSetCurrMachining( nPrevOpeId)
+      local sPrevTool = EgtGetMachiningParam( MCH_MP.TOOL)
+      local sPrevHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
+      local nSetHead = GetHeadSet( sPrevHead)
+      local bPrevIsFirstHead = ( nSetHead == 1 or nSetHead == 11)
+      -- info lavorazione corrente
+      EgtSetCurrMachining( EMC.MCHID)
+      local sCurrTool = EgtGetMachiningParam( MCH_MP.TOOL)
+      local sCurrHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
+      nSetHead = GetHeadSet( sCurrHead)
+      local bCurrIsFirstHead = ( nSetHead == 1 or nSetHead == 11)
+
+      -- se utensile corrente è compatibile (significa che è già stato precaricato) se stessa testa e con stessa configurazioen assi rotanti, annullo risalita
+      if IsToolCompatibleWithProbe( sCurrTool, sPrevTool) and bPrevIsFirstHead == bCurrIsFirstHead and abs( vCurrAxes[4] - vPrevAxes[4]) < 1 and abs( vCurrAxes[5] - vPrevAxes[5]) < 1 then
+         -- in lavorazione precedente elimino eventuale retrazione a Zmax
+         EmtRemoveRise( nPrevOpeId)
+         -- in lavorazione corrente elimino eventuale approccio da Zmax
+         EmtRemoveClimb( EMC.MCHID)
+         -- prendo sempre la Z massima tra le due
+         local vClimbPoint
+         if vCurrAxes[3] - 1.0 < vPrevAxes[3] then
+            vClimbPoint = vCurrAxes
+            vCurrAxes[3] = vPrevAxes[3]
+         elseif vPrevAxes[3] - 1.0 < vCurrAxes[3] then
+            vClimbPoint = vPrevAxes
+            vPrevAxes[3] = vCurrAxes[3]
+         end
+         EmtAddClimb( EMC.MCHID, vClimbPoint, 4, 1, 0)
+      end
+   end
+
+   -- Recupero la posizione della trave e dei carrelli al termine della precedente operazione
    -- se precedente operazione non esiste, errore
    if not nPrevOpeId then
       EMC.ERR = 1
@@ -896,7 +949,6 @@ function OnSpecialApplyMachining()
       local vAxes = EmtGetAxesPos( nLastEntId)
       if #vAxes > 0 then EMC.TPOS = vAxes[1] end
    end
-
 end
 
 ---------------------------------------------------------------------
@@ -1174,6 +1226,17 @@ function SpecialCalcMachiningEncumbrance( nMchId, bPreCut)
    end
    -- Recupero testa
    local sHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
+   local sToolName = EgtTdbGetCurrToolParam( MCH_TP.NAME)
+   local nSetHead = GetHeadSet( sHead)
+   local bIsFirstHead = ( nSetHead == 1 or nSetHead == 11)
+
+   -- se lavorazione di tastatura, si considera montato utensile di default
+   if HeadIsProbe( sHead) then
+      local sOtherToolName = GetToolNameFromTcPos( EgtIf( bIsFirstHead, DefTcPos1, DefTcPos2))
+      local sOtherHeadTool, _ = GetToolHead( sOtherToolName)
+      EgtLoadTool( sOtherHeadTool, 1, sOtherToolName)
+   end
+
    -- Recupero valore assi macchina
    local nSecId = EgtGetNext( EgtGetFirstInGroup( nPathId))
    local vAxes = EmtGetAxesPos( nSecId)
@@ -1185,7 +1248,7 @@ function SpecialCalcMachiningEncumbrance( nMchId, bPreCut)
    -- Calcolo dell'ingombro della testa rispetto allo Zero Macchina
    local b3Enc
 
-   if sHead ~= 'H21' and sHead ~= 'H22' and sHead ~= 'H23' then
+   if bIsFirstHead then
       EgtSetAxisPos( 'C1', vAxes[4])
       EgtSetAxisPos( 'B1', vAxes[5])
       if sHead == 'H13' or sHead == 'H15' then
@@ -1219,6 +1282,7 @@ function SpecialCalcMachiningEncumbrance( nMchId, bPreCut)
    local dDistFront = - ptMax:getX() - LoadT - dHeadFront
    local dDistBack = ptMin:getX() + LoadT + EMC.LB - dHeadBack
    EgtOutLog( '  DistFront = ' .. EgtNumToString( dDistFront, 1) .. ' DistBack = ' .. EgtNumToString( dDistBack, 1), 3)
+
    return dDistFront, dDistBack, dRollFront, dRollBack
 end
 

Essetre-ONE.mlde

@@ -32,8 +32,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '3.1c2'
+PP_VER = '3.1f2'
-PP_NVER = '3.1.3.2'
+PP_NVER = '3.1.6.2'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = EgtGetCurrMachineName()
 
@@ -163,7 +163,8 @@ if EgtExistsFile( sData) then
          end
          if Machine.Offsets.X1_POS then MinX1 = -Machine.Offsets.X1_POS end
          if Machine.Offsets.X1_NEG then MaxX1 = -Machine.Offsets.X1_NEG end
-         if Machine.Offsets.PARK_X1 then ParkX1 = -Machine.Offsets.PARK_X1 end
+         if Machine.Offsets.PARK_X1POS then ParkFrnX1 = -Machine.Offsets.PARK_X1POS end
+         if Machine.Offsets.PARK_X1NEG then ParkX1 = -Machine.Offsets.PARK_X1NEG end
          if Machine.Offsets.Z1_NEG then MinZ1 = Machine.Offsets.Z1_NEG end
          if Machine.Offsets.Z1_POS then MaxZ1 = min( MaxZ1, Machine.Offsets.Z1_POS) end
          if Machine.Offsets.PARK_Z1 then ParkZ1 = Machine.Offsets.PARK_Z1 end
@@ -227,6 +228,7 @@ if EgtExistsFile( sData) then
          ParkV2 = MinV2
          ParkY2 = ParkV2 - MinDeltaYV
          ParkX1 = min( ParkX1, MaxX1)
+         ParkFrnX1 = max( ParkFrnX1, MinX1)
          ParkCSawZ1 = min( ParkCSawZ1, MaxZ1)
          ParkCSaw0Z1 = min( ParkCSaw0Z1, MaxZ1)
          Mortiser = ( Mortiser and not Progress)
@@ -852,10 +854,14 @@ end
 ---------------------------------------------------------------------
 -------------------------- Testa utilizzata -------------------------
 function GetHeadSet( sHead)
-   if sHead == 'H11' or sHead == 'H12' or sHead == 'H13' or sHead == 'H15' then
+   if sHead == 'H11' or sHead == 'H12' or sHead == 'H13' or sHead == 'H15' or sHead == 'H17' then
       return 1
+   elseif sHead == 'H19' then
+      return 11
    elseif sHead == 'H21' or sHead == 'H22' or sHead == 'H23' then
       return 2
+   elseif sHead == 'H29' then
+      return 21
    else
       return 0
    end
@@ -884,6 +890,7 @@ function GetHeadTCSet( sHead, sTcPos)
       return 0
    end
 end
+
 ---------------------------------------------------------------------
 -- Funzione che restituisce l'altezza del pezzo in lavorazione
    function GetRawHeight()
@@ -903,6 +910,12 @@ function HeadIsChainSaw( sHead)
    return ( sHead == 'H13' or sHead == 'H15')
 end
 
+---------------------------------------------------------------------
+-- Funzione che riconosce testa per tastatore
+function HeadIsProbe( sHead)
+   return ( sHead == 'H19' or sHead == 'H29')
+end
+
 ---------------------------------------------------------------------
 -- Funzione che calcola la posizione Home di Z per la sega a catena dal valore dell'asse virtuale
 function GetChainSawZHomeFromVirtualAxis( dPosA)

UpdateLog.txt

@@ -1,10 +1,12 @@
            ==== Common_ONE-PF Update Log ====
 
+Versione 3.1f1 (03/06/2026)
+- (NGE-MLDE-GEN-SIM) Versione unificata con predisposizione per gestione tastatori. Serve modificare anche la macchina, per ora gestione completa solo su PFrl.
+
 Versione 3.1c2 (17/03/2026)
 - (SIM-GEN) Aggiunta OnSpecialApplyMachining per calcolare i carrelli da subito
 -           Aggiungendo OnSpecialApplyMachining, ora la OnSpecialGetPrevMachiningOffset lavora correttamente. ATT: MIN_MACH -> 3.1b2
 
-
 Versione 3.1c1 (04/03/2026)
 - (GEN) Corretta chiamata di una variabile insesistente in caso di ONE
 - (SIM) Allineata simulazione a generazione

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_ONE-PF',            -- nome script PP standard
-   VERSION = '3.1c2',                 -- versione script
+   VERSION = '3.1f1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '3.1b2'   -- versione minima kernel
 }