From fd5baf790f8916c0d5e1c8bc35566dc1d66ffc82 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Fri, 16 Jun 2023 15:28:22 +0100
Subject: [PATCH] Fix NXDN RSSI and BER JSON.

---
 NXDNControl.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/NXDNControl.cpp b/NXDNControl.cpp
index beac8a6..ca25f0c 100644
--- a/NXDNControl.cpp
+++ b/NXDNControl.cpp
@@ -150,7 +150,8 @@ bool CNXDNControl::writeModem(unsigned char *data, unsigned int len)
 		m_aveRSSI += m_rssi;
 		m_rssiCountTotal++;
 
-		writeJSONRSSI();
+		m_rssiAccum += m_rssi;
+		m_rssiCount++;
 	}
 
 	scrambler(data + 2U);
@@ -597,6 +598,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
 		m_rfFrames++;
 
 		m_display->writeNXDNRSSI(m_rssi);
+		writeJSONRSSI();
 	}
 
 	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->writeNXDNRSSI(m_rssi);
+		writeJSONRSSI();
 
 		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);
@@ -1192,9 +1195,6 @@ void CNXDNControl::enable(bool enabled)
 
 void CNXDNControl::writeJSONRSSI()
 {
-	m_rssiAccum += m_rssi;
-	m_rssiCount++;
-
 	if (m_rssiCount >= RSSI_COUNT) {
 		nlohmann::json json;