Skip to content
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

Jump to bottom

IsoTpMessage.send: setup_only argument #1081

Merged
merged 8 commits into from
Sep 30, 2022
Merged

IsoTpMessage.send: setup_only argument #1081

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95772a2
some fixes
sshane Sep 30, 2022
6598367
some fixes
sshane Sep 30, 2022
c0e241f
revert to tx not done
sshane Sep 30, 2022
41f8ed7
this should work
sshane Sep 30, 2022
a03675d
correct debug prints
sshane Sep 30, 2022
68cd5c2
not true
sshane Sep 30, 2022
f449d42
revert this
sshane Sep 30, 2022
41a0d6a
setup_only
sshane Sep 30, 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
15 changes: 8 additions & 7 deletions python/uds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def __init__(self, can_client: CanClient, timeout: float = 1, debug: bool = Fals
self.debug = debug
self.max_len = max_len

def send(self, dat: bytes) -> None:
def send(self, dat: bytes, setup_only: bool = False) -> None:
# throw away any stale data
self._can_client.recv(drain=True)

Expand All @@ -396,23 +396,24 @@ def send(self, dat: bytes) -> None:
self.rx_idx = 0
self.rx_done = False

if self.debug:
if self.debug and not setup_only:
print(f"ISO-TP: REQUEST - {hex(self._can_client.tx_addr)} 0x{bytes.hex(self.tx_dat)}")
self._tx_first_frame()
self._tx_first_frame(setup_only=setup_only)

def _tx_first_frame(self) -> None:
def _tx_first_frame(self, setup_only: bool = False) -> None:
if self.tx_len < self.max_len:
# single frame (send all bytes)
if self.debug:
if self.debug and not setup_only:
print(f"ISO-TP: TX - single frame - {hex(self._can_client.tx_addr)}")
msg = (bytes([self.tx_len]) + self.tx_dat).ljust(self.max_len, b"\x00")
self.tx_done = True
else:
# first frame (send first 6 bytes)
if self.debug:
if self.debug and not setup_only:
print(f"ISO-TP: TX - first frame - {hex(self._can_client.tx_addr)}")
msg = (struct.pack("!H", 0x1000 | self.tx_len) + self.tx_dat[:self.max_len - 2]).ljust(self.max_len - 2, b"\x00")
self._can_client.send([msg])
if not setup_only:
self._can_client.send([msg])

def recv(self, timeout=None) -> Tuple[Optional[bytes], bool]:
if timeout is None:
Expand Down