Skip to content

Use configured bitrate in pcan #254

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 1 commit into from
Feb 17, 2018
Merged

Use configured bitrate in pcan #254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion can/interfaces/pcan/pcan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from can.bus import BusABC
from can.message import Message
from can import CanError
import can
import time

boottimeEpoch = 0
Expand Down Expand Up @@ -82,7 +83,7 @@ def __init__(self, channel, *args, **kwargs):
else:
self.channel_info = channel

bitrate = kwargs.get('bitrate', 500000)
bitrate = kwargs.get('bitrate', can.rc.get('bitrate', 500000))
pcan_bitrate = pcan_bitrate_objs.get(bitrate, PCAN_BAUD_500K)

hwtype = PCAN_TYPE_ISA
Expand Down