Reworked metrics structure and split telemetry into device or environ… (#1331)

* Reworked metrics structure and split telemetry into device or environment * Comment cleanup
2025-12-16 07:42:37 +00:00 · 2022-03-27 14:55:35 +00:00
parent 7b8096f5b2
commit ba2fa84ebd
23 changed files with 584 additions and 379 deletions
--- a/src/modules/Telemetry/DeviceTelemetry.cpp
+++ b/src/modules/Telemetry/DeviceTelemetry.cpp
@@ -0,0 +1,89 @@
+#include "DeviceTelemetry.h"
+#include "../mesh/generated/telemetry.pb.h"
+#include "PowerFSM.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "RTC.h"
+#include "Router.h"
+#include "configuration.h"
+#include "main.h"
+#include <OLEDDisplay.h>
+#include <OLEDDisplayUi.h>
+
+int32_t DeviceTelemetryModule::runOnce()
+{
+#ifndef PORTDUINO
+    if (firstTime) {
+        // This is the first time the OSThread library has called this function, so do some setup
+        firstTime = 0;
+        DEBUG_MSG("Device Telemetry: Initializing\n");
+    }
+    sendOurTelemetry();
+    // OSThread library.  Multiply the preference value by 1000 to convert seconds to miliseconds
+    return (getPref_telemetry_module_device_update_interval() * 1000);
+#endif
+}
+
+bool DeviceTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemetry *t)
+{
+    if (t->which_variant == Telemetry_device_metrics_tag) {
+        String sender = getSenderName(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);
+
+        lastMeasurementPacket = packetPool.allocCopy(mp);
+
+        nodeDB.updateTelemetry(getFrom(&mp), *t, RX_SRC_RADIO);
+    }
+    return false; // Let others look at this message also if they want
+}
+
+String DeviceTelemetryModule::getSenderName(const MeshPacket &mp)
+{
+    String sender;
+
+    auto node = nodeDB.getNode(getFrom(&mp));
+    if (node) {
+        sender = node->user.short_name;
+    } else {
+        sender = "UNK";
+    }
+    return sender;
+}
+
+bool DeviceTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies)
+{
+    Telemetry m;
+
+    m.time = getTime();
+    m.which_variant = Telemetry_device_metrics_tag;
+
+    m.variant.device_metrics.air_util_tx = myNodeInfo.air_util_tx;
+    m.variant.device_metrics.battery_level = powerStatus->getBatteryChargePercent();
+    m.variant.device_metrics.channel_utilization = myNodeInfo.channel_utilization;
+    m.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
+
+    DEBUG_MSG("-----------------------------------------\n");
+    DEBUG_MSG("Device Telemetry: Read data\n");
+
+    DEBUG_MSG("Telemetry->time: %i\n", m.time);
+    DEBUG_MSG("Telemetry->air_util_tx: %f\n", m.variant.device_metrics.air_util_tx);
+    DEBUG_MSG("Telemetry->battery_level: %i\n", m.variant.device_metrics.battery_level);
+    DEBUG_MSG("Telemetry->channel_utilization: %f\n", m.variant.device_metrics.channel_utilization);
+    DEBUG_MSG("Telemetry->voltage: %f\n", m.variant.device_metrics.voltage);
+
+    MeshPacket *p = allocDataProtobuf(m);
+    p->to = dest;
+    p->decoded.want_response = wantReplies;
+
+    lastMeasurementPacket = packetPool.allocCopy(*p);
+    DEBUG_MSG("Device Telemetry: Sending packet to mesh");
+    service.sendToMesh(p);
+    return true;
+}