ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2025-09-04 22:17:49 -04:00
Code Issues Projects Releases Wiki Activity

Add OE1KBC fix for XLX

Browse Source
This commit is contained in:
Andy CA6JAU 2018-09-05 22:50:20 -03:00
parent eb27130f10
commit e565a996f8
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NXDN2DMR/NXDN2DMR.cpp
View File

@ -347,6 +347,8 @@ int CNXDN2DMR::run()
std::string netDst = m_nxdnlookup->findCS(m_nxdnDst); std::string netDst = m_nxdnlookup->findCS(m_nxdnDst);
LogMessage("Received NXDN header from %s to %s%s", netSrc.c_str(), grp ? "TG " : "", netDst.c_str()); LogMessage("Received NXDN header from %s to %s%s", netSrc.c_str(), grp ? "TG " : "", netDst.c_str());
m_dmrNetwork->reset(2U); // OE1KBC fix
m_conv.putNXDNHeader(); m_conv.putNXDNHeader();
m_nxdnFrames = 0U; m_nxdnFrames = 0U;
m_nxdninfo = true; m_nxdninfo = true;
@ -357,6 +359,9 @@ int CNXDN2DMR::run()
std::string netSrc = m_nxdnlookup->findCS(m_nxdnSrc); std::string netSrc = m_nxdnlookup->findCS(m_nxdnSrc);
std::string netDst = m_nxdnlookup->findCS(m_nxdnDst); std::string netDst = m_nxdnlookup->findCS(m_nxdnDst);
LogMessage("Received NXDN late entry from %s to %s%s", netSrc.c_str(), grp ? "TG " : "", netDst.c_str()); LogMessage("Received NXDN late entry from %s to %s%s", netSrc.c_str(), grp ? "TG " : "", netDst.c_str());
m_dmrNetwork->reset(2U); // OE1KBC fix
m_conv.putNXDNHeader(); m_conv.putNXDNHeader();
m_nxdninfo = true; m_nxdninfo = true;
} }

2
NXDN2DMR/Version.h
View File

@ -20,6 +20,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20180809"; const char* VERSION = "20180905";
#endif #endif

2
YSF2DMR/Version.h
View File

@ -20,6 +20,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20180904"; const char* VERSION = "20180905";
#endif #endif

3
YSF2DMR/YSF2DMR.cpp
View File

@ -571,6 +571,9 @@ int CYSF2DMR::run()
std::string ysfSrc = ysfPayload.getSource(); std::string ysfSrc = ysfPayload.getSource();
std::string ysfDst = ysfPayload.getDest(); std::string ysfDst = ysfPayload.getDest();
LogMessage("Received YSF Header: Src: %s Dst: %s", ysfSrc.c_str(), ysfDst.c_str()); LogMessage("Received YSF Header: Src: %s Dst: %s", ysfSrc.c_str(), ysfDst.c_str());
m_dmrNetwork->reset(2U); // OE1KBC fix
m_srcid = findYSFID(ysfSrc, true); m_srcid = findYSFID(ysfSrc, true);
m_conv.putYSFHeader(); m_conv.putYSFHeader();
m_ysfFrames = 0U; m_ysfFrames = 0U;