Corretto emissione SPEED dopo G145 in G141 successiva

Common_ONE-PF.NUM.mlpe

@@ -840,11 +840,11 @@ function OnRapid()
             EMT.L3 = EMT.L3s
          end
       end
+      local Speed = EMT.S * EgtIf( EMT.HEAD ~= 'H12' and EMT.HEAD ~= 'H22', 1, 1.65)
       -- se prima lavorazione
       if EMT.LOAD then
          EMT.V2POS = ParkV2
          -- primo posizionamento
-         local Speed = EMT.S * EgtIf( EMT.HEAD ~= 'H12' and EMT.HEAD ~= 'H22', 1, 1.65)
          local bOnlyCharY = true
          -- eventuale Movimento Pinze
          for i = 1, #EMT.AUXCMD do
@@ -1254,7 +1254,6 @@ function OnRapid()
             local HomeC1 = EgtGetAxisHomePos( 'C1')
             local HomeB1 = EgtGetAxisHomePos( 'B1')
             local dTRad, dTLen = GetToolRadLen()
-            local Speed = EMT.S * EgtIf( EMT.HEAD ~= 'H12' and EMT.HEAD ~= 'H22', 1, 1.65)
             if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                -- se fresa o lama
                if not HeadIsChainSaw( EMT.HEAD) then
@@ -1353,7 +1352,6 @@ function OnRapid()
                local HomeC1 = EgtGetAxisHomePos( 'C1')
                local HomeB1 = EgtGetAxisHomePos( 'B1')
                local dTRad, dTLen = GetToolRadLen()
-               local Speed = EMT.S * EgtIf( EMT.HEAD ~= 'H12' and EMT.HEAD ~= 'H22', 1, 1.65)
                if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                   -- se fresa o lama
                   if not HeadIsChainSaw( EMT.HEAD) then
@@ -1417,7 +1415,6 @@ function OnRapid()
                local HomeC2 = EgtGetAxisHomePos( 'C2')
                local HomeB2 = EgtGetAxisHomePos( 'B2')
                local dTRad, dTLen = GetToolRadLen()
-               local Speed = EMT.S * EgtIf( EMT.HEAD ~= 'H12' and EMT.HEAD ~= 'H22', 1, 1.65)
                if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
                   -- se fresa o lama
                   if not HeadIsChainSaw( EMT.HEAD) then
@@ -1542,11 +1539,11 @@ function OnRapid()
          if AreSameVectorApprox( vtE, Y_AX()) then
             ProbePosX = -( EMT.TABORI1[2] + EMT.HB + dSecDistProbe + dLenProbe + MillOffs)
             ProbePosZ = EMT.TABORI1[3] - MillOffs + ( EMT.SB / 2) + EgtIf( EMT.R2 > 0, dOffHeadProbe, -dOffHeadProbe)
-            sFace = 2
+            sFace = EgtIf( BD.RIGHT_LOAD, 4, 2)
          elseif AreSameVectorApprox( vtE, -Y_AX()) then
             ProbePosX = -( EMT.TABORI1[2] - dSecDistProbe - dLenProbe - MillOffs)
             ProbePosZ = EMT.TABORI1[3] - MillOffs + ( EMT.SB / 2) + EgtIf( EMT.R2 > 0, dOffHeadProbe, -dOffHeadProbe)
-            sFace = 4
+            sFace = EgtIf( BD.RIGHT_LOAD, 2, 4)
          elseif AreSameVectorApprox( vtE, Z_AX()) then
             ProbePosX = -( EMT.TABORI1[2] + ( EMT.HB / 2) + dOffHeadProbe)
             ProbePosZ = EMT.TABORI1[3] + EMT.SB + dSecDistProbe + dLenProbe
@@ -1559,14 +1556,14 @@ function OnRapid()
          EmitMoveStartHead( GetHeadSet( EMT.HEAD))
          EmitMoveWaitHead( GetHeadSet( EMT.HEAD))
          local sProbeHead = ' ET' .. GetHeadSet( EMT.HEAD)
-         EmtOutput( 'G145 Z-10 EF'..sFace..sProbeHead)
+         EmtOutput( 'G145 Z-20 EF'..sFace..sProbeHead)
          -- 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
          elseif AreSameVectorApprox( vtE, Z_AX()) then
             ProbePosX = EMT.L2
          end
-         EmitMoveDataHead( GetHeadSet( EMT.HEAD), { X=ProbePosX, Z=ProbePosZ, B=EMT.R2, C=EMT.R1})
+         EmitMoveDataHead( GetHeadSet( EMT.HEAD), { X=ProbePosX, Z=ProbePosZ, B=EMT.R2, C=EMT.R1, S=Speed})
          EmitMoveStartHead( GetHeadSet( EMT.HEAD))
          EmitMoveWaitHead( GetHeadSet( EMT.HEAD))
       end

Essetre-PFrl.mlde

@@ -44,10 +44,10 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.7f1_DEV5'
+PP_VER = '2.7f1_DEV9'
 PP_NVER = '2.7.6.1'
 MIN_MACH_VER = '2.5k1'
-MACH_NAME = 'Essetre-PFrl'
+MACH_NAME = string.match( EgtGetCurrMachineDir(), "[^\\]+$")  -- si ricava il nome della macchina dal direttorio
 
 -- Carico i dati globali
 local sMachDir = EgtGetCurrMachineDir()