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

Finish TGList implementation for DMR2YSF

Browse Source
This commit is contained in:
Andy CA6JAU 2018-07-30 21:25:40 -04:00
parent d6733ce1ce
commit 7e231ca6a5
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
DMR2YSF/DMR2YSF.cpp
View File

@ -511,10 +511,14 @@ int CDMR2YSF::run()
if(DataType == DT_TERMINATOR_WITH_LC && m_dmrFrames > 0U) { if(DataType == DT_TERMINATOR_WITH_LC && m_dmrFrames > 0U) {
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();
networkWatchdog.stop(); networkWatchdog.stop();
m_dmrFrames = 0U; m_dmrFrames = 0U;
m_dmrinfo = false; m_dmrinfo = false;
if (m_dstid != m_lastTG)
break;
m_conv.putDMREOT();
} }
if((DataType == DT_VOICE_LC_HEADER) && (DataType != m_dmrLastDT)) { if((DataType == DT_VOICE_LC_HEADER) && (DataType != m_dmrLastDT)) {
@ -528,16 +532,22 @@ int CDMR2YSF::run()
m_netDst = (netflco == FLCO_GROUP ? "TG " : "") + m_lookup->findCS(DstId); m_netDst = (netflco == FLCO_GROUP ? "TG " : "") + m_lookup->findCS(DstId);
m_conv.putDMRHeader(); connectYSF(m_dstid);
LogMessage("DMR audio received from %s to %s", m_netSrc.c_str(), m_netDst.c_str()); LogMessage("DMR audio received from %s to %s", m_netSrc.c_str(), m_netDst.c_str());
m_dmrinfo = true; m_dmrinfo = true;
m_dmrFrames = 0U;
m_netSrc.resize(YSF_CALLSIGN_LENGTH, ' '); m_netSrc.resize(YSF_CALLSIGN_LENGTH, ' ');
m_netDst.resize(YSF_CALLSIGN_LENGTH, ' '); m_netDst.resize(YSF_CALLSIGN_LENGTH, ' ');
m_dmrFrames = 0U; if (m_dstid != m_lastTG) {
connectYSF(m_dstid); m_dmrLastDT = DataType;
break;
}
m_conv.putDMRHeader();
} }
if(DataType == DT_VOICE_SYNC || DataType == DT_VOICE) { if(DataType == DT_VOICE_SYNC || DataType == DT_VOICE) {
@ -561,16 +571,25 @@ int CDMR2YSF::run()
m_dmrinfo = true; m_dmrinfo = true;
} }
m_conv.putDMR(dmr_frame); // Add DMR frame for YSF conversion
m_dmrFrames++; m_dmrFrames++;
if (m_dstid != m_lastTG)
break;
m_conv.putDMR(dmr_frame); // Add DMR frame for YSF conversion
} }
} }
else { else {
if(DataType == DT_VOICE_SYNC || DataType == DT_VOICE) { 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);
m_conv.putDMR(dmr_frame); // Add DMR frame for YSF conversion
m_dmrFrames++; m_dmrFrames++;
if (m_dstid != m_lastTG)
break;
m_conv.putDMR(dmr_frame); // Add DMR frame for YSF conversion
} }
networkWatchdog.clock(ms); networkWatchdog.clock(ms);
@ -835,7 +854,16 @@ void CDMR2YSF::connectYSF(unsigned int id)
if (id == m_tgUnlink) if (id == m_tgUnlink)
sendYSFDisc(); sendYSFDisc();
// TODO: connection ID search for (std::vector<CTGReg*>::iterator it = m_currTGList.begin(); it != m_currTGList.end(); ++it) {
if (id == (*it)->m_tg) {
sendYSFConn((*it)->m_ysf);
return;
}
}
LogMessage("DMR TG not found in TGList");
return;
} }
void CDMR2YSF::sendYSFConn(unsigned int id) void CDMR2YSF::sendYSFConn(unsigned int id)