Skip to content

Check writeability for SDO download on LocalNode #241

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
christiansandberg merged 3 commits into from
Jun 9, 2021
Merged

Check writeability for SDO download on LocalNode #241

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b7fa31
Check writeable for SDO upload
semiversus Jun 9, 2021
47051d5
implement feedback from Christian
semiversus Jun 9, 2021
d2276b2
insert TODO comment
semiversus Jun 9, 2021
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
4 changes: 2 additions & 2 deletions canopen/sdo/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def block_download(self, data):
self.abort(0x05040001)

def init_download(self, request):
# TODO: Check if writable
Copy link
Member

@christiansandberg christiansandberg Jun 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I remember what this was for. Preferably we should check if it is writable before accepting segmented data. Right now a segmented download won't fail until the data has been fully received. So you can just leave the TODO for now.

Copy link
Contributor Author

@semiversus semiversus Jun 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-added the comment

# TODO: Check if writable (now would fail on end of segmented downloads)
command, index, subindex = SDO_STRUCT.unpack_from(request)
self._index = index
self._subindex = subindex
Expand All @@ -136,7 +136,7 @@ def init_download(self, request):
size = 4 - ((command >> 2) & 0x3)
else:
size = 4
self.download(index, subindex, request[4:4 + size])
self._node.set_data(index, subindex, request[4:4 + size], check_writable=True)
else:
logger.info("Initiating segmented download for 0x%X:%d", index, subindex)
if command & SIZE_SPECIFIED:
Expand Down