diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 8852f20..9bae9a1 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -2075,12 +2075,12 @@ ExeSimHome( void) //----------------------------------------------------------------------------- bool -ExeSimGetAxisInfoPos( int nI, string& sName, double& dVal) +ExeSimGetAxisInfoPos( int nI, string& sToken, bool& bLinear, double& dVal) { IMachMgr* pMachMgr = GetCurrMachMgr() ; VERIFY_MACHMGR( pMachMgr, false) - // recupero stringa con quote degli assi attivi - return pMachMgr->SimGetAxisInfoPos( nI, sName, dVal) ; + // recupero stringa con info asse di simulazione + return pMachMgr->SimGetAxisInfoPos( nI, sToken, bLinear, dVal) ; } //----------------------------------------------------------------------------- diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 31f5bbf..e6cb12e 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 5a0cc51..e9de761 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -2245,19 +2245,22 @@ LuaSimGetAxisInfoPos( lua_State* L) LuaCheckParam( L, 1, nInd) LuaClearStack( L) ; // calcolo nome e posizione dell'asse - string sName ; + string sToken ; + bool bLinear ; double dVal ; - bool bOk = ExeSimGetAxisInfoPos( nInd, sName, dVal) ; + bool bOk = ExeSimGetAxisInfoPos( nInd, sToken, bLinear, dVal) ; // restituisco il risultato if ( bOk) { - LuaSetParam( L, sName) ; + LuaSetParam( L, sToken) ; + LuaSetParam( L, bLinear) ; LuaSetParam( L, dVal) ; } else { LuaSetParam( L) ; LuaSetParam( L) ; + LuaSetParam( L) ; } - return 2 ; + return 3 ; } //-------------------------------------------------------------------------------