DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted MyMesh constructor for simplicity.

Browse Source 
Updated formatStatsReply method to use new member variables for statistics handling.
Removed excess variable creation
This commit is contained in:
agessaman
2025-11-08 20:44:42 -08:00
parent df4dab8509
commit c9aa536ca6
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/companion_radio/MyMesh.cpp
View File

@@ -710,7 +710,7 @@ uint32_t MyMesh::calcDirectTimeoutMillisFor(uint32_t pkt_airtime_millis, uint8_t
void MyMesh::onSendTimeout() {} void MyMesh::onSendTimeout() {}
MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables, DataStore& store, AbstractUITask* ui) MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables, DataStore& store, AbstractUITask* ui)
: BaseChatMesh(radio, *(_ms_clock = new ArduinoMillis()), rng, rtc, *(_pkt_mgr = new StaticPoolPacketManager(16)), tables), : BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables),
_serial(NULL), telemetry(MAX_PACKET_PAYLOAD - 4), _store(&store), _ui(ui) { _serial(NULL), telemetry(MAX_PACKET_PAYLOAD - 4), _store(&store), _ui(ui) {
_iter_started = false; _iter_started = false;
_cli_rescue = false; _cli_rescue = false;
@@ -1612,8 +1612,7 @@ void MyMesh::enterCLIRescue() {
void MyMesh::formatStatsReply(char *reply) { void MyMesh::formatStatsReply(char *reply) {
// Use StatsFormatHelper // Use StatsFormatHelper
// Note: err_flags is private in Dispatcher, so we use 0 StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
StatsFormatHelper::formatCoreStats(reply, board, *_ms_clock, 0, _pkt_mgr);
} }
void MyMesh::formatRadioStatsReply(char *reply) { void MyMesh::formatRadioStatsReply(char *reply) {

2
examples/companion_radio/MyMesh.h
View File

@@ -184,8 +184,6 @@ private:
private: private:
DataStore* _store; DataStore* _store;
NodePrefs _prefs; NodePrefs _prefs;
mesh::PacketManager* _pkt_mgr; // stored for stats access
mesh::MillisecondClock* _ms_clock; // stored for stats access
uint32_t pending_login; uint32_t pending_login;
uint32_t pending_status; uint32_t pending_status;
uint32_t pending_telemetry, pending_discovery; // pending _TELEMETRY_REQ uint32_t pending_telemetry, pending_discovery; // pending _TELEMETRY_REQ