diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index b7d6f39..4241b80 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/Simulator.cpp b/Simulator.cpp index f9ceaa3..e1e9655 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -178,6 +178,24 @@ Simulator::GetAxisInfoPos( int nI, string& sName, string& sToken, bool& bLinear, // recupero i dati dell'asse if ( nI < 0 || nI >= nAxisCount + nAuxAxisCount) return false ; + // se asse ausiliario, verifico non coincida con uno attivo + if ( nI >= nAxisCount) { + while ( nI < nAxisCount + nAuxAxisCount) { + bool bFound = false ; + for ( int j = 0 ; j < nAxisCount ; ++ j) { + if ( m_AuxAxesName[ nI - nAxisCount] == m_AxesName[j]) { + bFound = true ; + break ; + } + } + if ( bFound) + ++ nI ; + else + break ; + } + if ( nI >= nAxisCount + nAuxAxisCount) + return false ; + } if ( nI < nAxisCount) { sName = m_AxesName[nI] ; sToken = m_AxesToken[nI] ;