Migrate to V2 packet format

modules/misc/unit_conversions.py

@@ -46,6 +46,7 @@ def pascals_to_psi(pascals: int) -> float:
 
     return round(pascals / 6895, 2)
 
+
 def millimeters_to_meters(millimeters: int) -> float:
     """Returns the passed millimeters value into meters.
     Args:
@@ -57,6 +58,7 @@ def millimeters_to_meters(millimeters: int) -> float:
 
     return round(millimeters / 1000, 2)
 
+
 def centimeters_to_meters(centimeters: int) -> float:
     """Returns the passed centimeters value into meters.
     Args:
@@ -68,6 +70,7 @@ def centimeters_to_meters(centimeters: int) -> float:
 
     return round(centimeters / 100, 2)
 
+
 def milliseconds_to_seconds(milliseconds: int) -> float:
     """Returns the passed milliseconds value into seconds.
     Args:
@@ -79,6 +82,7 @@ def milliseconds_to_seconds(milliseconds: int) -> float:
 
     return round(milliseconds / 1000, 2)
 
+
 def tenthdegrees_to_degrees(tenthdegrees: int) -> float:
     """Returns the passed tenth degree per second value into degrees per second.
     Args:
@@ -90,6 +94,7 @@ def tenthdegrees_to_degrees(tenthdegrees: int) -> float:
 
     return round(tenthdegrees / 10, 2)
 
+
 def microdegrees_to_degrees(microdegrees: int) -> float:
     """Returns the passed microdegree value into degrees.
     Args:
@@ -101,15 +106,16 @@ def microdegrees_to_degrees(microdegrees: int) -> float:
 
     return round(microdegrees / pow(10, 7), 2)
 
+
 def magnitude(x: int, y: int, z: int) -> float:
     """Returns the magnitude of the 3D vector specified by the input values
     Args:
         x (int): x component of the vector
         y (int): y component of the vector
         z (int): z component of the vector
-    
+
     Returns:
         float: Magnitude of vector
     """
 
-    return round((pow(x, 2) + pow(y, 2) + pow(z, 2) ** 0.5), 2)
+    return round((pow(x, 2) + pow(y, 2) + pow(z, 2) ** 0.5), 2)

modules/telemetry/packet_spec/blocks.py

@@ -27,7 +27,7 @@ def decode(cls, packet_timestamp: int, encoded: bytes) -> tuple[int]:
         """Decode the block from bytes using the struct format string
         Args:
             packet_timestamp int: Number of half minutes since power on
-            encoded bytes: Bytes containing block contents  
+            encoded bytes: Bytes containing block contents
 
         Returns:
             tuple[int]: The results of the unpacking
@@ -79,10 +79,11 @@ class TimedBlock(Block):
     def output_formatted(self, into: dict[str, Any]):
         pass
 
+
 @dataclass
 class AltitudeAboveLaunchLevel(TimedBlock):
     _struct_format: str = field(default="<Hi", init=False, repr=False)
-    measurement_time: int 
+    measurement_time: int
     altitude: int
 
     def output_formatted(self, into: dict[str, Any]):

modules/telemetry/parsing_utils.py

@@ -95,6 +95,6 @@ def parse_blocks(packet_header: PacketHeader, encoded_blocks: bytes) -> List[Blo
         logger.debug(data_block)
         parsed_blocks.append(data_block)
         # Remove the data we processed from the whole set, and move onto the next data block
-        encoded_blocks = encoded_blocks[BLOCK_HEADER_LENGTH + block_len:]
+        encoded_blocks = encoded_blocks[BLOCK_HEADER_LENGTH + block_len :]
 
     return parsed_blocks

modules/telemetry/replay.py

@@ -70,7 +70,7 @@ def __iter__(self):
         with open(self.replay_path, "rb") as file:
             callsign = file.read(9)
             if len(callsign) < 9:
-                return 
+                return
             next_packet = bytearray()
 
             while True:
@@ -80,13 +80,13 @@ def __iter__(self):
                     next_packet.extend(data)
                     yield next_packet.hex()
                     break
-                
+
                 # Start a new packet
                 if data == callsign:
                     yield next_packet.hex()
                     next_packet = bytearray()
 
-                next_packet.extend(data) 
+                next_packet.extend(data)
 
 
 class LogfileReplay(TelemetryReplay):
@@ -108,4 +108,3 @@ def run(self):
             if not self.replay_input.empty():
                 self.parse_input_command(self.replay_input.get())
             sleep(0.052)
-

tests/test_conversions.py

@@ -3,20 +3,20 @@
 
 # Imports
 import pytest
-import modules.misc.converter as conv
+from modules.misc.unit_conversions import *
 
 
 # Tests
 def test_celsius_to_fahrenheit() -> None:
     """Test that Celsius is properly converted to Fahrenheit."""
-    assert conv.celsius_to_fahrenheit(12.0) == pytest.approx(53.6)  # type: ignore
+    assert celsius_to_fahrenheit(12.0) == pytest.approx(53.6)  # type: ignore
 
 
 def test_metres_to_feet() -> None:
     """Test that metres are properly converted to feet."""
-    assert conv.metres_to_feet(5.0) == pytest.approx(16.4)  # type: ignore
+    assert metres_to_feet(5.0) == pytest.approx(16.4)  # type: ignore
 
 
 def test_pascals_to_psi() -> None:
     """Test that metres are properly converted to feet."""
-    assert conv.pascals_to_psi(87181) == pytest.approx(12.64)  # type: ignore
+    assert pascals_to_psi(87181) == pytest.approx(12.64)  # type: ignore