From 7fde56b8accebdf47a2d71edf8e1bf4c96f23a6f Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 15 Oct 2022 18:48:34 -0500 Subject: [PATCH] Make telemetry logging more concise (#1804) * Make telemetry logging more concise * Whoops --- src/modules/Telemetry/DeviceTelemetry.cpp | 32 +++++++--------- .../Telemetry/EnvironmentTelemetry.cpp | 38 +++++++++---------- 2 files changed, 31 insertions(+), 39 deletions(-) diff --git a/src/modules/Telemetry/DeviceTelemetry.cpp b/src/modules/Telemetry/DeviceTelemetry.cpp index 9e541efd4..fd5670d83 100644 --- a/src/modules/Telemetry/DeviceTelemetry.cpp +++ b/src/modules/Telemetry/DeviceTelemetry.cpp @@ -30,14 +30,13 @@ bool DeviceTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemet { if (t->which_variant == Telemetry_device_metrics_tag) { const char *sender = getSenderShortName(mp); - - DEBUG_MSG("-----------------------------------------\n"); - DEBUG_MSG("Device Telemetry: Received data from %s\n", sender); - DEBUG_MSG("Telemetry->time: %i\n", t->time); - DEBUG_MSG("Telemetry->air_util_tx: %f\n", t->variant.device_metrics.air_util_tx); - DEBUG_MSG("Telemetry->battery_level: %i\n", t->variant.device_metrics.battery_level); - DEBUG_MSG("Telemetry->channel_utilization: %f\n", t->variant.device_metrics.channel_utilization); - DEBUG_MSG("Telemetry->voltage: %f\n", t->variant.device_metrics.voltage); + + DEBUG_MSG("(Received from %s): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n", + sender, + t->variant.device_metrics.air_util_tx, + t->variant.device_metrics.channel_utilization, + t->variant.device_metrics.battery_level, + t->variant.device_metrics.voltage); lastMeasurementPacket = packetPool.allocCopy(mp); @@ -58,14 +57,11 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly) t.variant.device_metrics.channel_utilization = myNodeInfo.channel_utilization; t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0; - DEBUG_MSG("-----------------------------------------\n"); - DEBUG_MSG("Device Telemetry: Read data\n"); - - DEBUG_MSG("Telemetry->time: %i\n", t.time); - DEBUG_MSG("Telemetry->air_util_tx: %f\n", t.variant.device_metrics.air_util_tx); - DEBUG_MSG("Telemetry->battery_level: %i\n", t.variant.device_metrics.battery_level); - DEBUG_MSG("Telemetry->channel_utilization: %f\n", t.variant.device_metrics.channel_utilization); - DEBUG_MSG("Telemetry->voltage: %f\n", t.variant.device_metrics.voltage); + DEBUG_MSG("(Sending): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n", + t.variant.device_metrics.air_util_tx, + t.variant.device_metrics.channel_utilization, + t.variant.device_metrics.battery_level, + t.variant.device_metrics.voltage); MeshPacket *p = allocDataProtobuf(t); p->to = dest; @@ -74,10 +70,10 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly) lastMeasurementPacket = packetPool.allocCopy(*p); nodeDB.updateTelemetry(nodeDB.getNodeNum(), t, RX_SRC_LOCAL); if (phoneOnly) { - DEBUG_MSG("Device Telemetry: Sending packet to phone\n"); + DEBUG_MSG("Sending packet to phone\n"); service.sendToPhone(p); } else { - DEBUG_MSG("Device Telemetry: Sending packet to mesh\n"); + DEBUG_MSG("Sending packet to mesh\n"); service.sendToMesh(p, RX_SRC_LOCAL, true); } return true; diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp index c0e650d98..7dbd09146 100644 --- a/src/modules/Telemetry/EnvironmentTelemetry.cpp +++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp @@ -152,7 +152,7 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, Telemetry_fields, &lastMeasurement)) { display->setFont(FONT_SMALL); display->drawString(x, y += fontHeight(FONT_MEDIUM), "Measurement Error"); - DEBUG_MSG("Environment Telemetry: unable to decode last packet"); + DEBUG_MSG("Unable to decode last packet"); return; } @@ -177,15 +177,14 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Te if (t->which_variant == Telemetry_environment_metrics_tag) { const char *sender = getSenderShortName(mp); - DEBUG_MSG("-----------------------------------------\n"); - DEBUG_MSG("Environment Telemetry: Received data from %s\n", sender); - DEBUG_MSG("Telemetry->time: %i\n", t->time); - DEBUG_MSG("Telemetry->barometric_pressure: %f\n", t->variant.environment_metrics.barometric_pressure); - DEBUG_MSG("Telemetry->current: %f\n", t->variant.environment_metrics.current); - DEBUG_MSG("Telemetry->gas_resistance: %f\n", t->variant.environment_metrics.gas_resistance); - DEBUG_MSG("Telemetry->relative_humidity: %f\n", t->variant.environment_metrics.relative_humidity); - DEBUG_MSG("Telemetry->temperature: %f\n", t->variant.environment_metrics.temperature); - DEBUG_MSG("Telemetry->voltage: %f\n", t->variant.environment_metrics.voltage); + DEBUG_MSG("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n", + sender, + t->variant.environment_metrics.barometric_pressure, + t->variant.environment_metrics.current, + t->variant.environment_metrics.gas_resistance, + t->variant.environment_metrics.relative_humidity, + t->variant.environment_metrics.temperature, + t->variant.environment_metrics.voltage); lastMeasurementPacket = packetPool.allocCopy(mp); } @@ -206,9 +205,6 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies m.variant.environment_metrics.temperature = 0; m.variant.environment_metrics.voltage = 0; - DEBUG_MSG("-----------------------------------------\n"); - DEBUG_MSG("Environment Telemetry: Read data\n"); - if (lps22hbSensor.hasSensor()) lps22hbSensor.getMetrics(&m); if (shtc3Sensor.hasSensor()) @@ -226,13 +222,13 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies if (ina260Sensor.hasSensor()) ina260Sensor.getMetrics(&m); - DEBUG_MSG("Telemetry->time: %i\n", m.time); - DEBUG_MSG("Telemetry->barometric_pressure: %f\n", m.variant.environment_metrics.barometric_pressure); - DEBUG_MSG("Telemetry->current: %f\n", m.variant.environment_metrics.current); - DEBUG_MSG("Telemetry->gas_resistance: %f\n", m.variant.environment_metrics.gas_resistance); - DEBUG_MSG("Telemetry->relative_humidity: %f\n", m.variant.environment_metrics.relative_humidity); - DEBUG_MSG("Telemetry->temperature: %f\n", m.variant.environment_metrics.temperature); - DEBUG_MSG("Telemetry->voltage: %f\n", m.variant.environment_metrics.voltage); + DEBUG_MSG("(Sending): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n", + m.variant.environment_metrics.barometric_pressure, + m.variant.environment_metrics.current, + m.variant.environment_metrics.gas_resistance, + m.variant.environment_metrics.relative_humidity, + m.variant.environment_metrics.temperature, + m.variant.environment_metrics.voltage); sensor_read_error_count = 0; @@ -241,7 +237,7 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies p->decoded.want_response = wantReplies; lastMeasurementPacket = packetPool.allocCopy(*p); - DEBUG_MSG("Environment Telemetry: Sending packet to mesh"); + DEBUG_MSG("Sending packet to mesh"); service.sendToMesh(p, RX_SRC_LOCAL, true); return true; }