diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index ef876b8..127f1a1 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -2291,6 +2291,16 @@ ExeGetHeadId( const string& sHead) return pMachMgr->GetHeadId( sHead) ; } +//----------------------------------------------------------------------------- +bool +ExeGetAxisToken( const string& sAxis, string& sToken) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero il token dell'asse + return pMachMgr->GetAxisToken( sAxis, sToken) ; +} + //----------------------------------------------------------------------------- bool ExeSetAxisPos( const string& sAxis, double dVal) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 05192cd..e749188 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index e9de761..5d4895b 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -2646,6 +2646,25 @@ LuaGetHeadId( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaGetAxisToken( lua_State* L) +{ + // 1 parametro : sAxis + string sAxis ; + LuaCheckParam( L, 1, sAxis) + LuaClearStack( L) ; + // recupero il token dell'asse + string sToken ; + bool bOk = ExeGetAxisToken( sAxis, sToken) ; + // restituisco il risultato + if ( bOk) + LuaSetParam( L, sToken) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaSetAxisPos( lua_State* L) @@ -2940,6 +2959,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableId", LuaGetTableId) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisId", LuaGetAxisId) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetHeadId", LuaGetHeadId) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisToken", LuaGetAxisToken) ; // Machine Calc bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTable", LuaSetCalcTable) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTool", LuaSetCalcTool) ;