Skip to content

Commit b886203

Browse files
fjburgoszariiii9003
fjburgos
and
zariiii9003
authored
Ixxat CAN FD support (hardbyte#1119)
* Added: Ixxat interface copy before start changing for canfd. * Changed: ixxat_fd adapting for usage with vcinpl2.dll instead of vcinpl.dll. * Fixed: ixxat fd receive function with timeout = 0 was causing to receive always last frame. Now, if function does not return VCI_OK, no new message is returned. * Added: ixxat_fd baudrate from user options instead of hardcoded. * Added: ixxat_fd channel capabilities check. * Added: Myself to contributors list. Added: Documentation for ixxat_fd usage. * Related to ixxat_fd: Added: Format with black. Added: test to improve coverage. Changed: Default baudrate for data segment is now 2 Mbps. * Changed: renamed files before "merging" ixxat and ixxat_fd interfaces. * Changed: Merged structures, exceptions and constants from ixxat-fd to ixxat. * Added: Ixxat interface proxy class delegating to related implementation where required. Changed: Documentation updated accordingly. * Changed: Tests for CAN-FD in ixxat updated according to last changes. * Changed: Suggested changes from pull request review. * Changed: Suggested changes from pull request review. * Changed: Type hint, typing.Tuple instead of tuple. * Changed: TSEG1, TSEG2 and SJW parameters available as optional advanced settings. Changed: Deprecated parameters UniqueHardwareId, rxFifoSize, txFifoSize (use unique_hardware_id, rx_fifo_size, tx_fifo_size instead). Changed: Replaced ctypes.c_long return value for ctypes functions returning HRESULT with an alias "hresult_type" that is a ctypes.c_ulong. * Update doc/interfaces/ixxat.rst Co-authored-by: zariiii9003 <52598363+zariiii9003@users.noreply.github.com> * Changed: Documentation. * Changed: Ixxat extended parameter default from False to True. Now it is also considered in "no fd" implementation. * Changed: Ixxat parameter unique_hardware_id type hint is now optional. * Changed: Ixxat doc comment types removed (let Sphinx derive them from the method signature). * Changed: Updated Ixxat tests to use new argument names. * Fixed: Missing **kwargs parameter in vcinpl and vcinpl2. Co-authored-by: zariiii9003 <52598363+zariiii9003@users.noreply.github.com>
1 parent acc2ebd commit b886203

10 files changed

Lines changed: 2364 additions & 828 deletions

File tree

‎CONTRIBUTORS.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ Jan Goeteyn
2828
"ykzheng" <wishdo@gmail.com>
2929
Lear Corporation
3030
Nick Black <dank@qemfd.net>
31+
Francisco Javier Burgos Macia

‎can/interfaces/ixxat/__init__.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
Copyright (C) 2016 Giuseppe Corbelli <giuseppe.corbelli@weightpack.com>
55
"""
66

7-
from can.interfaces.ixxat.canlib import IXXATBus, get_ixxat_hwids
7+
from can.interfaces.ixxat.canlib import IXXATBus
8+
from can.interfaces.ixxat.canlib_vcinpl import (
9+
get_ixxat_hwids,
10+
) # import this and not the one from vcinpl2 for backward compatibility

0 commit comments

Comments
 (0)