From 47bd8d1d2605262466f4b6971fe2876a57d552d2 Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Wed, 21 Aug 2024 17:47:42 -0700
Subject: [PATCH] HeartbeatCleanup

Better Code for more secure operations, dropping OS and SYS modules and using a built in. requires Python 3.4 at least for this function.
---
 README.md         |  4 +++-
 modules/system.py | 26 +++++++-------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index d306998..fe92fb0 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,9 @@ signalCooldown = 5
 signalCycleLimit = 5
 ```
 # requirements
-can also be installed with `pip install -r requirements.txt`
+Python 3.4 and likely higher is needed, developed on latest release.
+
+The following can also be installed with `pip install -r requirements.txt` or using the install.sh script for venv and automation
 
 ```
 pip install meshtastic
diff --git a/modules/system.py b/modules/system.py
index afaca99..d3eaedf 100644
--- a/modules/system.py
+++ b/modules/system.py
@@ -6,6 +6,7 @@ import meshtastic.tcp_interface
 import meshtastic.ble_interface
 import time
 import asyncio
+import contextlib # for suppressing output on watchdog
 from modules.log import *
 
 # Global Variables
@@ -588,22 +589,6 @@ async def retry_interface(nodeID=1):
     except Exception as e:
         logger.error(f"System: opening interface2: {e}")
 
-# this is a workaround because .localNode.getMetadata spits out a lot of debug info which cant be suppressed
-
-from contextlib import contextmanager
-import os
-import sys
-
-@contextmanager
-def suppress_stdout():
-    with open(os.devnull, "w") as devnull:
-        old_stdout = sys.stdout
-        sys.stdout = devnull
-        try:  
-            yield
-        finally:
-            sys.stdout = old_stdout
-
 async def watchdog():
     global retry_int1, retry_int2
     if sentry_enabled:
@@ -619,8 +604,10 @@ async def watchdog():
         #print(f"MeshBot System: watchdog running\r", end="")
         if interface1 is not None and not retry_int1:
             try:
-                with suppress_stdout():
+                # this is a workaround because .localNode.getMetadata spits out a lot of debug info which cant be suppressed
+                with contextlib.redirect_stdout(None):
                     interface1.localNode.getMetadata()
+                    print(f"System: if you see this upgrade python to >3.4")
                 #if "device_state_version:" not in meta:
             except Exception as e:
                 logger.error(f"System: communicating with interface1, trying to reconnect: {e}")
@@ -660,8 +647,9 @@ async def watchdog():
         if interface2_enabled:
             if interface2 is not None and not retry_int2:
                 try:
-                    with suppress_stdout():
-                        interface2.localNode.getMetadata()
+                    with contextlib.redirect_stdout(None):
+                        interface1.localNode.getMetadata()
+                        print(f"System: if you see this upgrade python to >3.4")
                 except Exception as e:
                     logger.error(f"System: communicating with interface2, trying to reconnect: {e}")
                     retry_int2 = True