Don't create silent data mode data.

This commit is contained in:
Jonathan Naylor 2016-07-12 18:39:49 +01:00
parent d87dac3369
commit 3aa83328b7
2 changed files with 8 additions and 0 deletions

View file

@ -48,6 +48,7 @@ m_rfDest(NULL),
m_netSource(NULL), m_netSource(NULL),
m_netDest(NULL), m_netDest(NULL),
m_lastFrame(NULL), m_lastFrame(NULL),
m_lastMode(YSF_DT_VOICE_FR_MODE),
m_netN(0U), m_netN(0U),
m_rfPayload(), m_rfPayload(),
m_netPayload(), m_netPayload(),
@ -447,6 +448,8 @@ void CYSFControl::writeNetwork()
unsigned char ft = fich.getFT(); unsigned char ft = fich.getFT();
unsigned char fi = fich.getFI(); unsigned char fi = fich.getFI();
m_lastMode = dt;
// Set the downlink callsign // Set the downlink callsign
switch (fi) { switch (fi) {
case YSF_FI_HEADER: case YSF_FI_HEADER:
@ -693,6 +696,10 @@ bool CYSFControl::insertSilence(const unsigned char* data, unsigned char n)
void CYSFControl::insertSilence(unsigned int count) void CYSFControl::insertSilence(unsigned int count)
{ {
// We can't meaningfully create "silent" data
if (m_lastMode == YSF_DT_DATA_FR_MODE)
return;
LogDebug("YSF, insert %u frames", count); LogDebug("YSF, insert %u frames", count);
unsigned char n = (m_netN + 1U) % 128U; unsigned char n = (m_netN + 1U) % 128U;

View file

@ -66,6 +66,7 @@ private:
unsigned char* m_netSource; unsigned char* m_netSource;
unsigned char* m_netDest; unsigned char* m_netDest;
unsigned char* m_lastFrame; unsigned char* m_lastFrame;
unsigned char m_lastMode;
unsigned char m_netN; unsigned char m_netN;
CYSFPayload m_rfPayload; CYSFPayload m_rfPayload;
CYSFPayload m_netPayload; CYSFPayload m_netPayload;