Skip to content

Commit bc999d7

Browse files
committed
Fixed failing test cases.
1 parent 620f6c5 commit bc999d7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

modules/telemetry/v1/data_block.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ def __str__(self):
6262
return "COORDINATES"
6363

6464

65-
6665
class DataBlock(ABC):
6766
"""The abstract base interface for all data blocks."""
6867

@@ -203,6 +202,7 @@ class AltitudeSeaLevelDB(AltitudeDB):
203202
def __init__(self, mission_time: int, altitude: int) -> None:
204203
super().__init__(mission_time, altitude)
205204

205+
206206
class AltitudeLaunchLevelDB(AltitudeDB):
207207
"""Represents an altitude data block with measurements relative to launch level."""
208208

@@ -381,12 +381,14 @@ class RelativeLinearAccelerationDB(LinearAccelerationDB):
381381
def __init__(self, mission_time: int, x_axis: int, y_axis: int, z_axis: int) -> None:
382382
super().__init__(mission_time, x_axis, y_axis, z_axis)
383383

384+
384385
class AbsoluteLinearAccelerationDB(LinearAccelerationDB):
385386
"""Represents a linear acceleration data block with measurements relative to ground."""
386387

387388
def __init__(self, mission_time: int, x_axis: int, y_axis: int, z_axis: int) -> None:
388389
super().__init__(mission_time, x_axis, y_axis, z_axis)
389390

391+
390392
class AngularVelocityDB(DataBlock):
391393
"""Represents an angular velocity data block"""
392394

tests/parsing/test_full_telemetry_parsing.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
import logging
33
from pytest import LogCaptureFixture
44
from modules.telemetry.v1.block import (
5+
BlockType,
56
PacketHeader,
67
BlockHeader,
78
InvalidHeaderFieldValueError,
89
UnsupportedEncodingVersionError,
910
)
1011
from modules.telemetry.telemetry_utils import parse_radio_block, from_approved_callsign
1112
from modules.misc.config import load_config
13+
from modules.telemetry.v1.data_block import DataBlockSubtype
1214

1315
# Fixtures and tests to ensure that parse_radio_block works as expected
1416

@@ -26,7 +28,7 @@ def block_header() -> BlockHeader:
2628
"""
2729
returns a blockheader
2830
"""
29-
return BlockHeader.from_hex("02000200")
31+
return BlockHeader.from_hex("02000300")
3032

3133

3234
@pytest.fixture
@@ -44,8 +46,8 @@ def test_radio_block(pkt_version: int, block_header: BlockHeader, hex_block_cont
4446
prb = parse_radio_block(pkt_version, block_header, hex_block_contents)
4547
assert prb is not None
4648
assert prb.block_header.length == 12
47-
assert prb.block_header.message_type == 0
48-
assert prb.block_header.message_subtype == 2
49+
assert prb.block_header.message_type == BlockType.DATA.value
50+
assert prb.block_header.message_subtype == DataBlockSubtype.TEMPERATURE.value
4951
assert prb.block_header.destination == 0
5052
assert prb.block_name == "temperature"
5153
assert prb.block_contents["mission_time"] == 0

0 commit comments

Comments
 (0)