pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 09:42:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Enable range test module (sending only) on NRF (#2534)

Browse Source 
* Enable range test module (sending only) on NRF

* Consolidate
This commit is contained in:
Ben Meadors 2023-05-31 20:08:32 -05:00 committed by GitHub
parent b1398d0770
commit 9d3dc9283c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/Modules.cpp
View File

@ -22,11 +22,11 @@
#endif #endif
#ifdef ARCH_ESP32 #ifdef ARCH_ESP32
#include "modules/esp32/AudioModule.h" #include "modules/esp32/AudioModule.h"
#include "modules/esp32/RangeTestModule.h"
#include "modules/esp32/StoreForwardModule.h" #include "modules/esp32/StoreForwardModule.h"
#endif #endif
#if defined(ARCH_ESP32) || defined(ARCH_NRF52) #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
#include "modules/ExternalNotificationModule.h" #include "modules/ExternalNotificationModule.h"
#include "modules/RangeTestModule.h"
#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(CONFIG_IDF_TARGET_ESP32S2) #if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(CONFIG_IDF_TARGET_ESP32S2)
#include "modules/SerialModule.h" #include "modules/SerialModule.h"
#endif #endif
@ -78,13 +78,12 @@ void setupModules()
#ifdef ARCH_ESP32 #ifdef ARCH_ESP32
// Only run on an esp32 based device. // Only run on an esp32 based device.
audioModule = new AudioModule(); audioModule = new AudioModule();
externalNotificationModule = new ExternalNotificationModule();
storeForwardModule = new StoreForwardModule(); storeForwardModule = new StoreForwardModule();
#endif
new RangeTestModule(); #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
#elif defined(ARCH_NRF52)
externalNotificationModule = new ExternalNotificationModule(); externalNotificationModule = new ExternalNotificationModule();
new RangeTestModule();
#endif #endif
} else { } else {
adminModule = new AdminModule(); adminModule = new AdminModule();

10
src/modules/esp32/RangeTestModule.cpp → src/modules/RangeTestModule.cpp
View File

@ -1,4 +1,5 @@
#include "RangeTestModule.h" #include "RangeTestModule.h"
#include "FSCommon.h"
#include "MeshService.h" #include "MeshService.h"
#include "NodeDB.h" #include "NodeDB.h"
#include "PowerFSM.h" #include "PowerFSM.h"
@ -8,7 +9,6 @@
#include "configuration.h" #include "configuration.h"
#include "gps/GeoCoord.h" #include "gps/GeoCoord.h"
#include <Arduino.h> #include <Arduino.h>
#include <FSCommon.h>
/* /*
As a sender, I can send packets every n seconds. These packets include an incremented PacketID. As a sender, I can send packets every n seconds. These packets include an incremented PacketID.
@ -28,7 +28,7 @@ uint32_t packetSequence = 0;
int32_t RangeTestModule::runOnce() int32_t RangeTestModule::runOnce()
{ {
#ifdef ARCH_ESP32 #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
/* /*
Uncomment the preferences below if you want to use the module Uncomment the preferences below if you want to use the module
@ -60,7 +60,6 @@ int32_t RangeTestModule::runOnce()
return disable(); return disable();
// This thread does not need to run as a receiver // This thread does not need to run as a receiver
} }
} else { } else {
if (moduleConfig.range_test.sender) { if (moduleConfig.range_test.sender) {
@ -122,7 +121,7 @@ void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket &mp) ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket &mp)
{ {
#ifdef ARCH_ESP32 #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
if (moduleConfig.range_test.enabled) { if (moduleConfig.range_test.enabled) {
@ -165,7 +164,6 @@ ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket
LOG_DEBUG("-----------------------------------------\n"); LOG_DEBUG("-----------------------------------------\n");
*/ */
} }
} else { } else {
LOG_INFO("Range Test Module Disabled\n"); LOG_INFO("Range Test Module Disabled\n");
} }
@ -177,6 +175,7 @@ ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket
bool RangeTestModuleRadio::appendFile(const meshtastic_MeshPacket &mp) bool RangeTestModuleRadio::appendFile(const meshtastic_MeshPacket &mp)
{ {
#ifdef ARCH_ESP32
auto &p = mp.decoded; auto &p = mp.decoded;
meshtastic_NodeInfo *n = nodeDB.getNode(getFrom(&mp)); meshtastic_NodeInfo *n = nodeDB.getNode(getFrom(&mp));
@ -284,6 +283,7 @@ bool RangeTestModuleRadio::appendFile(const meshtastic_MeshPacket &mp)
fileToAppend.printf("\"%s\"\n", p.payload.bytes); fileToAppend.printf("\"%s\"\n", p.payload.bytes);
fileToAppend.flush(); fileToAppend.flush();
fileToAppend.close(); fileToAppend.close();
#endif
return 1; return 1;
} }

0
src/modules/esp32/RangeTestModule.h → src/modules/RangeTestModule.h
View File