From 4d417b449d4c8926aacdbbc042eceb303011d6c1 Mon Sep 17 00:00:00 2001 From: TIM ANDERSON Date: Wed, 18 Nov 2026 09:11:59 +1000 Subject: [PATCH] fix(kvaser): pass unsigned integer for local TXACK --- can/interfaces/kvaser/canlib.py | 4 ++-- doc/changelog.d/2050.fixed.rst | 2 ++ test/test_kvaser.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 doc/changelog.d/2050.fixed.rst diff --git a/can/interfaces/kvaser/canlib.py b/can/interfaces/kvaser/canlib.py index 7df8329d0..94fbab7ef 100644 --- a/can/interfaces/kvaser/canlib.py +++ b/can/interfaces/kvaser/canlib.py @@ -562,8 +562,8 @@ def __init__( canIoCtlInit( self._read_handle, canstat.canIOCTL_SET_LOCAL_TXACK, - ctypes.byref(ctypes.c_byte(local_echo)), - 1, + ctypes.byref(ctypes.c_uint(local_echo)), + ctypes.sizeof(ctypes.c_uint), ) if self.single_handle: diff --git a/doc/changelog.d/2050.fixed.rst b/doc/changelog.d/2050.fixed.rst new file mode 100644 index 000000000..16dc1ce45 --- /dev/null +++ b/doc/changelog.d/2050.fixed.rst @@ -0,0 +1,2 @@ +Correct the Kvaser local transmit acknowledgement buffer type and size to match +CANlib's unsigned-integer argument. diff --git a/test/test_kvaser.py b/test/test_kvaser.py index 1ad035dec..47ac99cdc 100644 --- a/test/test_kvaser.py +++ b/test/test_kvaser.py @@ -50,6 +50,35 @@ def test_bus_creation(self): self.assertTrue(canlib.canOpenChannel.called) self.assertTrue(canlib.canBusOn.called) + def test_local_transmit_ioctl_buffer_types(self): + # CANlib defines TXECHO as an unsigned byte, but TXACK as unsigned int. + for single_handle in (False, True): + for receive_own_messages in (False, True): + with self.subTest( + single_handle=single_handle, + receive_own_messages=receive_own_messages, + ): + canlib.canIoCtlInit.reset_mock() + with can.Bus( + channel=0, + interface="kvaser", + single_handle=single_handle, + receive_own_messages=receive_own_messages, + ): + calls = { + call.args[1]: call.args + for call in canlib.canIoCtlInit.call_args_list + } + expected = int(single_handle or receive_own_messages) + for function, buffer_type in ( + (constants.canIOCTL_SET_LOCAL_TXECHO, ctypes.c_byte), + (constants.canIOCTL_SET_LOCAL_TXACK, ctypes.c_uint), + ): + _, _, buffer, length = calls[function] + self.assertEqual(length, ctypes.sizeof(buffer_type)) + self.assertIsInstance(buffer._obj, buffer_type) + self.assertEqual(buffer._obj.value, expected) + def test_bus_creation_illegal_channel_name(self): # Test if the bus constructor is able to deal with non-ASCII characters def canGetChannelDataMock(