From 9d3dc9283cd1f6d5699110cc70ca31776a3792b4 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Wed, 31 May 2023 20:08:32 -0500
Subject: [PATCH] Enable range test module (sending only) on NRF (#2534)

* Enable range test module (sending only) on NRF

* Consolidate
---
 src/modules/Modules.cpp                     |  9 ++++-----
 src/modules/{esp32 => }/RangeTestModule.cpp | 10 +++++-----
 src/modules/{esp32 => }/RangeTestModule.h   |  0
 3 files changed, 9 insertions(+), 10 deletions(-)
 rename src/modules/{esp32 => }/RangeTestModule.cpp (98%)
 rename src/modules/{esp32 => }/RangeTestModule.h (100%)

diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index df29698a2..61de2c265 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -22,11 +22,11 @@
 #endif
 #ifdef ARCH_ESP32
 #include "modules/esp32/AudioModule.h"
-#include "modules/esp32/RangeTestModule.h"
 #include "modules/esp32/StoreForwardModule.h"
 #endif
 #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
 #include "modules/ExternalNotificationModule.h"
+#include "modules/RangeTestModule.h"
 #if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(CONFIG_IDF_TARGET_ESP32S2)
 #include "modules/SerialModule.h"
 #endif
@@ -78,13 +78,12 @@ void setupModules()
 #ifdef ARCH_ESP32
         // Only run on an esp32 based device.
         audioModule = new AudioModule();
-        externalNotificationModule = new ExternalNotificationModule();
 
         storeForwardModule = new StoreForwardModule();
-
-        new RangeTestModule();
-#elif defined(ARCH_NRF52)
+#endif
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
         externalNotificationModule = new ExternalNotificationModule();
+        new RangeTestModule();
 #endif
     } else {
         adminModule = new AdminModule();
diff --git a/src/modules/esp32/RangeTestModule.cpp b/src/modules/RangeTestModule.cpp
similarity index 98%
rename from src/modules/esp32/RangeTestModule.cpp
rename to src/modules/RangeTestModule.cpp
index b3f03c04b..020535758 100644
--- a/src/modules/esp32/RangeTestModule.cpp
+++ b/src/modules/RangeTestModule.cpp
@@ -1,4 +1,5 @@
 #include "RangeTestModule.h"
+#include "FSCommon.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
@@ -8,7 +9,6 @@
 #include "configuration.h"
 #include "gps/GeoCoord.h"
 #include <Arduino.h>
-#include <FSCommon.h>
 
 /*
     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()
 {
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
 
     /*
         Uncomment the preferences below if you want to use the module
@@ -60,7 +60,6 @@ int32_t RangeTestModule::runOnce()
                 return disable();
                 // This thread does not need to run as a receiver
             }
-
         } else {
 
             if (moduleConfig.range_test.sender) {
@@ -122,7 +121,7 @@ void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 
 ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket &mp)
 {
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
 
     if (moduleConfig.range_test.enabled) {
 
@@ -165,7 +164,6 @@ ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket
             LOG_DEBUG("-----------------------------------------\n");
             */
         }
-
     } else {
         LOG_INFO("Range Test Module Disabled\n");
     }
@@ -177,6 +175,7 @@ ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket
 
 bool RangeTestModuleRadio::appendFile(const meshtastic_MeshPacket &mp)
 {
+#ifdef ARCH_ESP32
     auto &p = mp.decoded;
 
     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.flush();
     fileToAppend.close();
+#endif
 
     return 1;
 }
diff --git a/src/modules/esp32/RangeTestModule.h b/src/modules/RangeTestModule.h
similarity index 100%
rename from src/modules/esp32/RangeTestModule.h
rename to src/modules/RangeTestModule.h