Fixed logging directory issue on S500, Omniscan, and Surveyor. Added calc_msec_per_ping to S500.

Author: BradG13531

generate/templates/omniscan450.py.in

@@ -245,7 +245,7 @@ class Omniscan450(PingDevice):
         save_name = dt.strftime("%Y-%m-%d-%H-%M")
 
         if log_directory is None:
-            project_root = Path.cwd().parent
+            project_root = Path.cwd()
             self.log_directory = project_root / "logs/omniscan"
         else:
             self.log_directory = Path(log_directory)

generate/templates/s500.py.in

@@ -14,6 +14,7 @@ from brping import pingmessage
 import time
 import struct
 import socket
+import math
 from datetime import datetime, timezone
 from pathlib import Path
 
@@ -158,6 +159,11 @@ class S500(PingDevice):
                 except ConnectionResetError as e:
                     raise ConnectionError("Socket connection was reset: %s" % str(e))       
 
+    # Calculate the milliseconds per ping from a ping rate
+    @staticmethod
+    def calc_msec_per_ping(ping_rate):
+        return math.floor(1000.0 / ping_rate)
+
     # Converts power results to correct format
     @staticmethod
     def scale_power(msg):
@@ -276,7 +282,7 @@ class S500(PingDevice):
         save_name = dt.strftime("%Y-%m-%d-%H-%M")
 
         if log_directory is None:
-            project_root = Path.cwd().parent
+            project_root = Path.cwd()
             self.log_directory = project_root / "logs/s500"
         else:
             self.log_directory = Path(log_directory)

generate/templates/surveyor240.py.in

@@ -14,6 +14,7 @@ from brping import pingmessage
 import time
 import struct
 import socket
+import math
 from datetime import datetime, timezone
 from pathlib import Path
 
@@ -232,7 +233,7 @@ class Surveyor240(PingDevice):
         save_name = dt.strftime("%Y-%m-%d-%H-%M")
 
         if log_directory is None:
-            project_root = Path.cwd().parent
+            project_root = Path.cwd()
             self.log_directory = project_root / "logs/surveyor"
         else:
             self.log_directory = Path(log_directory)
@@ -395,6 +396,10 @@ class Surveyor240(PingDevice):
         yz_list = struct.unpack('<' + 'f' * int(msg.num_points) * 2, raw_array)
         return yz_list
 
+    # Calculate the milliseconds per ping from a ping rate
+    @staticmethod
+    def calc_msec_per_ping(ping_rate):
+        return math.floor(1000.0 / ping_rate)
 
 if __name__ == "__main__":
     import argparse