xdd: Implement option to load object dictionary from XDD file. #614
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zaporozhets
force-pushed
the
feat/add_xdd_parser
branch
from
505c938 to
ea733fe
Compare
Signed-off-by: Taras Zaporozhets <zaporozhets.taras@gmail.com>
zaporozhets
force-pushed
the
feat/add_xdd_parser
branch
from
ea733fe to
466b1b2
Compare
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
|
Hi @acolomb, could you please take a look? |
|
Thank you very much for this contribution. Happy to see some progress on the XDD front. I started taking a look and overall I think it's going in a good direction. Need to take some more time to put down my thoughts in detail, but some high-level pointers first:
|
acolomb
reviewed
Oct 27, 2025
|
|
||
| import re | ||
| import xml.etree.ElementTree as etree | ||
| from configparser import NoOptionError |
| @@ -0,0 +1,306 @@ | |||
| import logging | |||
|
|
|||
| import re | ||
| import xml.etree.ElementTree as etree | ||
| from configparser import NoOptionError | ||
| from typing import TYPE_CHECKING |
There was a problem hiding this comment.
Suggested change
| from typing import TYPE_CHECKING |
Comment on lines
+12
to
+13
| if TYPE_CHECKING: | ||
| import canopen.network |
There was a problem hiding this comment.
Suggested change
| if TYPE_CHECKING: | |
| import canopen.network |
| RECORD = 9 | ||
|
|
||
|
|
||
| def import_xdd(xdd, node_id): |
There was a problem hiding this comment.
With static type hints, something like this:
Suggested change
| def import_xdd(xdd, node_id): | |
| def import_xdd( | |
| xdd: Union[etree.Element, str, bytes, os.PathLike], | |
| node_id: Optional[int], | |
| ) -> ObjectDictionary: |
| try: | ||
| od.node_id = int(node_id, 0) | ||
| except (ValueError, TypeError): | ||
| pass |
Comment on lines
+45
to
+46
|
|
||
| return od |
There was a problem hiding this comment.
Suggested change
| return od | |
| return od | |
|
|
||
| return od | ||
|
|
||
| def _add_device_information_to_od(od, root): |
There was a problem hiding this comment.
Suggested change
| def _add_device_information_to_od(od, root): | |
| def _add_device_information(od: ObjectDictionary, root: etree.Element): |
Keep the names slightly shorter, it's all already in the context of the OD.
| device_identity = root.find('.//{*}DeviceIdentity') | ||
| if device_identity is not None: | ||
| for src_prop, dst_prop, f in [ | ||
| ("vendorName", "vendor_name", lambda val: str(val)), |
There was a problem hiding this comment.
Suggested change
| ("vendorName", "vendor_name", lambda val: str(val)), | |
| ("vendorName", "vendor_name", str), |
This can be simplified in many places, no need for a lambda.
| if device_identity is not None: | ||
| for src_prop, dst_prop, f in [ | ||
| ("vendorName", "vendor_name", lambda val: str(val)), | ||
| ("vendorID", "vendor_number", lambda val: int(val, 0)), |
There was a problem hiding this comment.
You could create a autoint = functools.partial(int, base=0) constructor once in this module, then use it to simplify in these cases.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi All,
This is a WIP merge request that adds support for XDD import to CANopen. I'm still in the process of testing and making improvements, but I’d appreciate any feedback you might have in the meantime.
Feel free to share any questions or suggestions.
Best regards,
Taras