Skip to content

Commit b721741

Browse files
committed
Revert "extend XL api wrapper (hardbyte#1387)"
This reverts commit 40f6cce.
1 parent 366cd45 commit b721741

File tree

3 files changed

+2
-34
lines changed

3 files changed

+2
-34
lines changed

can/interfaces/vector/xlclass.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ class s_xl_chip_state(ctypes.Structure):
4545
]
4646

4747

48-
class s_xl_sync_pulse(ctypes.Structure):
49-
_fields_ = [
50-
("pulseCode", ctypes.c_ubyte),
51-
("time", XLuint64),
52-
]
53-
54-
5548
class s_xl_can_ev_chip_state(ctypes.Structure):
5649
_fields_ = [
5750
("busStatus", ctypes.c_ubyte),
@@ -72,11 +65,7 @@ class s_xl_can_ev_sync_pulse(ctypes.Structure):
7265

7366
# BASIC bus message structure
7467
class s_xl_tag_data(ctypes.Union):
75-
_fields_ = [
76-
("msg", s_xl_can_msg),
77-
("chipState", s_xl_chip_state),
78-
("syncPulse", s_xl_sync_pulse),
79-
]
68+
_fields_ = [("msg", s_xl_can_msg), ("chipState", s_xl_chip_state)]
8069

8170

8271
# CAN FD messages

can/interfaces/vector/xldefine.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class XL_BusTypes(IntFlag):
6464
XL_BUS_TYPE_A429 = 8192 # =0x00002000
6565

6666

67-
class XL_CANFD_BusParams_CanOpMode(IntFlag):
67+
class XL_CANFD_BusParams_CanOpMode(IntEnum):
6868
XL_BUS_PARAMS_CANOPMODE_CAN20 = 1
6969
XL_BUS_PARAMS_CANOPMODE_CANFD = 2
7070
XL_BUS_PARAMS_CANOPMODE_CANFD_NO_ISO = 8
@@ -318,9 +318,3 @@ class XL_HardwareType(IntEnum):
318318
XL_HWTYPE_VX1161A = 114
319319
XL_HWTYPE_VX1161B = 115
320320
XL_MAX_HWTYPE = 120
321-
322-
323-
class XL_SyncPulseSource(IntEnum):
324-
XL_SYNC_PULSE_EXTERNAL = 0
325-
XL_SYNC_PULSE_OUR = 1
326-
XL_SYNC_PULSE_OUR_SHARED = 2

can/interfaces/vector/xldriver.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,3 @@ def check_status_initialization(result, function, arguments):
272272
xlCanGetEventString = _xlapi_dll.xlCanGetEventString
273273
xlCanGetEventString.argtypes = [ctypes.POINTER(xlclass.XLcanRxEvent)]
274274
xlCanGetEventString.restype = xlclass.XLstringType
275-
276-
xlGetReceiveQueueLevel = _xlapi_dll.xlGetReceiveQueueLevel
277-
xlGetReceiveQueueLevel.argtypes = [xlclass.XLportHandle, ctypes.POINTER(ctypes.c_int)]
278-
xlGetReceiveQueueLevel.restype = xlclass.XLstatus
279-
xlGetReceiveQueueLevel.errcheck = check_status_operation
280-
281-
xlGenerateSyncPulse = _xlapi_dll.xlGenerateSyncPulse
282-
xlGenerateSyncPulse.argtypes = [xlclass.XLportHandle, xlclass.XLaccess]
283-
xlGenerateSyncPulse.restype = xlclass.XLstatus
284-
xlGenerateSyncPulse.errcheck = check_status_operation
285-
286-
xlFlushReceiveQueue = _xlapi_dll.xlFlushReceiveQueue
287-
xlFlushReceiveQueue.argtypes = [xlclass.XLportHandle]
288-
xlFlushReceiveQueue.restype = xlclass.XLstatus
289-
xlFlushReceiveQueue.errcheck = check_status_operation

0 commit comments

Comments
 (0)