1
0
Fork 0

Merge pull request #128 from AndyTaylorTweet/patch-1

Update YSFGateway.cpp
ycs232-kbc
Jonathan Naylor 6 years ago committed by GitHub
commit 4dd0ec248c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -268,7 +268,7 @@ int CYSFGateway::run()
unsigned char ft = fich.getFT(); unsigned char ft = fich.getFT();
CYSFReflector* reflector = m_wiresX->getReflector(); CYSFReflector* reflector = m_wiresX->getReflector();
if ( (wiresXCommandPassthrough) && (m_linkType == LINK_YSF) && (reflector->m_name.rfind("YSF2DMR", 0) == 0 || reflector->m_name.rfind("YSF2P25", 0) == 0 || reflector->m_name.rfind("YSF2NXDN", 0) == 0) ) { if ( (wiresXCommandPassthrough) && (reflector->reflector->m_wiresX) ) {
// Allow WiresX to Pass Through // Allow WiresX to Pass Through
processDTMF(buffer, dt); processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, true); processWiresX(buffer, fi, dt, fn, ft, true);
@ -539,6 +539,11 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
m_inactivityTimer.start(); m_inactivityTimer.start();
m_lostTimer.start(); m_lostTimer.start();
m_linkType = LINK_YSF; m_linkType = LINK_YSF;
// If we are linking to a YSF2xxx mode, send the YSF2xxx gateway the link command too
if (reflector->m_wiresX) {
m_wiresX->sendConnect(m_ysfNetwork);
}
} }
break; break;
case WXS_CONNECT_FCS: { case WXS_CONNECT_FCS: {

Loading…
Cancel
Save