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 YSF RSSI and BER JSON.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-16 15:44:20 +01:00
parent 44783544fe
commit 46ce993c5d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
YSFControl.cpp
View File

@@ -161,7 +161,8 @@ bool CYSFControl::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++;
} }
CYSFFICH fich; CYSFFICH fich;
@@ -303,6 +304,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
writeJSONRSSI();
return true; return true;
} }
@@ -400,6 +402,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
wrteJSONRSSI();
return true; return true;
} }
@@ -485,6 +488,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
writeJSONRSSI();
return true; return true;
} }
@@ -596,6 +600,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
writeJSONRSSI();
return true; return true;
} else if (valid && m_rfState == RS_RF_LISTENING) { } else if (valid && m_rfState == RS_RF_LISTENING) {
@@ -725,6 +730,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
writeJSONRSSI();
return true; return true;
} }
@@ -806,6 +812,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
writeJSONRSSI();
return true; return true;
} }
@@ -891,6 +898,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
writeJSONRSSI();
return true; return true;
} }
@@ -1288,9 +1296,6 @@ void CYSFControl::enable(bool enabled)
void CYSFControl::writeJSONRSSI() void CYSFControl::writeJSONRSSI()
{ {
m_rssiAccum += m_rssi;
m_rssiCount++;
if (m_rssiCount >= RSSI_COUNT) { if (m_rssiCount >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;