Skip to content

Commit 6715f33

Browse files
committed
Merge upstream 'master' into feature-asyncio
2 parents db01e4c + 559274f commit 6715f33

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

canopen/lss.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def fast_scan(self):
258258
:return:
259259
True if a slave is found.
260260
False if there is no candidate.
261-
list is the LSS identities [vendor_id, product_code, revision_number, seerial_number]
261+
list is the LSS identities [vendor_id, product_code, revision_number, serial_number]
262262
:rtype: bool, list
263263
"""
264264
lss_id = [0] * 4

canopen/node/remote.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class RemoteNode(BaseNode):
2828
Object dictionary as either a path to a file, an ``ObjectDictionary``
2929
or a file like object.
3030
:param load_od:
31-
Enable the Object Dictionary to be sent trough SDO's to the remote
31+
Enable the Object Dictionary to be sent through SDO's to the remote
3232
node at startup.
3333
"""
3434

0 commit comments

Comments
 (0)