From 48146a33e75cd66746717083305aabf4ee5c00bd Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 1 Nov 2016 19:07:27 +0000 Subject: [PATCH] EgtInterface 1.6w1 : - aggiornata interfaccia di EgtSimGetAxisInfoPos per parametro tipo asse aggiunto. --- API_MachMgr.cpp | 14 ++++++++------ EgtInterface.rc | Bin 11726 -> 11726 bytes 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/API_MachMgr.cpp b/API_MachMgr.cpp index 18516c2..76f6eff 100644 --- a/API_MachMgr.cpp +++ b/API_MachMgr.cpp @@ -1265,15 +1265,17 @@ __stdcall EgtSimHome( void) //----------------------------------------------------------------------------- BOOL -__stdcall EgtSimGetAxisInfoPos( int nI, wchar_t*& wsName, double* pdVal) +__stdcall EgtSimGetAxisInfoPos( int nI, wchar_t*& wsToken, BOOL* pbLinear, double* pdVal) { - if ( &wsName == nullptr || pdVal == nullptr) + if ( &wsToken == nullptr || pbLinear == nullptr || pdVal == nullptr) return FALSE ; - string sName ; - if ( ! ExeSimGetAxisInfoPos( nI, sName, *pdVal)) + string sToken ; + bool bLinear ; + if ( ! ExeSimGetAxisInfoPos( nI, sToken, bLinear, *pdVal)) return FALSE ; - wsName = _wcsdup( stringtoW( sName)) ; - return (( wsName == nullptr) ? FALSE : TRUE) ; + wsToken = _wcsdup( stringtoW( sToken)) ; + *pbLinear = ( bLinear ? TRUE : FALSE) ; + return (( wsToken == nullptr) ? FALSE : TRUE) ; } //----------------------------------------------------------------------------- diff --git a/EgtInterface.rc b/EgtInterface.rc index bda444d4cebe02251c949a10f5826162b981b6d6..8b46f05eaa8dfd63443aedd89c945404c880f329 100644 GIT binary patch delta 137 zcmX>XeJ*;#4>nd~1|0^&%@4(HGEKh5nZsPpU^w|Br|x7gC5z2{Qc{eYk8tZS!xf!m qn!Hc20;XuQmy#Fb<_*F~3S60Cl28-eSWq?dOkSr5w*_cG3pW5&3@kMO delta 137 zcmX>XeJ*;#4>ndK1|0^A%@4(HGEKh5nZsPhU@`e4r|x7gC5z2{Qc{eYk8tZS!xf!m qn!Hc20;XuQmy#Fb<_*F~3S60Cl28-eSWq?dOkSr5w*_cG3pW5^kSt{Y