From cdbb04441bec78cd191483fed201d54529db621d Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Tue, 23 Jul 2024 10:33:46 +0200
Subject: [PATCH] =?UTF-8?q?Se=20motosega=20allineata=20ad=20asse=20B=20per?=
 =?UTF-8?q?=20tagli=20di=20fianco,=20corretto=20movimento=20che=20manda=20?=
 =?UTF-8?q?testa=20a=20parcheggio.=20Pezzi=20pi=C3=B9=20alti=20di=20650=20?=
 =?UTF-8?q?va=20solo=20in=20Zmax.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Common_ONE-PF.NUM.mlpe | 6 +++---
 Common_ONE-PF.mlpe     | 6 +++---
 UpdateLog.txt          | 3 +++
 Version.lua            | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Common_ONE-PF.NUM.mlpe b/Common_ONE-PF.NUM.mlpe
index adf6e18..45b4565 100644
--- a/Common_ONE-PF.NUM.mlpe
+++ b/Common_ONE-PF.NUM.mlpe
@@ -2583,7 +2583,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             EmitMoveDataHead( 1, MovH)
             EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
             if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
-               EmitMoveDataHead( 1, { Z=ParkCSawZ1, B=ParkB1})
+               EmitMoveDataHead( 1, { Z=ParkCSawZ1})
             end
             EmitMoveDataHead( 1, { X=-dSafeX1, C=dSafeC1})
             if bXhome then
@@ -2624,7 +2624,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
             EmitMoveDataHead( 1, MovH)
             EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
             if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
-               EmitMoveDataHead( 1, { Z=ParkCSawZ1, B=ParkB1})
+               EmitMoveDataHead( 1, { Z=ParkCSawZ1})
             end
             EmitMoveDataHead( 1, { X=-dSafeX1, C=dSafeC1})
             if bXhome then
@@ -2677,7 +2677,7 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
          EmitMoveDataHead( 2, MovH)
          EmitMoveDataHead( 2, { Z=dSafeZ2, B=dSafeB2})
          if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
-            EmitMoveDataHead( 2, { Z=ParkCSawZ2, B=ParkB2})
+            EmitMoveDataHead( 2, { Z=ParkCSawZ2})
          end
          EmitMoveDataHead( 2, { X=-dSafeX2, C=dSafeC2})
          if bXhome then
diff --git a/Common_ONE-PF.mlpe b/Common_ONE-PF.mlpe
index 8bc105e..5a2cdbd 100644
--- a/Common_ONE-PF.mlpe
+++ b/Common_ONE-PF.mlpe
@@ -1574,7 +1574,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
          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
-               SimulMoveAxes( 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID, 'B1', ParkB1, MCH_SIM_STEP.COLLROT)
+               SimulMoveAxis( 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID)
             end
             SimulMoveAxes( 'X1', HomeX, MCH_SIM_STEP.RAPID, 'C1', HomeC, MCH_SIM_STEP.COLLROT)
          end
@@ -1598,7 +1598,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
          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
-               SimulMoveAxes( 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID, 'B1', ParkB1, MCH_SIM_STEP.COLLROT)
+               SimulMoveAxis( 'Z1', ParkCSawZ1, MCH_SIM_STEP.RAPID)
             end
             if btoXHome then
                EgtUnloadTool( EMT.HEAD, 1)
@@ -1633,7 +1633,7 @@ function ExecMoveZmax( bMchSplit, btoXHome)
       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
-            SimulMoveAxes( 'Z2', ParkCSawZ2, MCH_SIM_STEP.RAPID, 'B2', ParkB2, MCH_SIM_STEP.COLLROT)
+            SimulMoveAxis( 'Z2', ParkCSawZ2, MCH_SIM_STEP.RAPID)
          end
          SimulMoveAxes( 'X2', HomeX, MCH_SIM_STEP.RAPID, 'C2', HomeC, MCH_SIM_STEP.COLLROT)
       end
diff --git a/UpdateLog.txt b/UpdateLog.txt
index 355d28f..071f4b9 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,5 +1,8 @@
            ==== Common_ONE-PF Update Log ====
 
+Versione 2.6-- (--/--/2024)
+- (SIM-GEN) Se motosega allineata ad asse B per tagli di fianco, corretto movimento che manda testa a parcheggio. Pezzi più alti di 650 va solo in Zmax. Ticket#1943
+
 Versione 2.6g4 (19/07/2024)
 - (SIM-GEN) Aumentato numero iterazioni per scambio carrelli (da 5 a 10), per pezzi lunghi 30m.
 
diff --git a/Version.lua b/Version.lua
index d878c99..225fde7 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.6g4',                 -- versione script
+   VERSION = '2.6--',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }