Some minor changes to .svlog feature in omniscan, surveyor, and s500

Author: BradG13531

examples/omniscan450Example.py

@@ -114,7 +114,7 @@ def signal_handler(sig, frame):
         while True:
             data = Omniscan450.read_packet(f)
 
-            if data == None:
+            if data is None:
                 break # EOF or bad packet
 
             print(f"ID: {data.message_id}\tName: {data.name}")
@@ -171,9 +171,12 @@ def signal_handler(sig, frame):
     try:
         while True:
             data = myOmniscan450.wait_message([definitions.OMNISCAN450_OS_MONO_PROFILE])
-            if data and not new_log:
+            if data:
                 scaled_result = Omniscan450.scale_power(data)
-                print(f"Average power: {sum(scaled_result) / len(scaled_result)}")
+                try:
+                    print(f"Average power: {sum(scaled_result) / len(scaled_result)}")
+                except ZeroDivisionError:
+                    print("Length of scaled_result is 0")
             elif not data:
                 print("Failed to get message")
     except KeyboardInterrupt:

examples/s500Example.py

@@ -113,14 +113,21 @@ def signal_handler(sig, frame):
         while True:
             data = S500.read_packet(f)
 
-            if data == None:
+            if data is None:
                 break   # EOF or bad packet
 
-            print(f"ID: {data.message_id}\tName: {data.name}")
+            # Uncomment to print out all packets contained in log file
+            # print(f"ID: {data.message_id}\tName: {data.name}")
+
+            if data.message_id == definitions.S500_PROFILE6_T:
+                scaled_result = S500.scale_power(data)
+                try:
+                    print(f"Average power: {sum(scaled_result) / len(scaled_result)}")
+                except ZeroDivisionError:
+                    print("Length of scaled_result is 0")
 
 # Connected to physical S500
 else:
-    print("\n-------Profile6-------")
     # Tell S500 to send profile6 data
     if args.range is not None:
         parts = args.range.split(':')
@@ -163,9 +170,12 @@ def signal_handler(sig, frame):
             # Read and print profile6 data
             data = myS500.wait_message([definitions.S500_PROFILE6_T,
                                         definitions.S500_DISTANCE2])
-            if data and not new_log:
+            if data:
                 scaled_result = S500.scale_power(data)
-                print(f"Average power: {sum(scaled_result) / len(scaled_result)}")
+                try:
+                    print(f"Average power: {sum(scaled_result) / len(scaled_result)}")
+                except ZeroDivisionError:
+                    print("Length of scaled_result is 0")
             elif not data:
                 print("Failed to get message")
     except KeyboardInterrupt:

examples/surveyor240Example.py

@@ -113,7 +113,7 @@ def signal_handler(sig, frame):
         while True:
             data = Surveyor240.read_packet(f)
 
-            if data == None:
+            if data is None:
                 break   # EOF or bad packet
 
             # print(f"ID: {data.message_id}\tName: {data.name}")
@@ -204,13 +204,14 @@ def signal_handler(sig, frame):
                                                definitions.SURVEYOR240_YZ_POINT_DATA,
                                                definitions.SURVEYOR240_WATER_STATS])
 
-            ## To watch pitch and roll data in real time while recording, uncomment this block
-            if data.message_id == definitions.SURVEYOR240_ATTITUDE_REPORT:
-                # Print pitch and roll data
-                vector = (data.up_vec_x, data.up_vec_y, data.up_vec_z)
-                pitch = math.asin(vector[0])
-                roll = math.atan2(vector[1], vector[2])
-                print(f"Pitch: {pitch}\tRoll: {roll}")
+            if data:
+                ## To watch pitch and roll data in real time while recording, uncomment this block
+                if data.message_id == definitions.SURVEYOR240_ATTITUDE_REPORT:
+                    # Print pitch and roll data
+                    vector = (data.up_vec_x, data.up_vec_y, data.up_vec_z)
+                    pitch = math.asin(vector[0])
+                    roll = math.atan2(vector[1], vector[2])
+                    print(f"Pitch: {pitch}\tRoll: {roll}")
 
     except KeyboardInterrupt:
         if new_log:

generate/templates/omniscan450.py.in

@@ -250,9 +250,9 @@ class Omniscan450(PingDevice):
         else:
             self.log_directory = Path(log_directory)
 
-        log_directory.mkdir(parents=True, exist_ok=True)
+        self.log_directory.mkdir(parents=True, exist_ok=True)
 
-        log_path = log_directory / f"{save_name}.svlog"
+        log_path = self.log_directory / f"{save_name}.svlog"
 
         if log_path.exists():
             log_path.unlink() # delete existing file (program was restarted quickly)

generate/templates/s500.py.in

@@ -281,9 +281,9 @@ class S500(PingDevice):
         else:
             self.log_directory = Path(log_directory)
 
-        log_directory.mkdir(parents=True, exist_ok=True)
+        self.log_directory.mkdir(parents=True, exist_ok=True)
 
-        log_path = log_directory / f"{save_name}.svlog"
+        log_path = self.log_directory / f"{save_name}.svlog"
 
         if log_path.exists():
             log_path.unlink() # delete existing file (program was restarted quickly)

generate/templates/surveyor240.py.in

@@ -237,9 +237,9 @@ class Surveyor240(PingDevice):
         else:
             self.log_directory = Path(log_directory)
 
-        log_directory.mkdir(parents=True, exist_ok=True)
+        self.log_directory.mkdir(parents=True, exist_ok=True)
 
-        log_path = log_directory / f"{save_name}.svlog"
+        log_path = self.log_directory / f"{save_name}.svlog"
 
         if log_path.exists():
             log_path.unlink() # delete existing file (program was restarted quickly)