mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Update telemetry for local node (#1332)

pull/1334/head
Ben Meadors 2022-03-28 17:13:22 +00:00 zatwierdzone przez GitHub
rodzic 5366eba535
commit eafd205169
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 15 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
src/modules/Telemetry/DeviceTelemetry.cpp
Wyświetl plik

@ -59,31 +59,32 @@ String DeviceTelemetryModule::getSenderName(const MeshPacket &mp)
bool DeviceTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies) bool DeviceTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies)
{ {
Telemetry m; Telemetry t;
m.time = getTime(); t.time = getTime();
m.which_variant = Telemetry_device_metrics_tag; t.which_variant = Telemetry_device_metrics_tag;
m.variant.device_metrics.air_util_tx = myNodeInfo.air_util_tx; t.variant.device_metrics.air_util_tx = myNodeInfo.air_util_tx;
m.variant.device_metrics.battery_level = powerStatus->getBatteryChargePercent(); t.variant.device_metrics.battery_level = powerStatus->getBatteryChargePercent();
m.variant.device_metrics.channel_utilization = myNodeInfo.channel_utilization; t.variant.device_metrics.channel_utilization = myNodeInfo.channel_utilization;
m.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0; t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
DEBUG_MSG("-----------------------------------------\n"); DEBUG_MSG("-----------------------------------------\n");
DEBUG_MSG("Device Telemetry: Read data\n"); DEBUG_MSG("Device Telemetry: Read data\n");
DEBUG_MSG("Telemetry->time: %i\n", m.time); DEBUG_MSG("Telemetry->time: %i\n", t.time);
DEBUG_MSG("Telemetry->air_util_tx: %f\n", m.variant.device_metrics.air_util_tx); DEBUG_MSG("Telemetry->air_util_tx: %f\n", t.variant.device_metrics.air_util_tx);
DEBUG_MSG("Telemetry->battery_level: %i\n", m.variant.device_metrics.battery_level); DEBUG_MSG("Telemetry->battery_level: %i\n", t.variant.device_metrics.battery_level);
DEBUG_MSG("Telemetry->channel_utilization: %f\n", m.variant.device_metrics.channel_utilization); DEBUG_MSG("Telemetry->channel_utilization: %f\n", t.variant.device_metrics.channel_utilization);
DEBUG_MSG("Telemetry->voltage: %f\n", m.variant.device_metrics.voltage); DEBUG_MSG("Telemetry->voltage: %f\n", t.variant.device_metrics.voltage);
MeshPacket *p = allocDataProtobuf(m); MeshPacket *p = allocDataProtobuf(t);
p->to = dest; p->to = dest;
p->decoded.want_response = wantReplies; p->decoded.want_response = wantReplies;
lastMeasurementPacket = packetPool.allocCopy(*p); lastMeasurementPacket = packetPool.allocCopy(*p);
DEBUG_MSG("Device Telemetry: Sending packet to mesh"); DEBUG_MSG("Device Telemetry: Sending packet to mesh\n");
service.sendToMesh(p); service.sendToMesh(p);
nodeDB.updateTelemetry(nodeDB.getNodeNum(), t, RX_SRC_LOCAL);
return true; return true;
} }