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

Fix NXDN RSSI and BER JSON.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-16 15:28:22 +01:00
parent 3b89c3f94d
commit fd5baf790f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NXDNControl.cpp
View File

@@ -150,7 +150,8 @@ bool CNXDNControl::writeModem(unsigned char *data, unsigned int len)
m_aveRSSI += m_rssi; m_aveRSSI += m_rssi;
m_rssiCountTotal++; m_rssiCountTotal++;
writeJSONRSSI(); m_rssiAccum += m_rssi;
m_rssiCount++;
} }
scrambler(data + 2U); scrambler(data + 2U);
@@ -597,6 +598,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
m_rfFrames++; m_rfFrames++;
m_display->writeNXDNRSSI(m_rssi); m_display->writeNXDNRSSI(m_rssi);
writeJSONRSSI();
} }
return true; return true;
@@ -645,6 +647,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data)
m_display->writeNXDN(source.c_str(), grp, dstId, "R"); m_display->writeNXDN(source.c_str(), grp, dstId, "R");
m_display->writeNXDNRSSI(m_rssi); m_display->writeNXDNRSSI(m_rssi);
writeJSONRSSI();
LogMessage("NXDN, received RF data header from %s to %s%u, %u blocks", source.c_str(), grp ? "TG " : "", dstId, frames); LogMessage("NXDN, received RF data header from %s to %s%u, %u blocks", source.c_str(), grp ? "TG " : "", dstId, frames);
writeJSONNet("start", srcId, source, grp, dstId, frames); writeJSONNet("start", srcId, source, grp, dstId, frames);
@@ -1192,9 +1195,6 @@ void CNXDNControl::enable(bool enabled)
void CNXDNControl::writeJSONRSSI() void CNXDNControl::writeJSONRSSI()
{ {
m_rssiAccum += m_rssi;
m_rssiCount++;
if (m_rssiCount >= RSSI_COUNT) { if (m_rssiCount >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;