* Add explicit presence for MeshPacket.rx_time (arrival time) rx_time is now proto3 optional with a has_rx_time presence bit, matching the rx_rssi treatment. A node with no GPS and no phone connected yet has no time source at all, so a bare 0 was indistinguishable from a genuine 1970-01-01 reading; downstream consumers (replay packets, JSON serialization) now check has_rx_time instead of the value. * Dedupe rx_time stamping into a shared helper; trim a debug log string Extract the repeated haveTime/rx_time/has_rx_time stamp logic (5 call sites across Router.cpp, MeshBeaconModule.cpp, MeshService.cpp) into Router::computeRxTimeStamp()/stampRxTime(). Also shorten the new RTC.cpp LOG_DEBUG string. Saves 48 bytes of flash on rak4631 (measured), no behavior change. * Fix has_rx_rssi presence carried unconditionally through StoreForward replay preparePayload() set has_rx_rssi = true unconditionally on replay, regardless of whether the packet's rx_rssi at store time was a genuine measurement (e.g. MQTT-relayed packets carry no real RSSI). Store the presence bit alongside rx_rssi in PacketHistoryStruct and restore it on replay instead. Flagged by Copilot on #11271 (same root cause the has_rx_time explicit presence work fixes) but never addressed before that PR merged. * Trim comment blocks to the repo's 1-2 line guideline .github/copilot-instructions.md:338 caps code comments at 1-2 lines; several blocks added across the rx_time explicit-presence work ran well past that. Also consolidates Time.cpp's file-level doc comment into Time.h, where the rest of the Time:: API contract already lives. No behavior change. * Add rx_time explicit-presence test coverage - test_meshpacket_serializer: has_rx_time=false fixture plus tests asserting JsonSerialize/JsonSerializeEncrypted emit 0 rather than leaking the millis() placeholder, alongside the has_rx_time=true baseline. - test_stream_api: two tests driving a real PhoneAPI handshake (want_config_id through STATE_SEND_PACKETS) that simulate a phone time-giving transaction arriving before vs. after a queued packet is drained - covering both the reconciled and the ships-with-placeholder-absent paths of MeshService::reconcilePendingRxTimes(). * Fix three correctness issues flagged in review - Time.h: drop the reserved-identifier include guard (_MT_TIME_H); pragma once already covers it, matching convention elsewhere (e.g. RTC.h). - Time.cpp: rebase getMillis64()'s wrap accumulator when the test seam swaps clock sources, so a real<->injected clock jump isn't miscounted as a genuine 32-bit wrap. - NodeInfoModule: the 12h reply-suppression window is a local dedup duration, not a wall-clock reading - switch it to Time::getMillis64() so RTC-quality jumps and replayed packets' stale rx_time can't perturb it. - StoreForwardModule: has_rx_time was derived from *current* RTC quality at replay time rather than stored at capture time, so a history entry saved while time-blind could be misreported as a valid epoch once the clock later improved. Persist the presence bit in PacketHistoryStruct instead. * tryfix CI * post review fixes * more test fixes
321 lines
13 KiB
C++
321 lines
13 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "Default.h"
|
|
#include "MeshService.h"
|
|
#include "NodeDB.h"
|
|
#include "Power.h"
|
|
#include "PowerFSM.h"
|
|
#include "PowerTelemetry.h"
|
|
#include "Router.h"
|
|
#include "TransmitHistory.h"
|
|
#include "gps/RTC.h"
|
|
#include "graphics/SharedUIDisplay.h"
|
|
#include "main.h"
|
|
#include "sleep.h"
|
|
#include "target_specific.h"
|
|
|
|
#define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
|
|
#define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
|
|
|
|
#include "graphics/ScreenFonts.h"
|
|
#include <Throttle.h>
|
|
|
|
static constexpr uint16_t TX_HISTORY_KEY_POWER_TELEMETRY = 0x8005;
|
|
|
|
namespace graphics
|
|
{
|
|
extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *titleStr, bool force_no_invert,
|
|
bool show_date);
|
|
}
|
|
|
|
int32_t PowerTelemetryModule::runOnce()
|
|
{
|
|
if (sleepOnNextExecution == true) {
|
|
if (shouldDeferDeepSleep())
|
|
return PREFLIGHT_SLEEP_RETRY_MS;
|
|
sleepOnNextExecution = false;
|
|
uint32_t nightyNightMs = Default::getConfiguredOrDefaultMs(moduleConfig.telemetry.power_update_interval,
|
|
default_telemetry_broadcast_interval_secs);
|
|
LOG_DEBUG("Sleep for %ims, then awake to send metrics again", nightyNightMs);
|
|
doDeepSleep(nightyNightMs, true, false);
|
|
}
|
|
|
|
/*
|
|
Uncomment the preferences below if you want to use the module
|
|
without having to configure it from the PythonAPI or WebUI.
|
|
*/
|
|
|
|
// moduleConfig.telemetry.power_measurement_enabled = 1;
|
|
// moduleConfig.telemetry.power_screen_enabled = 1;
|
|
// moduleConfig.telemetry.power_update_interval = 45;
|
|
|
|
if (!(moduleConfig.telemetry.power_measurement_enabled)) {
|
|
// If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it
|
|
return disable();
|
|
}
|
|
|
|
uint32_t sendToMeshIntervalMs = Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.power_update_interval,
|
|
default_telemetry_broadcast_interval_secs,
|
|
numOnlineNodes, TrafficType::TELEMETRY);
|
|
|
|
if (firstTime) {
|
|
// This is the first time the OSThread library has called this function, so do some setup
|
|
firstTime = 0;
|
|
uint32_t result = UINT32_MAX;
|
|
|
|
#if HAS_TELEMETRY
|
|
if (moduleConfig.telemetry.power_measurement_enabled) {
|
|
LOG_INFO("Power Telemetry: init");
|
|
// If sensor is already initialized by EnvironmentTelemetryModule, then we don't need to initialize it again,
|
|
// but we need to set the result to != UINT32_MAX to avoid it being disabled
|
|
if (ina219Sensor.hasSensor())
|
|
result = ina219Sensor.isInitialized() ? 0 : ina219Sensor.runOnce();
|
|
if (ina226Sensor.hasSensor())
|
|
result = ina226Sensor.isInitialized() ? 0 : ina226Sensor.runOnce();
|
|
if (ina260Sensor.hasSensor())
|
|
result = ina260Sensor.isInitialized() ? 0 : ina260Sensor.runOnce();
|
|
if (ina3221Sensor.hasSensor())
|
|
result = ina3221Sensor.isInitialized() ? 0 : ina3221Sensor.runOnce();
|
|
if (max17048Sensor.hasSensor())
|
|
result = max17048Sensor.isInitialized() ? 0 : max17048Sensor.runOnce();
|
|
}
|
|
|
|
// it's possible to have this module enabled, only for displaying values on the screen.
|
|
// therefore, we should only enable the sensor loop if measurement is also enabled
|
|
return result == UINT32_MAX ? disable() : setStartDelay();
|
|
#else
|
|
return disable();
|
|
#endif
|
|
} else {
|
|
// if we somehow got to a second run of this module with measurement disabled, then just wait forever
|
|
if (!moduleConfig.telemetry.power_measurement_enabled)
|
|
return disable();
|
|
|
|
uint32_t lastTelemetry = transmitHistory ? transmitHistory->getLastSentToMeshMillis(TX_HISTORY_KEY_POWER_TELEMETRY) : 0;
|
|
if (((lastTelemetry == 0) || !Throttle::isWithinTimespanMs(lastTelemetry, sendToMeshIntervalMs)) &&
|
|
airTime->isTxAllowedAirUtil()) {
|
|
sendTelemetry();
|
|
if (transmitHistory)
|
|
transmitHistory->setLastSentToMesh(TX_HISTORY_KEY_POWER_TELEMETRY);
|
|
} else if (((lastSentToPhone == 0) || !Throttle::isWithinTimespanMs(lastSentToPhone, sendToPhoneIntervalMs)) &&
|
|
(service->isToPhoneQueueEmpty())) {
|
|
// Just send to phone when it's not our time to send to mesh yet
|
|
// Only send while queue is empty (phone assumed connected)
|
|
sendTelemetry(NODENUM_BROADCAST, true);
|
|
lastSentToPhone = millis();
|
|
}
|
|
}
|
|
if (sleepOnNextExecution) {
|
|
// Honor the pre-sleep grace period armed in sendTelemetry(): OSThread reschedules with
|
|
// this return value, which would otherwise override setIntervalFromNow()
|
|
return FIVE_SECONDS_MS;
|
|
}
|
|
return min(sendToPhoneIntervalMs, sendToMeshIntervalMs);
|
|
}
|
|
|
|
bool PowerTelemetryModule::wantUIFrame()
|
|
{
|
|
return moduleConfig.telemetry.power_screen_enabled;
|
|
}
|
|
|
|
#if HAS_SCREEN
|
|
void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
|
|
{
|
|
display->clear();
|
|
display->setTextAlignment(TEXT_ALIGN_LEFT);
|
|
display->setFont(FONT_SMALL);
|
|
int line = 1;
|
|
|
|
// === Set Title
|
|
const char *titleStr = (graphics::currentResolution == graphics::ScreenResolution::High) ? "Power Telem." : "Power";
|
|
|
|
// === Header ===
|
|
graphics::drawCommonHeader(display, x, y, titleStr);
|
|
|
|
if (lastMeasurementPacket == nullptr) {
|
|
// In case of no valid packet, display "Power Telemetry", "No measurement"
|
|
display->drawString(x, graphics::getTextPositions(display)[line++], "No measurement");
|
|
return;
|
|
}
|
|
|
|
// Decode the last power packet
|
|
meshtastic_Telemetry lastMeasurement;
|
|
uint32_t agoSecs = service->GetTimeSinceMeshPacket(lastMeasurementPacket);
|
|
const char *lastSender = getSenderShortName(*lastMeasurementPacket);
|
|
|
|
const meshtastic_Data &p = lastMeasurementPacket->decoded;
|
|
if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &lastMeasurement)) {
|
|
display->drawString(x, graphics::getTextPositions(display)[line++], "Measurement Error");
|
|
LOG_ERROR("Unable to decode last packet");
|
|
return;
|
|
}
|
|
|
|
// Display "Pow. From: ..."
|
|
char agoStr[16];
|
|
if (agoSecs == SINCE_UNKNOWN)
|
|
snprintf(agoStr, sizeof(agoStr), "?"); // no trustworthy arrival time to age against
|
|
else
|
|
snprintf(agoStr, sizeof(agoStr), "%us", (unsigned)agoSecs);
|
|
char fromStr[64];
|
|
snprintf(fromStr, sizeof(fromStr), "Pow. From: %s (%s)", lastSender, agoStr);
|
|
display->drawString(x, graphics::getTextPositions(display)[line++], fromStr);
|
|
|
|
// Display current and voltage based on ...power_metrics.has_[channel/voltage/current]... flags
|
|
const auto &m = lastMeasurement.variant.power_metrics;
|
|
int lineY = textSecondLine;
|
|
|
|
auto drawLine = [&](const char *label, float voltage, float current) {
|
|
char lineStr[64];
|
|
snprintf(lineStr, sizeof(lineStr), "%s: %.2fV %.0fmA", label, voltage, current);
|
|
display->drawString(x, lineY, lineStr);
|
|
lineY += _fontHeight(FONT_SMALL);
|
|
};
|
|
|
|
if (m.has_ch1_voltage || m.has_ch1_current) {
|
|
drawLine("Ch1", m.ch1_voltage, m.ch1_current);
|
|
}
|
|
if (m.has_ch2_voltage || m.has_ch2_current) {
|
|
drawLine("Ch2", m.ch2_voltage, m.ch2_current);
|
|
}
|
|
if (m.has_ch3_voltage || m.has_ch3_current) {
|
|
drawLine("Ch3", m.ch3_voltage, m.ch3_current);
|
|
}
|
|
graphics::drawCommonFooter(display, x, y);
|
|
}
|
|
#endif
|
|
|
|
bool PowerTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
|
|
{
|
|
if (t->which_variant == meshtastic_Telemetry_power_metrics_tag) {
|
|
#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
|
|
const char *sender = getSenderShortName(mp);
|
|
|
|
LOG_INFO("(Received from %s): ch1_voltage=%.1f, ch1_current=%.1f, ch2_voltage=%.1f, ch2_current=%.1f, "
|
|
"ch3_voltage=%.1f, ch3_current=%.1f",
|
|
sender, t->variant.power_metrics.ch1_voltage, t->variant.power_metrics.ch1_current,
|
|
t->variant.power_metrics.ch2_voltage, t->variant.power_metrics.ch2_current, t->variant.power_metrics.ch3_voltage,
|
|
t->variant.power_metrics.ch3_current);
|
|
#endif
|
|
// release previous packet before occupying a new spot
|
|
if (lastMeasurementPacket != nullptr)
|
|
packetPool.release(lastMeasurementPacket);
|
|
|
|
lastMeasurementPacket = packetPool.allocCopy(mp);
|
|
}
|
|
|
|
return false; // Let others look at this message also if they want
|
|
}
|
|
|
|
bool PowerTelemetryModule::getPowerTelemetry(meshtastic_Telemetry *m)
|
|
{
|
|
bool valid = false;
|
|
m->time = getTime();
|
|
m->which_variant = meshtastic_Telemetry_power_metrics_tag;
|
|
|
|
m->variant.power_metrics = meshtastic_PowerMetrics_init_zero;
|
|
#if HAS_TELEMETRY
|
|
if (ina219Sensor.hasSensor())
|
|
valid = ina219Sensor.getMetrics(m);
|
|
if (ina226Sensor.hasSensor())
|
|
valid = ina226Sensor.getMetrics(m);
|
|
if (ina260Sensor.hasSensor())
|
|
valid = ina260Sensor.getMetrics(m);
|
|
if (ina3221Sensor.hasSensor())
|
|
valid = ina3221Sensor.getMetrics(m);
|
|
if (max17048Sensor.hasSensor())
|
|
valid = max17048Sensor.getMetrics(m);
|
|
#endif
|
|
|
|
return valid;
|
|
}
|
|
|
|
meshtastic_MeshPacket *PowerTelemetryModule::allocReply()
|
|
{
|
|
if (currentRequest) {
|
|
if (isMultiHopBroadcastRequest() && !isSensorOrRouterRole()) {
|
|
ignoreRequest = true;
|
|
return NULL;
|
|
}
|
|
auto req = *currentRequest;
|
|
const auto &p = req.decoded;
|
|
meshtastic_Telemetry scratch;
|
|
meshtastic_Telemetry *decoded = NULL;
|
|
memset(&scratch, 0, sizeof(scratch));
|
|
if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &scratch)) {
|
|
decoded = &scratch;
|
|
} else {
|
|
LOG_ERROR("Error decoding PowerTelemetry module!");
|
|
return NULL;
|
|
}
|
|
// Check for a request for power metrics
|
|
if (decoded->which_variant == meshtastic_Telemetry_power_metrics_tag) {
|
|
meshtastic_Telemetry m = meshtastic_Telemetry_init_zero;
|
|
if (getPowerTelemetry(&m)) {
|
|
LOG_INFO("Power telemetry reply to request");
|
|
return allocDataProtobuf(m);
|
|
} else {
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
bool PowerTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
|
|
{
|
|
meshtastic_Telemetry m = meshtastic_Telemetry_init_zero;
|
|
m.which_variant = meshtastic_Telemetry_power_metrics_tag;
|
|
m.time = getTime();
|
|
bool validTelemetry = getPowerTelemetry(&m);
|
|
if (validTelemetry) {
|
|
LOG_INFO("Send: ch1_voltage=%f, ch1_current=%f, ch2_voltage=%f, ch2_current=%f, "
|
|
"ch3_voltage=%f, ch3_current=%f",
|
|
m.variant.power_metrics.ch1_voltage, m.variant.power_metrics.ch1_current, m.variant.power_metrics.ch2_voltage,
|
|
m.variant.power_metrics.ch2_current, m.variant.power_metrics.ch3_voltage, m.variant.power_metrics.ch3_current);
|
|
|
|
sensor_read_error_count = 0;
|
|
|
|
meshtastic_MeshPacket *p = allocDataProtobuf(m);
|
|
if (!p) {
|
|
validTelemetry = false;
|
|
} else {
|
|
p->to = dest;
|
|
p->decoded.want_response = false;
|
|
if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR)
|
|
p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
|
|
else
|
|
p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
|
|
// release previous packet before occupying a new spot
|
|
if (lastMeasurementPacket != nullptr)
|
|
packetPool.release(lastMeasurementPacket);
|
|
|
|
lastMeasurementPacket = packetPool.allocCopy(*p);
|
|
if (phoneOnly) {
|
|
LOG_INFO("Send packet to phone");
|
|
service->sendToPhone(p);
|
|
} else {
|
|
LOG_INFO("Send packet to mesh");
|
|
service->sendToMesh(p, RX_SRC_LOCAL, true);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Arm the pre-sleep sequence even when no valid reading was available this cycle: a
|
|
// power-saving SENSOR node must still return to deep sleep, otherwise it stays awake
|
|
// until the next telemetry interval and drains its battery
|
|
if (!phoneOnly && isPowerSavingSensor()) {
|
|
if (!validTelemetry)
|
|
LOG_WARN("Power telemetry unavailable this cycle, sleep without sending");
|
|
sleepOnNextExecution = true;
|
|
preflightSleepDeferrals = 0;
|
|
LOG_DEBUG("Start next execution in 5s then sleep");
|
|
setIntervalFromNow(FIVE_SECONDS_MS);
|
|
}
|
|
return validTelemetry;
|
|
}
|
|
|
|
#endif |