Skip to content

Commit 0390c7d

Browse files
committed
Merge branch 'socketcan-timestamp-ns' of github.com:hardbyte/python-can into socketcan-timestamp-ns
2 parents 54c14ba + 6167fac commit 0390c7d

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

can/interfaces/socketcan/socketcan.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,9 @@ def capture_message(
528528
"""
529529
# Fetching the Arb ID, DLC and Data
530530
try:
531-
cf, ancillary_data, msg_flags, addr = sock.recvmsg(CANFD_MTU, RECEIVED_ANCILLARY_BUFFER_SIZE)
531+
cf, ancillary_data, msg_flags, addr = sock.recvmsg(
532+
CANFD_MTU, RECEIVED_ANCILLARY_BUFFER_SIZE
533+
)
532534
if get_channel:
533535
channel = addr[0] if isinstance(addr, tuple) else addr
534536
else:
@@ -542,7 +544,7 @@ def capture_message(
542544
assert len(ancillary_data) == 1, "only requested a single extra field"
543545
cmsg_level, cmsg_type, cmsg_data = ancillary_data[0]
544546
assert (
545-
cmsg_level == socket.SOL_SOCKET and cmsg_type == SO_TIMESTAMPNS
547+
cmsg_level == socket.SOL_SOCKET and cmsg_type == SO_TIMESTAMPNS
546548
), "received control message type that was not requested"
547549
# see https://man7.org/linux/man-pages/man3/timespec.3.html -> struct timespec for details
548550
seconds, nanoseconds = RECEIVED_TIMESTAMP_STRUCT.unpack_from(cmsg_data)

0 commit comments

Comments
 (0)