Skip to content

vector xlclass - implement XLbusParams #718

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 5 commits into from
Nov 12, 2019
Merged

vector xlclass - implement XLbusParams #718

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b659148
Merge pull request #3 from hardbyte/develop
zariiii9003 Sep 6, 2019
1496a0b
Merge branch 'develop' of https://github.com/hardbyte/python-can into…
zariiii9003 Oct 25, 2019
9041ea0
vector - xlclass - implement XLbusParams
zariiii9003 Oct 25, 2019
c0a53e0
use black formatter on xlclass.py
zariiii9003 Oct 25, 2019
15ea60a
Merge branch 'develop' into vector-XLbusParams
christiansandberg Nov 12, 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
52 changes: 50 additions & 2 deletions can/interfaces/vector/xlclass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,58 @@ class XLcanFdConf(ctypes.Structure):
("sjwDbr", ctypes.c_uint),
("tseg1Dbr", ctypes.c_uint),
("tseg2Dbr", ctypes.c_uint),
("reserved", ctypes.c_uint * 2),
("reserved", ctypes.c_ubyte),
("options", ctypes.c_ubyte),
("reserved1", ctypes.c_ubyte * 2),
("reserved2", ctypes.c_ubyte),
]


# channel configuration structures
class s_xl_bus_params_data_can(ctypes.Structure):
_fields_ = [
("bitRate", ctypes.c_uint),
("sjw", ctypes.c_ubyte),
("tseg1", ctypes.c_ubyte),
("tseg2", ctypes.c_ubyte),
("sam", ctypes.c_ubyte),
("outputMode", ctypes.c_ubyte),
("reserved", ctypes.c_ubyte * 7),
("canOpMode", ctypes.c_ubyte),
]


class s_xl_bus_params_data_canfd(ctypes.Structure):
_fields_ = [
("arbitrationBitRate", ctypes.c_uint),
("sjwAbr", ctypes.c_ubyte),
("tseg1Abr", ctypes.c_ubyte),
("tseg2Abr", ctypes.c_ubyte),
("samAbr", ctypes.c_ubyte),
("outputMode", ctypes.c_ubyte),
("sjwDbr", ctypes.c_ubyte),
("tseg1Dbr", ctypes.c_ubyte),
("tseg2Dbr", ctypes.c_ubyte),
("dataBitRate", ctypes.c_uint),
("canOpMode", ctypes.c_ubyte),
]


class s_xl_bus_params_data(ctypes.Union):
_fields_ = [
("can", s_xl_bus_params_data_can),
("canFD", s_xl_bus_params_data_canfd),
("most", ctypes.c_ubyte * 12),
("flexray", ctypes.c_ubyte * 12),
("ethernet", ctypes.c_ubyte * 12),
("a429", ctypes.c_ubyte * 28),
]


class XLbusParams(ctypes.Structure):
_fields_ = [("busType", ctypes.c_uint), ("data", s_xl_bus_params_data)]


class XLchannelConfig(ctypes.Structure):
_pack_ = 1
_fields_ = [
Expand All @@ -189,7 +237,7 @@ class XLchannelConfig(ctypes.Structure):
("channelBusCapabilities", ctypes.c_uint),
("isOnBus", ctypes.c_ubyte),
("connectedBusType", ctypes.c_uint),
("busParams", ctypes.c_ubyte * 32),
("busParams", XLbusParams),
("_doNotUse", ctypes.c_uint),
("driverVersion", ctypes.c_uint),
("interfaceVersion", ctypes.c_uint),
Expand Down