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

Fix minor counting bugs.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-04-21 19:57:27 +01:00
parent 1d9f4dc29e
commit 0a0534de7b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
YSFControl.cpp
View File

@@ -106,10 +106,10 @@ bool CYSFControl::writeModem(unsigned char *data)
::memcpy(orig, data + 2U, YSF_FRAME_LENGTH_BYTES); ::memcpy(orig, data + 2U, YSF_FRAME_LENGTH_BYTES);
fich.encode(data + 2U); fich.encode(data + 2U);
valid = m_payload.processHeader(data + 2U); // valid = m_payload.processHeader(data + 2U);
unsigned int errs = calculateBER(orig, data + 2U); unsigned int errs = calculateBER(orig, data + 2U);
LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 9.6F); LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
if (m_duplex) { if (m_duplex) {
fich.setMR(YSF_MR_BUSY); fich.setMR(YSF_MR_BUSY);
@@ -162,10 +162,10 @@ bool CYSFControl::writeModem(unsigned char *data)
::memcpy(orig, data + 2U, YSF_FRAME_LENGTH_BYTES); ::memcpy(orig, data + 2U, YSF_FRAME_LENGTH_BYTES);
fich.encode(data + 2U); fich.encode(data + 2U);
m_payload.processTrailer(data + 2U); // m_payload.processTrailer(data + 2U);
unsigned int errs = calculateBER(orig, data + 2U); unsigned int errs = calculateBER(orig, data + 2U);
LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 9.6F); LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
m_frames++; m_frames++;
@@ -207,10 +207,10 @@ bool CYSFControl::writeModem(unsigned char *data)
::memcpy(orig, data + 2U, YSF_FRAME_LENGTH_BYTES); ::memcpy(orig, data + 2U, YSF_FRAME_LENGTH_BYTES);
fich.encode(data + 2U); fich.encode(data + 2U);
m_payload.processData(data + 2U, fn, dt); // m_payload.processData(data + 2U, fn, dt);
unsigned int errs = calculateBER(orig, data + 2U); unsigned int errs = calculateBER(orig, data + 2U);
LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 9.6F); LogDebug("YSF, FI=%u FN=%u FT=%u DT=%u BER=%.1f%%", fi, fn, ft, dt, float(errs) / 2.4F);
bool change = false; bool change = false;
@@ -426,7 +426,7 @@ unsigned int CYSFControl::calculateBER(const unsigned char* orig, const unsigned
{ {
unsigned int errors = 0U; unsigned int errors = 0U;
for (unsigned int i = 0U; i < YSF_FRAME_LENGTH_BYTES; i++) { for (unsigned int i = 0U; i < (YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES); i++) {
unsigned char v = orig[i] ^ curr[i]; unsigned char v = orig[i] ^ curr[i];
while (v != 0U) { while (v != 0U) {
v &= v - 1U; v &= v - 1U;

4
YSFPayload.cpp
View File

@@ -116,6 +116,8 @@ void CYSFPayload::processData(unsigned char* bytes, unsigned char fn, unsigned c
bool CYSFPayload::processHeader(unsigned char* data) bool CYSFPayload::processHeader(unsigned char* data)
{ {
data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES;
unsigned char dch[45U]; unsigned char dch[45U];
unsigned char* p1 = data; unsigned char* p1 = data;
@@ -236,6 +238,8 @@ bool CYSFPayload::processHeader(unsigned char* data)
void CYSFPayload::processTrailer(unsigned char* data) void CYSFPayload::processTrailer(unsigned char* data)
{ {
data += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES;
unsigned char dch[45U]; unsigned char dch[45U];
unsigned char* p1 = data; unsigned char* p1 = data;