From 135c9fca5df200b9ab0ff0696468ddfe1368a2e9 Mon Sep 17 00:00:00 2001 From: Solarboaters <354059055+Solarboaters@users.noreply.github.com> Date: Wed, 18 Nov 2026 19:40:57 +0000 Subject: [PATCH] Use 64-bit PCAN buffers only for acceptance filter parameters --- can/interfaces/pcan/basic.py | 4 +-- test/test_pcan_basic.py | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 test/test_pcan_basic.py diff --git a/can/interfaces/pcan/basic.py b/can/interfaces/pcan/basic.py index 3654699c5..2f46ef6c5 100644 --- a/can/interfaces/pcan/basic.py +++ b/can/interfaces/pcan/basic.py @@ -972,7 +972,7 @@ def GetValue(self, Channel, Parameter): elif ( Parameter == PCAN_ACCEPTANCE_FILTER_11BIT - or PCAN_ACCEPTANCE_FILTER_29BIT + or Parameter == PCAN_ACCEPTANCE_FILTER_29BIT ): mybuffer = c_int64(0) @@ -1018,7 +1018,7 @@ def SetValue(self, Channel, Parameter, Buffer): mybuffer = create_string_buffer(256) elif ( Parameter == PCAN_ACCEPTANCE_FILTER_11BIT - or PCAN_ACCEPTANCE_FILTER_29BIT + or Parameter == PCAN_ACCEPTANCE_FILTER_29BIT ): mybuffer = c_int64(0) else: diff --git a/test/test_pcan_basic.py b/test/test_pcan_basic.py new file mode 100644 index 000000000..a40158968 --- /dev/null +++ b/test/test_pcan_basic.py @@ -0,0 +1,48 @@ +"""PCANBasic parameter marshalling without a driver or physical adapter.""" + +import ctypes +from unittest.mock import Mock + +import pytest + +from can.interfaces.pcan import basic + + +@pytest.mark.parametrize( + "parameter,ctype,value", + [ + (basic.PCAN_CHANNEL_CONDITION, ctypes.c_int, 3), + (basic.PCAN_DEVICE_ID, ctypes.c_int, 42), + (basic.PCAN_BUSOFF_AUTORESET, ctypes.c_int, 1), + (basic.PCAN_ACCEPTANCE_FILTER_11BIT, ctypes.c_int64, 0x123456789ABCDEF), + (basic.PCAN_ACCEPTANCE_FILTER_29BIT, ctypes.c_int64, 0x123456789ABCDEF), + (basic.PCAN_TRACE_LOCATION, ctypes.c_char * 256, b"/tmp/can-traces"), + ], +) +@pytest.mark.parametrize("operation", ["get", "set"]) +def test_parameter_buffer_type(parameter, ctype, value, operation): + api = basic.PCANBasic.__new__(basic.PCANBasic) + driver = Mock() + api._PCANBasic__m_dllBasic = driver + + def transfer(channel, requested_parameter, buffer, size): + assert channel is basic.PCAN_USBBUS1 + assert requested_parameter is parameter + assert size == ctypes.sizeof(ctype) + typed = ctypes.cast(buffer, ctypes.POINTER(ctype)).contents + if operation == "get": + typed.value = value + else: + assert typed.value == value + return basic.PCAN_ERROR_OK + + if operation == "get": + driver.CAN_GetValue.side_effect = transfer + status, result = api.GetValue(basic.PCAN_USBBUS1, parameter) + assert result == value + driver.CAN_GetValue.assert_called_once() + else: + driver.CAN_SetValue.side_effect = transfer + status = api.SetValue(basic.PCAN_USBBUS1, parameter, value) + driver.CAN_SetValue.assert_called_once() + assert status == basic.PCAN_ERROR_OK