Delegate state to link and flow to port (Fix #62) #67
+6,465
−1,340
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
…t correctly in flush (Fix a breakage from my utf8 PR). Enforce str all the way. Improve comments.
…in endElement). Add to sys.path only if can be done accurately.
…es localNodeID instead of farNodeID).
… on example_cdi_access.py) to diagnose bobjacobsen#62.
… level manually set to logging.INFO or more verbose). Switch create a logger (instead of using logging directly) to make the source of messages clear, that being canlink.py in this case. Add & improve docstrings.
… nodeIdToAlias to populate: Fix bobjacobsen#62). Stream XML continuously (use parser.feed) so CDI branches trigger callbacks as they download.
… [value>255] bytearray error).
…s start of next). Comment questionable check until question in issue bobjacobsen#63 is answered.
…rrent reservation process (collision handler runs it again) unless no collision (fix bobjacobsen#62) as per section 6.2.1 of CAN Frame Tansfer Standard. Fix type for CanLink.State values (some were tuples due to trailing comma, now all are ints--still would compare if the value was always set and compared from the Statet(Enum) subclass, but not technically correct) (related to issue bobjacobsen#62). Add a related docstring.
…Permitted before sending messages (related to issue bobjacobsen#62). Use only one receive thread in cdihandler to avoid missing packets (and rename CDIHandler to PortHandler so as to allow handling different types of messages and memos in future versions). Rename "add" and "pop" to "start" and "end" for clarity. Isolate CDI-specific data by adding Mode to PortHandler (based on what data string was requested and not yet terminated). Add formatted_ex for logging.
…om network or is internal).
(needs confirmation) and bobjacobsen#71. Helps validate pull request bobjacobsen#67.
…et on two different threads!
Poikilos
force-pushed
the
delegate-state-to-link-and-flow-to-port
branch
from
fbb7313 to
f6c6361
Compare
…se Pythonic underscore convention for private methods.
…"fill*" for clarity.
…er state change and Message).
Owner
|
@Poikilos Thank you! Is this ready to merge now? |
Contributor
Author
|
Hi, I got back to this as you can see. I'm going to try to get CDI element names looking correct in the GUI shortly then I'll be ready. |
…rocessor, make it a subclass, and separate format (XML) from space (CDI or FDI).
…and thereby implement accurate reporting regardless of using CLI or GUI). Improve some docstrings.
… alias (TODO: ensure this is correct).
Poikilos
force-pushed
the
delegate-state-to-link-and-flow-to-port
branch
from
2b735cf to
dc7960e
Compare
…mit CID/RID/AMD while not Permitted (requires: Set state before sending AME, also fixed).
This was referenced Jan 28, 2026
…f not Permitted, as per Standard; Test exact length of data when matching AME as per Standard. Move decodeControlFrameFormat to CanFrame as static method for modularity (no CanLink instance is required). Add noise rejection (move old handleData code to handleDataOptimized) (fix bobjacobsen#82 and fix bobjacobsen#83 before committing). Add reusable from*_hex_bytes functions. Make handleData and CanFrame constructor messages more explicit. Fix bobjacobsen#86: Add minimumState option to CanFrame so transition to Inhibited can send AMR after CIDs are queued but not sent, since enqueuing since enqueuing changes CanLink state immediately. Fix bobjacobsen#77: Always increment nextInternallyAssignedNodeID when used. Add explicit blockedReason function for tracing.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Hello, I hope this finds you well. Most changes suggested by Balazs (#62 (comment)) are here.
isBadReservation(frame)isCanceled(checks if the frame is part of a bad reservation or not in the case of CanLink implementation).PortInterfacesuperclass added toTcpSocketandSerialLinkallows the openlcb stack (or other code) to utilize either type of port without conditional code or subclassing OpenLCB protocol implementation classes.All tests pass locally, so I'm not sure why GitHub isn't noticing that. Maybe it will catch up and go green. We'll see.All tests pass, and:Use unittest auto-discovery in github workflow (run-tests.yml): Now it runs all available test files regardless of files being added, renamed, or removed (in this case--there wasn't an abstract LinkLayer test. The file was blank).
There are some things that may be simplified, but I thought it would be good if we both can review this at the same time to get back in sync.Make high-level methods (sendAllandreceiveAll) to simplify usage related to the thread-safe refactor.