From 3660ddbf5a96b51ab228003f77306bd57ce30855 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 26 Apr 2017 16:30:01 +0000
Subject: [PATCH] EgtMachKernel 1.8d8 : - miglioria a SimGetAxisInfoPos per
 evitare di ripetere assi tra attivi e ausiliari.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Simulator.cpp    |  18 ++++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index b7d6f397405a47737fa25bcb3a4cfd3a315c07a4..4241b80457f248b7b4c8d6af6ff5792a13410952 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&Pt&A-`fnHeo6Ka|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUdVBe(zn

delta 97
zcmewt{V#gMFE&Q=&A-`fnHkL|Ka|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUYMBd`Df

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] ;