From 4aefe13d46d03d49eb08bab9f6fac4fba8a4fd69 Mon Sep 17 00:00:00 2001 From: Steve Miller <43918257+kc1awv@users.noreply.github.com> Date: Sat, 17 Jun 2023 13:49:09 -0400 Subject: [PATCH 1/2] Update YSFControl.cpp typo --- YSFControl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YSFControl.cpp b/YSFControl.cpp index ee65f4c..c7a2369 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -402,7 +402,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data) m_rfFrames++; m_display->writeFusionRSSI(m_rssi); - wrteJSONRSSI(); + writeJSONRSSI(); return true; } From 8a80d9678c29c2b818d4e7228bcb6d1368c51256 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 19 Jun 2023 13:58:10 +0100 Subject: [PATCH 2/2] Disable JSON RSSI reporting when RSSI is not being used. --- DMRSlot.cpp | 3 +++ DStarControl.cpp | 3 +++ M17Control.cpp | 3 +++ NXDNControl.cpp | 3 +++ P25Control.cpp | 3 +++ YSFControl.cpp | 3 +++ 6 files changed, 18 insertions(+) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 6b7b994..0ccd6cd 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -2368,6 +2368,9 @@ void CDMRSlot::enable(bool enabled) void CDMRSlot::writeJSONRSSI() { + if (m_rssi == 0U) + return; + if (m_rssiCount >= RSSI_COUNT) { nlohmann::json json; diff --git a/DStarControl.cpp b/DStarControl.cpp index acfc8f5..17ab462 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -1384,6 +1384,9 @@ void CDStarControl::enable(bool enabled) void CDStarControl::writeJSONRSSI() { + if (m_rssi == 0U) + return; + if (m_rssiCountTotal >= RSSI_COUNT) { nlohmann::json json; diff --git a/M17Control.cpp b/M17Control.cpp index c1abf2e..fe3f4d0 100644 --- a/M17Control.cpp +++ b/M17Control.cpp @@ -1041,6 +1041,9 @@ void CM17Control::enable(bool enabled) void CM17Control::writeJSONRSSI() { + if (m_rssi == 0U) + return; + if (m_rssiCountTotal >= RSSI_COUNT) { nlohmann::json json; diff --git a/NXDNControl.cpp b/NXDNControl.cpp index ca25f0c..f5d280f 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -1195,6 +1195,9 @@ void CNXDNControl::enable(bool enabled) void CNXDNControl::writeJSONRSSI() { + if (m_rssi == 0U) + return; + if (m_rssiCount >= RSSI_COUNT) { nlohmann::json json; diff --git a/P25Control.cpp b/P25Control.cpp index c75d891..7008fc8 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -1241,6 +1241,9 @@ void CP25Control::enable(bool enabled) void CP25Control::writeJSONRSSI() { + if (m_rssi == 0U) + return; + if (m_rssiCount >= RSSI_COUNT) { nlohmann::json json; diff --git a/YSFControl.cpp b/YSFControl.cpp index c7a2369..8afbdd2 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -1296,6 +1296,9 @@ void CYSFControl::enable(bool enabled) void CYSFControl::writeJSONRSSI() { + if (m_rssi == 0U) + return; + if (m_rssiCount >= RSSI_COUNT) { nlohmann::json json;