Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f9964a2f3c6501ef5005acdc764dae9b2c4b9775' into NewLink

Browse Source
This commit is contained in:
Riccardo Elitropi
2026-03-30 15:28:25 +02:00
parent 39b5434c22 f9964a2f3c
commit 690c53a5dc
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtMachKernel.rc
BIN
View File
Binary file not shown.
SimulatorMP.cpp
+11 -5
View File
@@ -2164,9 +2164,9 @@ SimulatorMP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData,
bool bNeg = ( sLink.find( '-') != string::npos) ;
string sMainAxis = sLink ; ReplaceString( sMainAxis, "-", "") ;
int nInd = 0 ;
for ( int i = 0 ; nInd == 0 && i < int( m_AxesName.size()) ; ++ i) {
if ( m_AxesName[i] == sMainAxis)
nInd = i + 1 ;
for ( int j = 0 ; nInd == 0 && j < ssize( m_AxesName) ; ++ j) {
if ( m_AxesName[j] == sMainAxis)
nInd = j + 1 ;
}
// se trovato asse principale di riferimento
if ( nInd > 0) {
@@ -2199,11 +2199,17 @@ SimulatorMP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData,
}
}
// altrimenti errore
else
else {
bOk = false ;
string sErr = " Error in OnMoveStart : Wrong Move AuxAxis " + ToString( i) ;
LOG_ERROR( GetEMkLogger(), sErr.c_str())
}
}
else
else {
bOk = false ;
string sErr = " Error in OnMoveStart : Wrong Name AuxAxis " + ToString( i) ;
LOG_ERROR( GetEMkLogger(), sErr.c_str())
}
}
return bOk ;
SimulatorSP.cpp
+12 -6
View File
@@ -2243,9 +2243,9 @@ SimulatorSP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData,
bool bNeg = ( sLink.find( '-') != string::npos) ;
string sMainAxis = sLink ; ReplaceString( sMainAxis, "-", "") ;
int nInd = 0 ;
for ( int i = 0 ; nInd == 0 && i < int( m_AxesName.size()) ; ++ i) {
if ( m_AxesName[i] == sMainAxis)
nInd = i + 1 ;
for ( int j = 0 ; nInd == 0 && j < ssize( m_AxesName) ; ++ j) {
if ( m_AxesName[j] == sMainAxis)
nInd = j + 1 ;
}
// se trovato asse principale di riferimento
if ( nInd > 0) {
@@ -2272,17 +2272,23 @@ SimulatorSP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData,
m_AuxAxesEnd.emplace_back( dEnd) ;
m_AuxAxesLink.emplace_back( 0) ;
if ( ! m_pMachine->VerifyOutstroke( sName, dEnd)) {
nErr = 1 ;
nErr = ERR_OUTSTROKE ;
bOk = false ;
}
}
}
// altrimenti errore
else
else {
bOk = false ;
string sErr = " Error in OnMoveStart : Wrong Move AuxAxis " + ToString( i) ;
LOG_ERROR( GetEMkLogger(), sErr.c_str())
}
}
else
else {
bOk = false ;
string sErr = " Error in OnMoveStart : Wrong Name AuxAxis " + ToString( i) ;
LOG_ERROR( GetEMkLogger(), sErr.c_str())
}
}
return bOk ;