From bce23ec3fbfccdb6c1d9ac6b6ed3e713d3ba93be Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Wed, 24 Jul 2024 17:11:59 -0700
Subject: [PATCH] cleanupStartLoop

---
 mesh_bot.py | 45 ++++++++++++++++++++-------------------------
 pong_bot.py | 17 +++++++++++------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/mesh_bot.py b/mesh_bot.py
index c8194bd..1308156 100755
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -262,51 +262,46 @@ def onReceive(packet, interface):
                     print(f"{log_timestamp()} System: Ignoring incoming Device:{rxNode} Channel:{channel_number} Message: {message_string} From: {get_name_from_number(message_from_id)}")
                 
     except KeyError as e:
-        print(f"System: Error processing packet: {e}")
+        print(f"{log_timestamp()} System: Error processing packet: {e}")
         print(packet) # print the packet for debugging
         print("END of packet \n")
 
 def start_rx():
+    print ("\nMeshtastic Autoresponder Bot CTL+C to exit\n")
+    if bbs_enabled:
+        print(f"{log_timestamp()} System: BBS Enabled, using {bbsdb}")
+    if solar_conditions_enabled:
+        print(f"{log_timestamp()} System: Celestial Telemetry Enabled")
+    if location_enabled:
+        print(f"{log_timestamp()} System: Location Telemetry Enabled")
+    if dad_jokes_enabled:
+        print(f"{log_timestamp()} System: Dad Jokes Enabled!")
+    if store_forward_enabled:
+        print(f"Sys{log_timestamp()} Systemtem: Store and Forward Enabled")
+    if useDMForResponse:
+        print(f"{log_timestamp()} System: Respond by DM only")
     # Start the receive loop
     pub.subscribe(onReceive, 'meshtastic.receive')
-    print (f"System: Autoresponder Started for device {get_name_from_number(myNodeNum)}")
+    print (f"{log_timestamp()} System: Autoresponder Started for device {get_name_from_number(myNodeNum)}")
     while True:
         time.sleep(0.05)
         pass
 
 def exit_handler():
     # Close the interface and save the BBS messages
-    print("\nSystem: Closing Autoresponder")
+    print(f"\n{log_timestamp()} System: Closing Autoresponder\n")
     interface1.close()
-    print("System: Interface1 Closed")
+    print(f"{log_timestamp()} System: Interface1 Closed")
     if interface2_enabled:
         #interface2.close()
-        print("System: Interface2 Closed remember to fix this line")
+        print(f"{log_timestamp()} System: Interface2 Closed remember to fix this line")
     if bbs_enabled:
-        print("Saving BBS Messages")
         save_bbsdb()
-    print("System: BBS Messages Saved")
-    print("System: Exiting")
+        print(f"{log_timestamp()} System: BBS Messages Saved")
+    print(f"{log_timestamp()} System: Exiting")
     exit (0)
 
 # Hello World 
-print ("\nMeshtastic Autoresponder Bot CTL+C to exit\n")
-
-if bbs_enabled:
-    print(f"System: BBS Enabled, using {bbsdb}")
-
-if solar_conditions_enabled:
-    print(f"System: Celestial Telemetry Enabled")
-
-if location_enabled:
-    print(f"System: Location Telemetry Enabled")
-
-if dad_jokes_enabled:
-    print(f"System: Dad Jokes Enabled!")
-
-if store_forward_enabled:
-    print(f"System: Store and Forward Enabled")
-
 loop = asyncio.new_event_loop()
 try:
     loop.run_forever(start_rx())
diff --git a/pong_bot.py b/pong_bot.py
index 5f1777d..bae7eb9 100755
--- a/pong_bot.py
+++ b/pong_bot.py
@@ -159,21 +159,26 @@ def onReceive(packet, interface):
                     print(f"{log_timestamp()} System: Ignoring incoming Device:{rxNode} Channel:{channel_number} Message: {message_string} From: {get_name_from_number(message_from_id)}")
                 
     except KeyError as e:
-        print(f"System: Error processing packet: {e}")
+        print(f"{log_timestamp()} System: Error processing packet: {e}")
         print(packet) # print the packet for debugging
         print("END of packet \n")
+
+
 def exit_handler():
     # Close the interface and save the BBS messages
-    print("\nSystem: Closing Autoresponder")
-    interface.close()
-    print("System: Interface Closed")
-    print("System: Exiting")
+    print(f"\n{log_timestamp()} System: Closing Autoresponder\n")
+    interface1.close()
+    print(f"{log_timestamp()} System: Interface1 Closed")
+    if interface2_enabled:
+        #interface2.close()
+        print(f"{log_timestamp()} System: Interface2 Closed remember to fix this line")
+    print(f"{log_timestamp()} System: Exiting")
     exit (0)
 
 def start_rx():
     # Start the receive loop
     pub.subscribe(onReceive, 'meshtastic.receive')
-    print (f"System: Autoresponder Started for device {get_name_from_number(myNodeNum)}")
+    print (f"{log_timestamp()} System: Autoresponder Started for device {get_name_from_number(myNodeNum)}")
     while True:
         time.sleep(0.05)
         pass