Skip to content

Trc file writer add version param #1924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pkess wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Trc file writer add version param #1924

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
44bf3de
Add format lookup map
pkess Feb 23, 2025
e99bc00
Remove format message init stuff
pkess Feb 23, 2025
132a93d
Add function for setup of file version
pkess Feb 23, 2025
406b278
Add file version as init parameter
pkess Feb 23, 2025
e736744
Add missing import
pkess Feb 23, 2025
39f3c8f
Add type hints for format message
pkess Feb 23, 2025
6192308
Add docstring for new parameter
pkess Feb 23, 2025
39e8a01
Fix test case for expicit file version
pkess Feb 23, 2025
d696018
Add None handling for first_timestamp
pkess Feb 23, 2025
e4efeb2
Add return type hint
pkess Feb 23, 2025
5a142c2
Add documentation for TRCFileVersion
pkess Feb 23, 2025
2c9019e
Fix ref
pkess Feb 23, 2025
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
Prev Previous commit
Next Next commit
Remove format message init stuff
  • Loading branch information
@pkess
pkess committed Feb 23, 2025
commit e99bc00f4635cc324915ae88fe3029f696111d64
14 changes: 1 addition & 13 deletions can/io/trc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ def __init__(
self.first_timestamp = None
self.file_version = TRCFileVersion.V2_1
self._msg_fmt_string = self.MESSAGE_FORMAT_MAP[self.file_version]
self._format_message = self._format_message_init

def _write_header_v1_0(self, start_time: datetime) -> None:
lines = [
Expand Down Expand Up @@ -361,7 +360,7 @@ def _write_header_v2_1(self, start_time: datetime) -> None:
]
self.file.writelines(line + "\n" for line in lines)

def _format_message_by_format(self, msg, channel):
def _format_message(self, msg, channel):
if msg.is_extended_id:
arb_id = f"{msg.arbitration_id:07X}"
else:
Expand All @@ -380,17 +379,6 @@ def _format_message_by_format(self, msg, channel):
)
return serialized

def _format_message_init(self, msg, channel):
if self.file_version == TRCFileVersion.V1_0:
self._format_message = self._format_message_by_format
elif self.file_version == TRCFileVersion.V2_1:
self._format_message = self._format_message_by_format
else:
raise NotImplementedError("File format is not supported")

self._msg_fmt_string = self.MESSAGE_FORMAT_MAP[self.file_version]
return self._format_message_by_format(msg, channel)

def write_header(self, timestamp: float) -> None:
# write start of file header
start_time = datetime.fromtimestamp(timestamp, timezone.utc)
Expand Down