From bec82b4b5d34fd3024d2d7a9fbb99b125b71c815 Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Fri, 30 Jan 2026 13:14:02 +0100
Subject: [PATCH] Allineamento con common ver.3.1a2

---
 Common_PF1250.TPA.mlpe      | 1 +
 Common_PF1250.mlpe          | 6 ++++++
 Essetre-PF1500MAXrl-3T.mlde | 4 ++--
 UpdateLog.txt               | 5 +++++
 Version.lua                 | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Common_PF1250.TPA.mlpe b/Common_PF1250.TPA.mlpe
index 3184522..a44c01a 100644
--- a/Common_PF1250.TPA.mlpe
+++ b/Common_PF1250.TPA.mlpe
@@ -538,6 +538,7 @@ function OnMachiningEnd()
                local sEnd= 'M113 P1='..tostring( EMT.PRODID)..' P2='..tostring( EMT.PATTID)..' P3='..tostring( EMT.CUTID)..' P4=2' 
                MyOutput( sEnd)
             end
+            EMT.FALL = nil
          elseif not EMT.PREROT then
             MyOutput( 'M77')
          end
diff --git a/Common_PF1250.mlpe b/Common_PF1250.mlpe
index 579e440..f96cdd4 100644
--- a/Common_PF1250.mlpe
+++ b/Common_PF1250.mlpe
@@ -1302,6 +1302,12 @@ function OnSimulMoveStart()
             local sErr = 'Z1 Z2 tools in collision (distance=' .. EgtNumToString( dDistToolZ1Z2, 1) .. ')'
             EmtSetLastError( 1208, sErr)
          end
+         if EMT.ZMAX or ( EMT.FLAG == 2 and EMT.FLAG2 == 1) then
+            local B2Home = EgtGetAxisHomePos( 'B2')
+            local C2Home = EgtGetAxisHomePos( 'C2')
+            SimulMoveAxes( 'X2', SafeX2, MCH_SIM_STEP.RAPID, 'C2', C2Home, MCH_SIM_STEP.RAPROT, 'B2', B2Home, MCH_SIM_STEP.RAPROT)
+            SimulMoveAxis( 'X2', X2, MCH_SIM_STEP.RAPID)
+         end
       end
    end
    -- se necessario ...
diff --git a/Essetre-PF1500MAXrl-3T.mlde b/Essetre-PF1500MAXrl-3T.mlde
index 671e1bd..40fcf46 100644
--- a/Essetre-PF1500MAXrl-3T.mlde
+++ b/Essetre-PF1500MAXrl-3T.mlde
@@ -5,8 +5,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '3.1a1'
-PP_NVER = '3.1.1.1'
+PP_VER = '3.1a2'
+PP_NVER = '3.1.1.2'
 MIN_MACH_VER = '2.7d2'
 MACH_NAME = EgtGetCurrMachineName()
 
diff --git a/UpdateLog.txt b/UpdateLog.txt
index 09cb88b..0440c9d 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,4 +1,9 @@
            ==== Common_PF1250 Update Log ====
+
+Versione 3.1a2 (30/01/2026)
+- (SIM) Allineato approccio simulazione a generazione in caso di lavorazione in doppio verticale. Ticket#2781
+- (GEN) Simulazione non allineata a generazione. Mancava reset flag di pezzo a caduta. Ticket#2798
+
 Versione 3.1a1 (16/01/2026)
 - (SIM-GEN) Corretto movimento di approccio con sega a catena e allineati Simulazione e Generazione. Ticket#2771
 
diff --git a/Version.lua b/Version.lua
index d69c240..17e5e98 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_PF1250',            -- nome script PP standard
-   VERSION = '3.1a1',                 -- versione script
+   VERSION = '3.1a2',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.7k1'   -- versione minima kernel
 }