Merge branch 'hotfix/AdjustHomeMovement'

Common_ONE-PF.NUM.mlpe

@@ -1152,7 +1152,9 @@ function OnRapid()
          if EMT.TO_XHOME then
             local nHSet = GetHeadSet( EMT.HEAD)
             local nPrevHSet = GetHeadSet( EMT.PREVHEAD)
-            if EMT.PREVHEAD == 'H12' or EMT.PREVHEAD == 'H22' then
+
+            -- vado in parcheggio sempre con utensile precedente
+            if not HeadIsChainSaw( EMT.PREVHEAD) then
                if nPrevHSet == 1 then
                   local HomeX1 = EgtGetAxisHomePos( 'X1')
                   EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
@@ -1164,6 +1166,16 @@ function OnRapid()
                   EmitMoveStartHead( 2, 'EA1')
                   EmitMoveWaitHead( 2)
                end
+            else
+               if GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC1' or GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC2' then
+                  EmitMoveDataHead( 1, { X=-ParkCSawX1S, Z=MaxZ1, B=HomeR2, C=HomeR1, TPos='50'})
+                  EmitMoveStartHead( 1, 'EA1')
+                  --EmitMoveWaitHead( 1)
+               else
+                  EmitMoveDataHead( 2, { X=-ParkCSawX2S, Z=MaxZ2, B=HomeR2, C=HomeR1, TPos='50'})
+                  EmitMoveStartHead( 2, 'EA1')
+                  --EmitMoveWaitHead( 2)
+               end
             end
 
             EMT.TO_XHOME = nil
@@ -2744,7 +2756,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             local MovH = { X = -dXPos, Z = EMT.L3o, B = PrevR2, C = PrevR1}
             EmitMoveDataHead( 1, MovH)
             EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
-            if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
+            if EMT.R3 and abs( EMT.R3) < 0.1 then
                EmitMoveDataHead( 1, { Z=ParkCSawZ1})
             end
             EmitMoveDataHead( 1, { X=-dSafeX1, C=dSafeC1})
@@ -2789,7 +2801,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             local MovH = { X = -dXPos, Z = EMT.L3o, B = PrevR2, C = PrevR1}
             EmitMoveDataHead( 1, MovH)
             EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
-            if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
+            if EMT.R3 and abs( EMT.R3) < 0.1 then
                EmitMoveDataHead( 1, { Z=ParkCSawZ1})
             end
             EmitMoveDataHead( 1, { X=-dSafeX1, C=dSafeC1})
@@ -2846,7 +2858,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
          local MovH = { X = -dXPos, Z = EMT.L3o, B = PrevR2, C = PrevR1}
          EmitMoveDataHead( 2, MovH)
          EmitMoveDataHead( 2, { Z=dSafeZ2, B=dSafeB2})
-         if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
+         if EMT.R3 and abs( EMT.R3) < 0.1 then
             EmitMoveDataHead( 2, { Z=ParkCSawZ2})
          end
          EmitMoveDataHead( 2, { X=-dSafeX2, C=dSafeC2})

Common_ONE-PF.mlpe

@@ -1650,7 +1650,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
          -- altrimenti sega a catena
          else
             SimulMoveAxes( 'Z1', HomeZ, MCH_SIM_STEP.RAPID, 'B1', HomeB, MCH_SIM_STEP.COLLROT)
-            if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
+            if EMT.R3 and abs( EMT.R3) < 0.1 then
                SimulMoveAxis( 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID)
             end
             SimulMoveAxes( 'X1', HomeX, MCH_SIM_STEP.RAPID, 'C1', HomeC, MCH_SIM_STEP.COLLROT)
@@ -1675,7 +1675,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
          -- altrimenti sega a catena
          else
             SimulMoveAxes( 'Z1', HomeZ, MCH_SIM_STEP.RAPID, 'B1', HomeB, MCH_SIM_STEP.COLLROT)
-            if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
+            if EMT.R3 and abs( EMT.R3) < 0.1 then
                SimulMoveAxis( 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID)
             end
             if btoXHome then
@@ -1712,7 +1712,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
    -- altrimenti sega a catena
       else
          SimulMoveAxes( 'Z2', HomeZ, MCH_SIM_STEP.RAPID, 'B2', HomeB, MCH_SIM_STEP.COLLROT)
-         if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
+         if EMT.R3 and abs( EMT.R3) < 0.1 then
             SimulMoveAxis( 'Z2', ParkCSawZ2, MCH_SIM_STEP.RAPID)
          end
          SimulMoveAxes( 'X2', HomeX, MCH_SIM_STEP.RAPID, 'C2', HomeC, MCH_SIM_STEP.COLLROT)

UpdateLog.txt

@@ -1,5 +1,11 @@
            ==== Common_ONE-PF Update Log ====
 
+Versione 2.6j3 (21/10/2024)
+- (GEN) Se richiesto movimento in home, si scrive sempre parcheggio in home dell'utensile precedente. Prima si scriveva solo per lama.
+
+Versione 2.6j2 (17/10/2024)
+- (SIM-GEN) Se motosega prelevata con A=0, alla fine la si porta sempre alla quota ZMAX, indipendentemente dall'altezza trave che era fissata a 650mm. Ora lo fa sempre.
+
 Versione 2.6j1 (08/10/2024)
 - (SIM-GEN) Corretto primo movimento di approccio al pezzo. Ticket#2093
 - (SIM-GEN) Corretto movimento in Home in caso di lama e movimento rulliera di carico. Ticket#2054

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_ONE-PF',            -- nome script PP standard
-   VERSION = '2.6j1',                 -- versione script
+   VERSION = '2.6j3',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }