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

Bug fixes, send/receive debug logs and Unsigned 24 support #267

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Bug fixes, send/receive debug logs and Unsigned 24 support #267

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5141b19
test if callback exist before removing it
TzviRonen Sep 6, 2021
3ce8ab4
Added send message debug log
TzviRonen Sep 6, 2021
bc06df4
Added debug logs and pause before read
TzviRonen Sep 6, 2021
3fb146e
fixed get_data var len calc
TzviRonen Sep 6, 2021
659899d
Added Unsigned24 data type
TzviRonen Sep 6, 2021
9b9efb7
Added PyCharm to gitignore
TzviRonen Sep 6, 2021
a8fcd87
request_response RETRY_DELAY
TzviRonen Sep 8, 2021
d0d9bba
made RETRY_DELAY default zero
TzviRonen Sep 8, 2021
b14f43e
removed callback test
TzviRonen Sep 8, 2021
56b206a
fixed uint24 support comments
TzviRonen Sep 8, 2021
a108eee
t
TzviRonen Sep 8, 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
3 changes: 2 additions & 1 deletion canopen/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ def unsubscribe(self, can_id, callback=None):
if callback is None:
del self.subscribers[can_id]
else:
self.subscribers[can_id].remove(callback)
if callback in self.subscribers[can_id]:
self.subscribers[can_id].remove(callback)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you describe the circumstances where raising a ValueError exception here would have caused problems?

If a non-registered callback is passed, that is clearly the caller's fault and I think it's correct to raise an exception in response. The main place where this function is used is in remove_network() on the nodes, which in turn gets called when deleting it from the network object. If it is part of the network, these callbacks have been recorded in the list previously, so no exception will be raised.

Copy link
Author

Choose a reason for hiding this comment

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

You're right. I removed this change.


def connect(self, *args, **kwargs):
"""Connect to CAN bus using python-can.
Expand Down