Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions python/fusion_engine_client/messages/defs.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from .timestamp import *
from ..utils import trace as logging
from ..utils.construct_utils import construct_message_to_string
from ..utils.enum_utils import IntEnum
from ..utils.enum_utils import IntEnum, lookup_value

_logger = logging.getLogger('point_one.fusion_engine.messages.defs')

Expand Down Expand Up @@ -372,13 +372,10 @@ def unpack(self, buffer: bytes, offset: int = 0, validate_sync: bool = False, va
if validate_crc:
self.validate_crc(buffer, offset)

try:
self.message_type = MessageType(message_type_int)
except (ValueError, KeyError):
if warn_on_unrecognized:
_logger.log(logging.WARNING if message_type_int < int(MessageType.RESERVED) else logging.DEBUG,
'Unrecognized message type %d.' % message_type_int)
self.message_type = MessageType(message_type_int, raise_on_unrecognized=False)
self.message_type = lookup_value(MessageType, message_type_int)
if warn_on_unrecognized and self.message_type.is_unrecognized():
_logger.log(logging.WARNING if message_type_int < int(MessageType.RESERVED) else logging.DEBUG,
'Unrecognized message type %d.' % message_type_int)

if return_sync_bytes:
return MessageHeader._SIZE, bytes((sync0, sync1))
Expand Down
2 changes: 1 addition & 1 deletion python/tests/test_data_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def _check_message(self, message, expected_message):

expected_p1_time = expected_message.get_p1_time()
if expected_p1_time is not None:
assert float(message.get_p1_time()) == pytest.approx(expected_p1_time, 1e-6)
assert float(message.get_p1_time()) == pytest.approx(float(expected_p1_time), 1e-6)

expected_system_time_sec = expected_message.get_system_time_sec()
if expected_system_time_sec is not None:
Expand Down
2 changes: 1 addition & 1 deletion python/tests/test_mixed_log_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def _check_message(self, message, expected_message):

expected_p1_time = expected_message.get_p1_time()
if expected_p1_time is not None:
assert float(message.get_p1_time()) == pytest.approx(expected_p1_time, 1e-6), "P1 time mismatch."
assert float(message.get_p1_time()) == pytest.approx(float(expected_p1_time), 1e-6), "P1 time mismatch."

expected_system_time_sec = expected_message.get_system_time_sec()
if expected_system_time_sec is not None:
Expand Down
Loading