Skip to content

Better ASCWriter timestamps #469

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

Merged
hardbyte merged 8 commits into from
Nov 1, 2018
Merged

Better ASCWriter timestamps #469

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
940d332
Set version to v3.0.0 final
hardbyte Sep 30, 2018
951568c
Minor updates to changelog for 3.0.0
hardbyte Sep 30, 2018
e0c3c72
Merge pull request #445 from hardbyte/develop
hardbyte Oct 3, 2018
ed9ec6d
Merge pull request #449 into release branch
hardbyte Oct 3, 2018
4b93f21
Merge pull request #441 from hardbyte/release-3.0.0
hardbyte Oct 4, 2018
66ce24e
Changed asc log timestamps to 6 decimal places and uses real message …
Oct 30, 2018
e566caa
Merge branch 'develop' into feature/asctimestamp
ludobouan Oct 30, 2018
b2b5341
Merge branch 'develop' into feature/asctimestamp
hardbyte Oct 31, 2018
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
Changed asc log timestamps to 6 decimal places and uses real message … 
…timestamp
  • Loading branch information
BOUAN-DU-CHEF-DU-BOS Ludovic committed Oct 30, 2018
commit 66ce24e9f7659dc5974f8bfc58c436878c915158
6 changes: 3 additions & 3 deletions can/io/asc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class ASCWriter(BaseIOHandler, Listener):

FORMAT_MESSAGE = "{channel} {id:<15} Rx {dtype} {data}"
FORMAT_DATE = "%a %b %m %I:%M:%S %p %Y"
FORMAT_EVENT = "{timestamp: 9.4f} {message}\n"
FORMAT_EVENT = "{timestamp: 9.6f} {message}\n"

def __init__(self, file, channel=1):
"""
Expand Down Expand Up @@ -181,8 +181,8 @@ def log_event(self, message, timestamp=None):
self.header_written = True
self.log_event("Start of measurement") # caution: this is a recursive call!

# figure out the correct timestamp
if timestamp is None or timestamp < self.last_timestamp:
# Use last known timestamp if unknown
if timestamp is None:
timestamp = self.last_timestamp

# turn into relative timestamps if necessary
Expand Down