From eb4ad988bf5447a73e19433209eb6f3766112cd9 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 20 Mar 2019 07:51:01 +0000
Subject: [PATCH] EgtExecutor 2.1c3 : - in Exe e Lua SetAxisPos restituisce la
 posizione effettivamente raggiunta dall'asse.

---
 EXE_MachMgr.cpp |   4 ++--
 EgtExecutor.rc  | Bin 16176 -> 16176 bytes
 LUA_MachMgr.cpp |   6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index fedbc89..adffdb7 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -2913,12 +2913,12 @@ ExeGetAllTablesNames( STRVECTOR& vNames)
 
 //-----------------------------------------------------------------------------
 bool
-ExeSetAxisPos( const string& sAxis, double dVal)
+ExeSetAxisPos( const string& sAxis, double dVal, double* pdNewVal)
 {
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
    VERIFY_MACHMGR( pMachMgr, false)
   // metto l'asse nella nuova posizione
-   return pMachMgr->SetAxisPos( sAxis, dVal) ;
+   return pMachMgr->SetAxisPos( sAxis, dVal, pdNewVal) ;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 93945d579b6f59d19261daa88c0c6ca831f76ede..0dae6264ed06cb826eb46d0407fc01c18c98d91b 100644
GIT binary patch
delta 79
zcmdl`x1nysFE&Qw&A-`PnSqoe*K!sx?>N)s4T4pS#*-bnk~jAW*?>e(i-FY$N+HxV
MD8kglDP58Q0D5;DV*mgE

delta 79
zcmdl`x1nysFE&P_&A-`PnSqoe*K!sx?>N)s4T4pSMw1=6k~jAW*?>e(i-FY$N+HxV
MD8kglDP58Q0C_7LTL1t6

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index ed8227e..3270447 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -3341,10 +3341,12 @@ LuaSetAxisPos( lua_State* L)
    LuaCheckParam( L, 2, dVal)
    LuaClearStack( L) ;
   // metto l'asse nella nuova posizione
-   bool bOk = ExeSetAxisPos( sAxis, dVal) ;
+   double dNewVal = dVal ;
+   bool bOk = ExeSetAxisPos( sAxis, dVal, &dNewVal) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
-   return 1 ;
+   LuaSetParam( L, dNewVal) ;
+   return 2 ;
 }
 
 //-------------------------------------------------------------------------------