From 47e7b00000ff7e68e1f6e3e2ebd64c3d8223945f Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Fri, 3 Dec 2021 18:59:10 -0800
Subject: [PATCH] Cleanup rangetestplugin #950

---
 src/plugins/esp32/RangeTestPlugin.cpp | 34 ++++++++-------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/plugins/esp32/RangeTestPlugin.cpp b/src/plugins/esp32/RangeTestPlugin.cpp
index f5cc87d1..df15a385 100644
--- a/src/plugins/esp32/RangeTestPlugin.cpp
+++ b/src/plugins/esp32/RangeTestPlugin.cpp
@@ -48,9 +48,6 @@ int32_t RangeTestPlugin::runOnce()
     if (radioConfig.preferences.range_test_plugin_enabled) {
 
         if (firstTime) {
-
-            // Interface with the serial peripheral from in here.
-
             rangeTestPluginRadio = new RangeTestPluginRadio();
 
             firstTime = 0;
@@ -130,28 +127,21 @@ ProcessMessage RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
 
     if (radioConfig.preferences.range_test_plugin_enabled) {
 
-        auto &p = mp.decoded;
-        // DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
-        //          nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
+        /*
+            auto &p = mp.decoded;
+            DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
+                  nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
+        */
 
         if (getFrom(&mp) != nodeDB.getNodeNum()) {
 
-            // DEBUG_MSG("* * Message came from the mesh\n");
-            // Serial2.println("* * Message came from the mesh");
-            // Serial2.printf("%s", p.payload.bytes);
-            /*
-
-
-
-            */
-
-            NodeInfo *n = nodeDB.getNode(getFrom(&mp));
-
             if (radioConfig.preferences.range_test_plugin_save) {
                 appendFile(mp);
             }
 
             /*
+            NodeInfo *n = nodeDB.getNode(getFrom(&mp));
+
             DEBUG_MSG("-----------------------------------------\n");
             DEBUG_MSG("p.payload.bytes  \"%s\"\n", p.payload.bytes);
             DEBUG_MSG("p.payload.size   %d\n", p.payload.size);
@@ -159,12 +149,12 @@ ProcessMessage RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
             DEBUG_MSG("mp.from          %d\n", mp.from);
             DEBUG_MSG("mp.rx_snr        %f\n", mp.rx_snr);
             DEBUG_MSG("mp.hop_limit     %d\n", mp.hop_limit);
-            // DEBUG_MSG("mp.decoded.position.latitude_i     %d\n", mp.decoded.position.latitude_i); // Depricated
-            // DEBUG_MSG("mp.decoded.position.longitude_i    %d\n", mp.decoded.position.longitude_i); // Depricated
+            DEBUG_MSG("mp.decoded.position.latitude_i     %d\n", mp.decoded.position.latitude_i); // Depricated
+            DEBUG_MSG("mp.decoded.position.longitude_i    %d\n", mp.decoded.position.longitude_i); // Depricated
             DEBUG_MSG("---- Node Information of Received Packet (mp.from):\n");
             DEBUG_MSG("n->user.long_name         %s\n", n->user.long_name);
             DEBUG_MSG("n->user.short_name        %s\n", n->user.short_name);
-            // DEBUG_MSG("n->user.macaddr           %X\n", n->user.macaddr);
+            DEBUG_MSG("n->user.macaddr           %X\n", n->user.macaddr);
             DEBUG_MSG("n->has_position           %d\n", n->has_position);
             DEBUG_MSG("n->position.latitude_i    %d\n", n->position.latitude_i);
             DEBUG_MSG("n->position.longitude_i   %d\n", n->position.longitude_i);
@@ -259,9 +249,6 @@ bool RangeTestPluginRadio::appendFile(const MeshPacket &mp)
     struct timeval tv;
     if (!gettimeofday(&tv, NULL)) {
         long hms = tv.tv_sec % SEC_PER_DAY;
-        // hms += tz.tz_dsttime * SEC_PER_HOUR;
-        // hms -= tz.tz_minuteswest * SEC_PER_MIN;
-        // mod `hms` to ensure in positive range of [0...SEC_PER_DAY)
         hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
 
         // Tear apart hms into h:m:s
@@ -294,7 +281,6 @@ bool RangeTestPluginRadio::appendFile(const MeshPacket &mp)
 
     // TODO: If quotes are found in the payload, it has to be escaped.
     fileToAppend.printf("\"%s\"\n", p.payload.bytes);
-
     fileToAppend.close();
 
     return 1;