ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2025-05-24 10:12:27 -04:00
Code Issues Projects Releases Wiki Activity

Fix for XLX "echo back" bug in NXDN2DMR

Browse Source
This commit is contained in:
Andy CA6JAU 2018-09-23 19:36:48 -03:00
parent 3a7ba11a9b
commit f2cc04bbb2
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
NXDN2DMR/NXDN2DMR.cpp
View File

@ -132,7 +132,8 @@ m_xlxmodule(),
m_xlxConnected(false), m_xlxConnected(false),
m_xlxReflectors(NULL), m_xlxReflectors(NULL),
m_xlxrefl(0U), m_xlxrefl(0U),
m_defaultID(65519U) m_defaultID(65519U),
m_firstSync(false)
{ {
m_nxdnFrame = new unsigned char[200U]; m_nxdnFrame = new unsigned char[200U];
m_dmrFrame = new unsigned char[50U]; m_dmrFrame = new unsigned char[50U];
@ -546,6 +547,14 @@ int CNXDN2DMR::run()
networkWatchdog.start(); networkWatchdog.start();
if(DataType == DT_TERMINATOR_WITH_LC) { if(DataType == DT_TERMINATOR_WITH_LC) {
if (m_dmrFrames == 0U) {
m_dmrNetwork->reset(2U);
networkWatchdog.stop();
m_dmrinfo = false;
m_firstSync = false;
break;
}
LogMessage("DMR received end of voice transmission, %.1f seconds", float(m_dmrFrames) / 16.667F); LogMessage("DMR received end of voice transmission, %.1f seconds", float(m_dmrFrames) / 16.667F);
m_conv.putDMREOT(); m_conv.putDMREOT();
@ -553,6 +562,7 @@ int CNXDN2DMR::run()
networkWatchdog.stop(); networkWatchdog.stop();
m_dmrFrames = 0U; m_dmrFrames = 0U;
m_dmrinfo = false; m_dmrinfo = false;
m_firstSync = false;
} }
if((DataType == DT_VOICE_LC_HEADER) && (DataType != m_dmrLastDT)) { if((DataType == DT_VOICE_LC_HEADER) && (DataType != m_dmrLastDT)) {
@ -565,17 +575,13 @@ int CNXDN2DMR::run()
m_dmrinfo = true; m_dmrinfo = true;
m_dmrFrames = 0U; m_dmrFrames = 0U;
m_firstSync = false;
} }
if(DataType == DT_VOICE_SYNC || DataType == DT_VOICE) { if(DataType == DT_VOICE_SYNC)
unsigned char dmr_frame[50]; m_firstSync = true;
tx_dmrdata.getData(dmr_frame);
m_conv.putDMR(dmr_frame); // Add DMR frame for NXDN conversion if((DataType == DT_VOICE_SYNC || DataType == DT_VOICE) && m_firstSync) {
m_dmrFrames++;
}
}
else {
if(DataType == DT_VOICE_SYNC || DataType == DT_VOICE) {
unsigned char dmr_frame[50]; unsigned char dmr_frame[50];
tx_dmrdata.getData(dmr_frame); tx_dmrdata.getData(dmr_frame);
@ -592,6 +598,14 @@ int CNXDN2DMR::run()
m_conv.putDMR(dmr_frame); // Add DMR frame for NXDN conversion m_conv.putDMR(dmr_frame); // Add DMR frame for NXDN conversion
m_dmrFrames++; m_dmrFrames++;
} }
}
else {
if(DataType == DT_VOICE_SYNC || DataType == DT_VOICE) {
unsigned char dmr_frame[50];
tx_dmrdata.getData(dmr_frame);
m_conv.putDMR(dmr_frame); // Add DMR frame for NXDN conversion
m_dmrFrames++;
}
networkWatchdog.clock(ms); networkWatchdog.clock(ms);
if (networkWatchdog.hasExpired()) { if (networkWatchdog.hasExpired()) {

1
NXDN2DMR/NXDN2DMR.h
View File

@ -97,6 +97,7 @@ private:
CReflectors* m_xlxReflectors; CReflectors* m_xlxReflectors;
unsigned int m_xlxrefl; unsigned int m_xlxrefl;
unsigned int m_defaultID; unsigned int m_defaultID;
bool m_firstSync;
bool createDMRNetwork(); bool createDMRNetwork();
unsigned int findNXDNID(unsigned int dmrid); unsigned int findNXDNID(unsigned int dmrid);

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 = "20180905"; const char* VERSION = "20180923";
#endif #endif

1
YSF2DMR/YSF2DMR.cpp
View File

@ -836,6 +836,7 @@ int CYSF2DMR::run()
m_netDst.resize(YSF_CALLSIGN_LENGTH, ' '); m_netDst.resize(YSF_CALLSIGN_LENGTH, ' ');
m_dmrFrames = 0U; m_dmrFrames = 0U;
m_firstSync = false;
} }
if(DataType == DT_VOICE_SYNC) if(DataType == DT_VOICE_SYNC)