MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 16:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Guarantee no divide by zero errors.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-07-21 17:50:13 +01:00
parent d0ddb81c3f
commit f6978d1b80
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DStarControl.cpp
View File

@@ -64,8 +64,8 @@ m_rfFrames(0U),
m_netFrames(0U), m_netFrames(0U),
m_netLost(0U), m_netLost(0U),
m_fec(), m_fec(),
m_rfBits(0U), m_rfBits(1U),
m_netBits(0U), m_netBits(1U),
m_rfErrs(0U), m_rfErrs(0U),
m_netErrs(0U), m_netErrs(0U),
m_lastFrame(NULL), m_lastFrame(NULL),
@@ -110,7 +110,6 @@ bool CDStarControl::writeModem(unsigned char *data)
unsigned char type = data[0U]; unsigned char type = data[0U];
if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) { if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) {
if (m_rfBits == 0U) m_rfBits = 1U;
LogMessage("D-Star, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 50.0F, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("D-Star, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 50.0F, float(m_rfErrs * 100U) / float(m_rfBits));
writeEndRF(); writeEndRF();
return false; return false;
@@ -217,7 +216,6 @@ bool CDStarControl::writeModem(unsigned char *data)
if (m_duplex) if (m_duplex)
writeQueueEOTRF(); writeQueueEOTRF();
if (m_rfBits == 0U) m_rfBits = 1U;
LogMessage("D-Star, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 50.0F, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("D-Star, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 50.0F, float(m_rfErrs * 100U) / float(m_rfBits));
writeEndRF(); writeEndRF();
@@ -512,7 +510,6 @@ void CDStarControl::writeNetwork()
#endif #endif
// We've received the header and EOT haven't we? // We've received the header and EOT haven't we?
m_netFrames += 2U; m_netFrames += 2U;
if (m_netBits == 0U) m_netBits = 1U;
LogMessage("D-Star, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); LogMessage("D-Star, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits));
writeEndNet(); writeEndNet();
@@ -579,7 +576,6 @@ void CDStarControl::clock()
if (m_networkWatchdog.hasExpired()) { if (m_networkWatchdog.hasExpired()) {
// We're received the header haven't we? // We're received the header haven't we?
m_netFrames += 1U; m_netFrames += 1U;
if (m_netBits == 0U) m_netBits = 1U;
LogMessage("D-Star, network watchdog has expired, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); LogMessage("D-Star, network watchdog has expired, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits));
writeEndNet(); writeEndNet();
#if defined(DUMP_DSTAR) #if defined(DUMP_DSTAR)