From 5a5ed4e1d72015f59a871537afef5cfe9089a2cd Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Mon, 21 Oct 2024 16:58:27 +0200
Subject: [PATCH] Allineamento con common ver. 2.6j3

---
 Common_ONE-PF.NUM.mlpe | 14 +++++++++++++-
 Essetre-ONErl.mlde     |  4 ++--
 UpdateLog.txt          |  3 +++
 Version.lua            |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Common_ONE-PF.NUM.mlpe b/Common_ONE-PF.NUM.mlpe
index 930f6a7..b7261e6 100644
--- a/Common_ONE-PF.NUM.mlpe
+++ b/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
diff --git a/Essetre-ONErl.mlde b/Essetre-ONErl.mlde
index 9cb0367..063e26d 100644
--- a/Essetre-ONErl.mlde
+++ b/Essetre-ONErl.mlde
@@ -8,8 +8,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6j3'
-PP_NVER = '2.6.10.3'
+PP_VER = '2.6j4'
+PP_NVER = '2.6.10.4'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-ONErl'
 
diff --git a/UpdateLog.txt b/UpdateLog.txt
index 6ca0d17..d124cf5 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,5 +1,8 @@
            ==== 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.
 
diff --git a/Version.lua b/Version.lua
index bd52fee..d9b398a 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_ONE-PF',            -- nome script PP standard
-   VERSION = '2.6j2',                 -- versione script
+   VERSION = '2.6j3',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }