Skip to content

Add support for VN8900 xlGetChannelTime function #733

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
christiansandberg merged 3 commits into from
Dec 2, 2019
Merged

Add support for VN8900 xlGetChannelTime function #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a54b950
fixes #732: add support for VN8900 xlGetChannelTime function
danielhrisca Dec 2, 2019
460cbb5
add another level of try/except according to the review
danielhrisca Dec 2, 2019
1b32918
format using black
danielhrisca Dec 2, 2019
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
10 changes: 8 additions & 2 deletions can/interfaces/vector/canlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,14 @@ def __init__(

# Calculate time offset for absolute timestamps
offset = xlclass.XLuint64()
xldriver.xlGetSyncTime(self.port_handle, offset)
self._time_offset = time.time() - offset.value * 1e-9
try:
try:
xldriver.xlGetSyncTime(self.port_handle, offset)
except VectorError:
xldriver.xlGetChannelTime(self.port_handle, self.mask, offset)
self._time_offset = time.time() - offset.value * 1e-9
except VectorError:
self._time_offset = 0.0

self._is_filtered = False
super().__init__(channel=channel, can_filters=can_filters, **kwargs)
Expand Down
9 changes: 9 additions & 0 deletions can/interfaces/vector/xldriver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@ def check_status(result, function, arguments):
xlGetSyncTime.restype = xlclass.XLstatus
xlGetSyncTime.errcheck = check_status

xlGetChannelTime = _xlapi_dll.xlGetChannelTime
xlGetChannelTime.argtypes = [
xlclass.XLportHandle,
xlclass.XLaccess,
ctypes.POINTER(xlclass.XLuint64),
]
xlGetChannelTime.restype = xlclass.XLstatus
xlGetChannelTime.errcheck = check_status

xlClosePort = _xlapi_dll.xlClosePort
xlClosePort.argtypes = [xlclass.XLportHandle]
xlClosePort.restype = xlclass.XLstatus
Expand Down