From c18b4deef2f06c2fdc6f93062c52bb9dc71dda3d Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Tue, 22 Mar 2022 08:25:41 +0100
Subject: [PATCH] EgtMachKernel 2.4c2 : - modifica a simulatore per gestire
 correttamente gli assi ausiliari dipendenti da assi principali.

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

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index f9e3306fb08ee5cf20dfedfd14e09e04a41f167f..8fe19b692a9d8ed1c2ee907bf1ab1524d061230f 100644
GIT binary patch
delta 236
zcmewt{V#gMI%aKGhCGIJh8%`WhGK>c1_cHUhESkLCPN8BDnkm89}HwAf_cT0IklxX
ze_&=~W;ELTUhX2(<P)4ZK&GKoDdXl<+#V2NM-XMG1QHU43L&Z7%L3L5Rg_Jt^#><&
nF)y2}rOv|(a;PWRX*mp)Acsx<z?`-DjJggps?=sq?XOG#vj{!|

delta 241
zcmewt{V#gMI%aiGhCGIJh8%`ehGHOAV9;O)W+-7u1ma8}FBB-731Uz7R&U)L$1;bB
z(Qxx`Hd|&!!^saNbvLJRO<)0wTx6PjLa+cPDg+fpQs=?Ad6l#WP#;h`nqrWY@;63e
oowE6~YB8f=KG?0EV7KM~-I%!9TYV!lrtsv`ss}fp(l%iN08+|C82|tP

diff --git a/Simulator.cpp b/Simulator.cpp
index 1fabbac..e567122 100644
--- a/Simulator.cpp
+++ b/Simulator.cpp
@@ -1787,8 +1787,8 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr)
            m_pMachine->GetAxisInvert( sName, bInvert)  &&
            m_pMachine->GetAxisType( sName, bLinear)  &&
            m_pMachine->GetAxisPos( sName, dVal)) {
-        // se da agganciare ad asse principale
-         if ( m_pMachine->LuaGetGlobVar( sAuxAxMaster, sLink)) {
+        // se assi principali abilitati e da agganciare ad asse principale
+         if ( m_bEnabAxes  &&  m_pMachine->LuaGetGlobVar( sAuxAxMaster, sLink)) {
             bool bNeg = ( sLink.find( '-') != string::npos) ;
             string sMainAxis = sLink ; ReplaceString( sMainAxis, "-", "") ;
             int nInd = 0 ;
@@ -1796,8 +1796,8 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr)
                if ( m_AxesName[i] == sMainAxis)
                   nInd = i + 1 ;
             }
-           // se assi principali abilitati e trovato asse principale di riferimento
-            if ( m_bEnabAxes  &&  nInd > 0) {
+           // se trovato asse principale di riferimento
+            if ( nInd > 0) {
                m_AuxAxesName.emplace_back( sName) ;
                m_AuxAxesToken.emplace_back( sToken) ;
                m_AuxAxesInvert.push_back( bInvert) ;