diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 43ff634..6a0e82b 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgr.h b/MachMgr.h index 51f6045..4414281 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -293,6 +293,7 @@ class MachMgr : public IMachMgr int GetHeadId( const std::string& sHead) const override ; int GetHeadExitCount( const std::string& sHead) const override ; bool GetAxisToken( const std::string& sAxis, std::string& sToken) const override ; + bool GetAxisType( const std::string& sAxis, bool& bLinear) const override ; bool SetAxisPos( const std::string& sAxis, double dVal) override ; bool GetAxisPos( const std::string& sAxis, double& dVal) const override ; bool GetAxisHomePos( const std::string& sAxis, double& dHomeVal) const override ; diff --git a/MachMgrMachines.cpp b/MachMgrMachines.cpp index 8da6e54..dd53656 100644 --- a/MachMgrMachines.cpp +++ b/MachMgrMachines.cpp @@ -242,6 +242,15 @@ MachMgr::GetAxisToken( const string& sAxis, string& sToken) const return ( ( pMch != nullptr) ? pMch->GetAxisToken( sAxis, sToken) : false) ; } +//---------------------------------------------------------------------------- +bool +MachMgr::GetAxisType( const string& sAxis, bool& bLinear) const +{ + Machine* pMch = GetCurrMachine() ; + // restituisco il tipo dell'asse indicato nella macchina corrente + return ( ( pMch != nullptr) ? pMch->GetAxisType( sAxis, bLinear) : false) ; +} + //---------------------------------------------------------------------------- bool MachMgr::SetAxisPos( const string& sAxis, double dVal)