mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-14 15:31:31 +10:00
Thomas Göttgens
38074f584f
* Fix SENSOR power saving deep sleep behavior Deep sleep could be entered while a telemetry packet was still queued or on air, truncating the transmission. canSleep() gained a deepSleep parameter and now vetoes in that case; light sleep is unchanged. Telemetry modules defer a pending deep sleep (bounded to 30s) until the radio is idle and no longer let the sensor polling interval override the 5s pre-sleep grace period. A failed sensor read still arms deep sleep instead of leaving the node awake for a full telemetry interval. Fixes #10890 Fixes #10932 * Deduplicate telemetry deep sleep deferral logic Move the radio-busy deferral and its counter into BaseTelemetryModule and add an isPowerSavingSensor() helper. Removes the telemetry-specific counter from OSThread. The sleep arming block stays per module because it needs protected OSThread members not visible to the base class.
75 lines
2.9 KiB
C++
75 lines
2.9 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
|
|
|
#pragma once
|
|
|
|
#include "BaseTelemetryModule.h"
|
|
|
|
#ifndef ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE
|
|
#define ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE 0
|
|
#endif
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "NodeDB.h"
|
|
#include "ProtobufModule.h"
|
|
#include "detect/ScanI2CConsumer.h"
|
|
#include <OLEDDisplay.h>
|
|
#include <OLEDDisplayUi.h>
|
|
|
|
class EnvironmentTelemetryModule : private concurrency::OSThread,
|
|
public ScanI2CConsumer,
|
|
public BaseTelemetryModule,
|
|
public ProtobufModule<meshtastic_Telemetry>
|
|
{
|
|
CallbackObserver<EnvironmentTelemetryModule, const meshtastic::Status *> nodeStatusObserver =
|
|
CallbackObserver<EnvironmentTelemetryModule, const meshtastic::Status *>(this,
|
|
&EnvironmentTelemetryModule::handleStatusUpdate);
|
|
|
|
public:
|
|
EnvironmentTelemetryModule()
|
|
: concurrency::OSThread("EnvironmentTelemetry"), ScanI2CConsumer(),
|
|
ProtobufModule("EnvironmentTelemetry", meshtastic_PortNum_TELEMETRY_APP, &meshtastic_Telemetry_msg)
|
|
{
|
|
lastMeasurementPacket = nullptr;
|
|
nodeStatusObserver.observe(&nodeStatus->onNewStatus);
|
|
setIntervalFromNow(10 * 1000);
|
|
}
|
|
virtual bool wantUIFrame() override;
|
|
#if !HAS_SCREEN
|
|
void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
|
|
#else
|
|
virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
|
|
#endif
|
|
|
|
protected:
|
|
/** Called to handle a particular incoming message
|
|
@return true if you've guaranteed you've handled this message and no other handlers should be considered for it
|
|
*/
|
|
virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *p) override;
|
|
virtual int32_t runOnce() override;
|
|
/** Called to get current Environment telemetry data
|
|
@return true if it contains valid data
|
|
*/
|
|
bool getEnvironmentTelemetry(meshtastic_Telemetry *m);
|
|
virtual meshtastic_MeshPacket *allocReply() override;
|
|
/**
|
|
* Send our Telemetry into the mesh
|
|
*/
|
|
bool sendTelemetry(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
|
|
|
|
virtual AdminMessageHandleResult handleAdminMessageForModule(const meshtastic_MeshPacket &mp,
|
|
meshtastic_AdminMessage *request,
|
|
meshtastic_AdminMessage *response) override;
|
|
|
|
void i2cScanFinished(ScanI2C *i2cScanner);
|
|
|
|
private:
|
|
bool firstTime = 1;
|
|
meshtastic_MeshPacket *lastMeasurementPacket;
|
|
uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
|
|
uint32_t lastSentToPhone = 0;
|
|
};
|
|
|
|
#endif
|