pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-18 03:03:20 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix #1914 and clean up rangetest a bit

Browse Source
This commit is contained in:
Thomas Göttgens 2022-11-09 15:12:57 +01:00
parent 87c555bde3
commit 4dd140a887
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/esp32/RangeTestModule.cpp
View File

@ -12,7 +12,7 @@
//#include <assert.h> //#include <assert.h>
/* /*
As a sender, I can send packets every n-seonds. These packets include an incramented PacketID. As a sender, I can send packets every n seconds. These packets include an incremented PacketID.
As a receiver, I can receive packets from multiple senders. These packets can be saved to the Filesystem. As a receiver, I can receive packets from multiple senders. These packets can be saved to the Filesystem.
*/ */
@ -36,12 +36,12 @@ int32_t RangeTestModule::runOnce()
without having to configure it from the PythonAPI or WebUI. without having to configure it from the PythonAPI or WebUI.
*/ */
//moduleConfig.range_test.enabled = 1; // moduleConfig.range_test.enabled = 1;
//moduleConfig.range_test.sender = 30; // moduleConfig.range_test.sender = 30;
// moduleConfig.range_test.save = 1; // moduleConfig.range_test.save = 1;
// Fixed position is useful when testing indoors. // Fixed position is useful when testing indoors.
// radioConfig.preferences.fixed_position = 1; // config.position.fixed_position = 1;
uint32_t senderHeartbeat = moduleConfig.range_test.sender * 1000; uint32_t senderHeartbeat = moduleConfig.range_test.sender * 1000;
@ -57,7 +57,8 @@ int32_t RangeTestModule::runOnce()
return (5000); // Sending first message 5 seconds after initilization. return (5000); // Sending first message 5 seconds after initilization.
} else { } else {
DEBUG_MSG("Initializing Range Test Module -- Receiver\n"); DEBUG_MSG("Initializing Range Test Module -- Receiver\n");
return (500); return (INT32_MAX);
// This thread does not need to run as a receiver
} }
} else { } else {
@ -70,8 +71,7 @@ int32_t RangeTestModule::runOnce()
DEBUG_MSG("gpsStatus->getLongitude() %d\n", gpsStatus->getLongitude()); DEBUG_MSG("gpsStatus->getLongitude() %d\n", gpsStatus->getLongitude());
DEBUG_MSG("gpsStatus->getHasLock() %d\n", gpsStatus->getHasLock()); DEBUG_MSG("gpsStatus->getHasLock() %d\n", gpsStatus->getHasLock());
DEBUG_MSG("gpsStatus->getDOP() %d\n", gpsStatus->getDOP()); DEBUG_MSG("gpsStatus->getDOP() %d\n", gpsStatus->getDOP());
DEBUG_MSG("gpsStatus->getHasLock() %d\n", gpsStatus->getHasLock()); DEBUG_MSG("fixed_position() %d\n", config.position.fixed_position);
DEBUG_MSG("pref.fixed_position() %d\n", config.position.fixed_position);
// Only send packets if the channel is less than 25% utilized. // Only send packets if the channel is less than 25% utilized.
if (airTime->channelUtilizationPercent() < 25) { if (airTime->channelUtilizationPercent() < 25) {
@ -82,11 +82,11 @@ int32_t RangeTestModule::runOnce()
return (senderHeartbeat); return (senderHeartbeat);
} else { } else {
// Otherwise, we're a receiver. return (INT32_MAX);
// This thread does not need to run as a receiver
return (500);
} }
// TBD
} }
} else { } else {
@ -221,6 +221,8 @@ bool RangeTestModuleRadio::appendFile(const MeshPacket &mp)
return 0; return 0;
} }
FSCom.mkdir("/static");
// If the file doesn't exist, write the header. // If the file doesn't exist, write the header.
if (!FSCom.exists("/static/rangetest.csv")) { if (!FSCom.exists("/static/rangetest.csv")) {
//--------- Write to file //--------- Write to file