Merge branch 'mqtt' into mqtt_plus

This commit is contained in:
Jonathan Naylor
2023-06-19 14:08:53 +01:00
6 changed files with 18 additions and 0 deletions

View File

@@ -2321,6 +2321,9 @@ void CDMRSlot::enable(bool enabled)
void CDMRSlot::writeJSONRSSI() void CDMRSlot::writeJSONRSSI()
{ {
if (m_rssi == 0U)
return;
if (m_rssiCount >= RSSI_COUNT) { if (m_rssiCount >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;

View File

@@ -1395,6 +1395,9 @@ void CDStarControl::enable(bool enabled)
void CDStarControl::writeJSONRSSI() void CDStarControl::writeJSONRSSI()
{ {
if (m_rssi == 0U)
return;
if (m_rssiCountTotal >= RSSI_COUNT) { if (m_rssiCountTotal >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;

View File

@@ -1027,6 +1027,9 @@ void CM17Control::enable(bool enabled)
void CM17Control::writeJSONRSSI() void CM17Control::writeJSONRSSI()
{ {
if (m_rssi == 0U)
return;
if (m_rssiCountTotal >= RSSI_COUNT) { if (m_rssiCountTotal >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;

View File

@@ -1178,6 +1178,9 @@ void CNXDNControl::enable(bool enabled)
void CNXDNControl::writeJSONRSSI() void CNXDNControl::writeJSONRSSI()
{ {
if (m_rssi == 0U)
return;
if (m_rssiCount >= RSSI_COUNT) { if (m_rssiCount >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;

View File

@@ -1220,6 +1220,9 @@ void CP25Control::enable(bool enabled)
void CP25Control::writeJSONRSSI() void CP25Control::writeJSONRSSI()
{ {
if (m_rssi == 0U)
return;
if (m_rssiCount >= RSSI_COUNT) { if (m_rssiCount >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;

View File

@@ -1273,6 +1273,9 @@ void CYSFControl::enable(bool enabled)
void CYSFControl::writeJSONRSSI() void CYSFControl::writeJSONRSSI()
{ {
if (m_rssi == 0U)
return;
if (m_rssiCount >= RSSI_COUNT) { if (m_rssiCount >= RSSI_COUNT) {
nlohmann::json json; nlohmann::json json;