Skip to content

Pass flags instead of flags_t type for USB2CAN #1252

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
felixdivo merged 2 commits into from
Feb 11, 2022
Merged

Pass flags instead of flags_t type for USB2CAN #1252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa70f73
Pass flags instead of flags_t type for USB2CAN
Feb 5, 2022
1c70545
Remove usb2can unused open arguments for super
Feb 7, 2022
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
9 changes: 3 additions & 6 deletions can/interfaces/usb2can/usb2canInterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from can import BusABC, Message, CanInitializationError, CanOperationError
from .usb2canabstractionlayer import Usb2CanAbstractionLayer, CanalMsg, CanalError
from .usb2canabstractionlayer import (
flags_t,
Comment thread
felixdivo marked this conversation as resolved.
IS_ERROR_FRAME,
IS_REMOTE_FRAME,
IS_ID_TYPE,
Expand Down Expand Up @@ -95,7 +94,7 @@ def __init__(
channel=None,
dll="usb2can.dll",
flags=0x00000008,
*args,
*_,
Copy link
Copy Markdown
Contributor Author

@jacobian91 jacobian91 Feb 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional style change, this documents that all additional positional arguments get ignored but won't throw an exception when passed in.

Copy link
Copy Markdown
Collaborator

@felixdivo felixdivo Feb 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's fine. We don't have a unified handling of that case anyways.

bitrate=500000,
**kwargs,
):
Expand All @@ -118,11 +117,9 @@ def __init__(
self.channel_info = f"USB2CAN device {device_id}"

connector = f"{device_id}; {baudrate}"
self.handle = self.can.open(connector, flags_t)
self.handle = self.can.open(connector, flags)

super().__init__(
channel=channel, dll=dll, flags_t=flags_t, bitrate=bitrate, *args, **kwargs
)
super().__init__(channel=channel, **kwargs)

def send(self, msg, timeout=None):
tx = message_convert_tx(msg)
Expand Down