g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-21 06:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #873 from BeigeBox/fix/dstar-rssi

Browse source 
Fix D-Star RSSI variable shadowing and double-counting
This commit is contained in:
Jonathan Naylor 2026-04-06 19:53:08 +01:00 • committed by GitHub
commit a18299a0b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DStarControl.cpp
View file

@ -182,7 +182,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
raw |= (data[43U] << 0) & 0x00FFU;
// Convert the raw RSSI to dBm
int m_rssi = m_rssiMapper->interpolate(raw);
m_rssi = m_rssiMapper->interpolate(raw);
if (m_rssi != 0)
LogDebug("D-Star, raw RSSI: %u, reported RSSI: %d dBm", raw, m_rssi);
@ -195,7 +195,6 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rssiCountTotal++;
m_rssiAccum += m_rssi;
m_rssiCountTotal++;
}
// Have we got RSSI bytes on the end of D-Star data?
@ -205,7 +204,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
raw |= (data[14U] << 0) & 0x00FFU;
// Convert the raw RSSI to dBm
int m_rssi = m_rssiMapper->interpolate(raw);
m_rssi = m_rssiMapper->interpolate(raw);
if (m_rssi != 0)
LogDebug("D-Star, raw RSSI: %u, reported RSSI: %d dBm", raw, m_rssi);
@ -218,7 +217,6 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
m_rssiCountTotal++;
m_rssiAccum += m_rssi;
m_rssiCountTotal++;
}
if (type == TAG_HEADER) {