Skip to content

Handle reserved STmin values per ISO-15765-2 #160

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

Draft
fallenmi wants to merge 1 commit into
base: v2.x
Choose a base branch
from
Draft

Handle reserved STmin values per ISO-15765-2 #160

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions isotp/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,10 @@ def __init__(self, msg: CanMessage, start_of_data: int = 0) -> None:
self.stmin_sec = (stmin_temp - 0xF0) / 10000

if self.stmin_sec is None:
raise ValueError('Invalid StMin received in Flow Control')
else:
self.stmin = stmin_temp
# ISO-15765-2 requires reserved values to be treated as 0x7F.
stmin_temp = 0x7F
self.stmin_sec = stmin_temp / 1000
self.stmin = stmin_temp

else:
raise ValueError("Unsupported PDU type: %s" % self.type)
Expand Down
19 changes: 10 additions & 9 deletions test/test_helper_classes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,29 +419,30 @@ def test_decode_flow_control(self):
self.assertEqual(pdu.stmin, 0)
self.assertEqual(pdu.stmin_sec, 0)

for i in range(0, 0x7F): # Millisecs
for i in range(0, 0x80): # Millisecs
pdu = self.make_pdu([0x30, 0x00, i])
self.assertEqual(pdu.type, isotp.protocol.PDU.Type.FLOW_CONTROL)
self.assertEqual(pdu.flow_status, isotp.protocol.PDU.FlowStatus.ContinueToSend)
self.assertEqual(pdu.blocksize, 0)
self.assertEqual(pdu.stmin, i)
self.assertEqual(pdu.stmin_sec, i / 1000)

for i in range(0xF1, 0xF9): # Microsecs
for i in range(0xF1, 0xFA): # Microsecs
pdu = self.make_pdu([0x30, 0x00, i])
self.assertEqual(pdu.type, isotp.protocol.PDU.Type.FLOW_CONTROL)
self.assertEqual(pdu.flow_status, isotp.protocol.PDU.FlowStatus.ContinueToSend)
self.assertEqual(pdu.blocksize, 0)
self.assertEqual(pdu.stmin, i)
self.assertEqual(pdu.stmin_sec, (i - 0xF0) / 10000)

for i in range(0x80, 0xF1): # Reserved StMin
with self.assertRaises(ValueError):
pdu = self.make_pdu([0x30, 0x00, i])

for i in range(0xFA, 0x100): # Reserved StMin
with self.assertRaises(ValueError):
pdu = self.make_pdu([0x30, 0x00, i])
for lower, upper in ((0x80, 0xF1), (0xFA, 0x100)): # Reserved StMin
for i in range(lower, upper):
pdu = self.make_pdu([0x30, 0xA5, i])
self.assertEqual(pdu.type, isotp.protocol.PDU.Type.FLOW_CONTROL)
self.assertEqual(pdu.flow_status, isotp.protocol.PDU.FlowStatus.ContinueToSend)
self.assertEqual(pdu.blocksize, 0xA5)
self.assertEqual(pdu.stmin, 0x7F)
self.assertEqual(pdu.stmin_sec, 0x7F / 1000)


class TestRateLimiter(unittest.TestCase):
Expand Down