Closed nattgris closed 3 years ago
Thanks, looks good. We are in holiday mode now and will merge this in August.
Den fre 9 juli 2021 17:54Andreas Fritiofson @.***> skrev:
Any sufficiently large SDO transfer will time-out, because the time is counted from the start of the transfer. Restart the timeout as long as progress is made, for each transferred segment.
Also fill in the index and sub-index of the object in the abort frame if the transfer times out locally, as per CiA 301.
Additionally, fix a flaw in the SegmentedTimeout test which used synthetic timestamps but did not mock the system time, possibly causing sporadic failure (or pass) if run at the wrong time.
Signed-off-by: Andreas Fritiofson @.*** Change-Id: Ic527f80cca1c3f72e26bebb0acd6d3b06800d546
You can view, comment on, or merge this pull request online at:
https://github.com/rtlabs-com/c-open/pull/42 Commit Summary
- Fix SDO time-out on large segmented transfers
File Changes
- M src/co_sdo_client.c https://github.com/rtlabs-com/c-open/pull/42/files#diff-fe55b24dcabb9cd8824ea6ff6230dc37d1c03682739e6621e090d1baa4072204 (7)
- M src/co_sdo_server.c https://github.com/rtlabs-com/c-open/pull/42/files#diff-ab0aeb5a5e9f75f580a95ca99273def4a7cc86a2f81e233ddc2c04e20b534027 (10)
- M test/test_sdo_server.cpp https://github.com/rtlabs-com/c-open/pull/42/files#diff-7d43cd1cbd3946ca4ef0df62e938c1f5964bf6efd6c7a950d79051ce57338dc6 (22)
Patch Links:
- https://github.com/rtlabs-com/c-open/pull/42.patch
- https://github.com/rtlabs-com/c-open/pull/42.diff
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/rtlabs-com/c-open/pull/42, or unsubscribe https://github.com/notifications/unsubscribe-auth/ACCXVIU7VIM3TPIWUUSHV6TTW4LUFANCNFSM5ADATKWQ .
Merged, thanks!
Any sufficiently large SDO transfer will time-out, because the time is counted from the start of the transfer. Restart the timeout as long as progress is made, for each transferred segment.
Also fill in the index and sub-index of the object in the abort frame if the transfer times out locally, as per CiA 301.
Additionally, fix a flaw in the SegmentedTimeout test which used synthetic timestamps but did not mock the system time, possibly causing sporadic failure (or pass) if run at the wrong time.
Signed-off-by: Andreas Fritiofson andreas.fritiofson@unjo.com Change-Id: Ic527f80cca1c3f72e26bebb0acd6d3b06800d546