From 799b5aead70ed37bd7010cd29684e43275dc2ade Mon Sep 17 00:00:00 2001
From: "andrea.villa" <andrea.villa@egalware.com>
Date: Mon, 25 May 2026 17:35:52 +0200
Subject: [PATCH] Corretto reset piano generico

---
 Common_ONE-PF.NUM.mlpe | 12 +++++++-----
 Essetre-ONE.mlde       |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Common_ONE-PF.NUM.mlpe b/Common_ONE-PF.NUM.mlpe
index 730ff66..a57f6ac 100644
--- a/Common_ONE-PF.NUM.mlpe
+++ b/Common_ONE-PF.NUM.mlpe
@@ -890,11 +890,6 @@ function OnRapid()
             -- dichiaro che è un movimento standard
             bStdMachRapid = true
          else
-            
-            MyAdjustLinearAxes()
-            EmtAdjustRotaryAxes()
-            EmtResetPrev()
-
             if bStdMachRapid then
                bStdMachRapid = false
                bStdClimb = true
@@ -904,6 +899,11 @@ function OnRapid()
             if EMT.PLANEACTIVE  then
                EmitResetMachining( false)
             end
+
+            MyAdjustLinearAxes()
+            EmtAdjustRotaryAxes()
+            EmtResetPrev()
+
             EmtOutput( '( *** '..EMT.MCHNAME..'/'..EMT.TOOL..' *** )')
             -- eventuale movimento carrelli
             for i = 1, #EMT.AUXCMD do
@@ -2296,6 +2296,8 @@ function EmitResetMachining( bNextTool)
       EmtOutput( 'G157 EA1')
       -- piano non più attivo
       EMT.PLANEACTIVE = false
+      EMT.REFLOC = nil
+      EMT.IPLGL = false
    end
 end
 
diff --git a/Essetre-ONE.mlde b/Essetre-ONE.mlde
index ce40f14..0f8b632 100644
--- a/Essetre-ONE.mlde
+++ b/Essetre-ONE.mlde
@@ -32,7 +32,7 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '3.1e1_NL6'
+PP_VER = '3.1e1_NL7'
 PP_NVER = '3.1.3.2'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = EgtGetCurrMachineName()