Add receive error tracking to Dispatcher and MQTT message builder

- Introduced `getPacketsRecvErrors()` method in `Dispatcher` to track receive errors.
- Updated `buildStatusMessage()` in `MQTTMessageBuilder` to include `recv_errors` parameter.
- Modified `publishStatus()` in `MQTTBridge` to retrieve and send receive error statistics.
- Adjusted `RadioLibWrappers` to override `getPacketsRecvErrors()` for consistency.
This commit is contained in:
agessaman committed 2026-01-29 19:18:52 -08:00
1 parent 37e51f3eb1
commit ee57731441
5 files changed
+23 -6

No files matched your search

+5
View File
@@ -76,6 +76,11 @@ public:
virtual float getLastRSSI() const { return 0; }
virtual float getLastSNR() const { return 0; }
/**
* \returns number of receive errors (e.g. CRC failures) since last reset; 0 if not tracked.
*/
virtual uint32_t getPacketsRecvErrors() const { return 0; }
};
/**
+6 -2
View File
@@ -21,7 +21,8 @@ int MQTTMessageBuilder::buildStatusMessage(
int queue_len,
int noise_floor,
int tx_air_secs,
int rx_air_secs
int rx_air_secs,
int recv_errors
) {
// Use StaticJsonDocument to avoid heap fragmentation (fixed-size stack allocation)
StaticJsonDocument<768> doc; // Increased size to accommodate stats
@@ -38,7 +39,7 @@ int MQTTMessageBuilder::buildStatusMessage(
// Add stats object if any stats are provided
if (battery_mv >= 0 || uptime_secs >= 0 || errors >= 0 || queue_len >= 0 ||
noise_floor > -999 || tx_air_secs >= 0 || rx_air_secs >= 0) {
noise_floor > -999 || tx_air_secs >= 0 || rx_air_secs >= 0 || recv_errors >= 0) {
JsonObject stats = root.createNestedObject("stats");
if (battery_mv >= 0) {
@@ -62,6 +63,9 @@ int MQTTMessageBuilder::buildStatusMessage(
if (rx_air_secs >= 0) {
stats["rx_air_secs"] = rx_air_secs;
}
if (recv_errors >= 0) {
stats["recv_errors"] = recv_errors;
}
}
size_t len = serializeJson(root, buffer, buffer_size);
+3 -1
View File
@@ -37,6 +37,7 @@ public:
* @param noise_floor Noise floor in dBm (optional, -999 to omit)
* @param tx_air_secs TX air time in seconds (optional, -1 to omit)
* @param rx_air_secs RX air time in seconds (optional, -1 to omit)
* @param recv_errors Radio receive/CRC errors (optional, -1 to omit)
* @return Length of JSON string, or 0 on error
*/
static int buildStatusMessage(
@@ -56,7 +57,8 @@ public:
int queue_len = -1,
int noise_floor = -999,
int tx_air_secs = -1,
int rx_air_secs = -1
int rx_air_secs = -1,
int recv_errors = -1
);
/**
+8 -2
View File
@@ -1290,6 +1290,7 @@ bool MQTTBridge::publishStatus() {
int noise_floor = -999;
int tx_air_secs = -1;
int rx_air_secs = -1;
int recv_errors = -1;
if (_board) {
battery_mv = _board->getBattMilliVolts();
@@ -1304,6 +1305,7 @@ bool MQTTBridge::publishStatus() {
}
if (_radio) {
noise_floor = (int16_t)_radio->getNoiseFloor();
recv_errors = (int)_radio->getPacketsRecvErrors();
}
// Build status message with stats
@@ -1324,7 +1326,8 @@ bool MQTTBridge::publishStatus() {
_queue_count, // Use current queue length
noise_floor,
tx_air_secs,
rx_air_secs
rx_air_secs,
recv_errors
);
if (len > 0) {
@@ -2247,6 +2250,7 @@ void MQTTBridge::publishStatusToAnalyzerClient(PsychicMqttClient* client, const
int noise_floor = -999;
int tx_air_secs = -1;
int rx_air_secs = -1;
int recv_errors = -1;
if (_board) {
battery_mv = _board->getBattMilliVolts();
@@ -2261,6 +2265,7 @@ void MQTTBridge::publishStatusToAnalyzerClient(PsychicMqttClient* client, const
}
if (_radio) {
noise_floor = (int16_t)_radio->getNoiseFloor();
recv_errors = (int)_radio->getPacketsRecvErrors();
}
// Build status message using MQTTMessageBuilder with stats
@@ -2281,7 +2286,8 @@ void MQTTBridge::publishStatusToAnalyzerClient(PsychicMqttClient* client, const
_queue_count, // Use current queue length
noise_floor,
tx_air_secs,
rx_air_secs
rx_air_secs,
recv_errors
);
if (len > 0) {
+1 -1
View File
@@ -45,7 +45,7 @@ public:
void loop() override;
uint32_t getPacketsRecv() const { return n_recv; }
uint32_t getPacketsRecvErrors() const { return n_recv_errors; }
uint32_t getPacketsRecvErrors() const override { return n_recv_errors; }
uint32_t getPacketsSent() const { return n_sent; }
void resetStats() { n_recv = n_sent = n_recv_errors = 0; }