Skip to content

Prevent warnings if SDO setup fails #590

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
sveinse merged 2 commits into from
Jun 18, 2025
Merged

Prevent warnings if SDO setup fails #590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d043743
Prevent warnings if SDO setup fails
sveinse Jun 15, 2025
970f204
Use getattr instead of hasattr
sveinse Jun 18, 2025
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
5 changes: 5 additions & 0 deletions canopen/sdo/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,8 @@ def __init__(self, sdo_client, index, subindex=0, size=None, request_crc_support
self._blksize, = struct.unpack_from("B", response, 4)
logger.debug("Server requested a block size of %d", self._blksize)
self.crc_supported = bool(res_command & CRC_SUPPORTED)
# Run this last, used later to determine if initialization was successful
self._initialized = True

def write(self, b):
"""
Expand Down Expand Up @@ -784,6 +786,9 @@ def close(self):
if self.closed:
return
super(BlockDownloadStream, self).close()
if not hasattr(self, "_initialized"):
Comment thread
sveinse marked this conversation as resolved.
Outdated
# Don't do finalization if initialization was not successful
return
if not self._done:
logger.error("Block transfer was not finished")
command = REQUEST_BLOCK_DOWNLOAD | END_BLOCK_TRANSFER
Expand Down
4 changes: 4 additions & 0 deletions canopen/sdo/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ def request_aborted(self, data):

def block_download(self, data):
# We currently don't support BLOCK DOWNLOAD
# Unpack the index and subindex in order to send appropriate abort
command, index, subindex = SDO_STRUCT.unpack_from(data)
self._index = index
self._subindex = subindex
logger.error("Block download is not supported")
self.abort(0x05040001)

Expand Down
Loading