From fab5e4c5cceb83b770ff307e0807d313578526f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 3 Feb 2023 00:42:35 +0100 Subject: [PATCH] potential fix for Range Test Leak. Poking around in the dark. --- src/modules/esp32/RangeTestModule.cpp | 12 ++---------- src/modules/esp32/RangeTestModule.h | 7 ------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/modules/esp32/RangeTestModule.cpp b/src/modules/esp32/RangeTestModule.cpp index dbbb47ea7..608e0868c 100644 --- a/src/modules/esp32/RangeTestModule.cpp +++ b/src/modules/esp32/RangeTestModule.cpp @@ -56,7 +56,7 @@ int32_t RangeTestModule::runOnce() return (5000); // Sending first message 5 seconds after initilization. } else { LOG_INFO("Initializing Range Test Module -- Receiver\n"); - return (INT32_MAX); + return disable(); // This thread does not need to run as a receiver } @@ -91,17 +91,9 @@ int32_t RangeTestModule::runOnce() return disable(); } -meshtastic_MeshPacket *RangeTestModuleRadio::allocReply() -{ - - auto reply = allocDataPacket(); // Allocate a packet for sending - - return reply; -} - void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies) { - meshtastic_MeshPacket *p = allocReply(); + meshtastic_MeshPacket *p = allocDataPacket(); p->to = dest; p->decoded.want_response = wantReplies; diff --git a/src/modules/esp32/RangeTestModule.h b/src/modules/esp32/RangeTestModule.h index e404bd8b6..533621d47 100644 --- a/src/modules/esp32/RangeTestModule.h +++ b/src/modules/esp32/RangeTestModule.h @@ -43,14 +43,7 @@ class RangeTestModuleRadio : public SinglePortModule */ bool appendFile(const meshtastic_MeshPacket &mp); - /** - * Kevin's magical calculation of two points to meters. - */ - float latLongToMeter(double lat_a, double lng_a, double lat_b, double lng_b); - protected: - virtual meshtastic_MeshPacket *allocReply() override; - /** Called to handle a particular incoming message @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for