This repository was archived by the owner on Jan 10, 2023. It is now read-only.
Fix double CLSE bug #80
Merged
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
fahhem
reviewed
Jan 30, 2018
| 'Expected the local_id to be %s, got %s' % (local_id, their_local_id)) | ||
| if cmd == b'CLSE': | ||
| # Some devices seem to be sending CLSE once more after a request, this *should* handle it | ||
| cmd, remote_id, their_local_id, _ = cls.Read(usb, [b'CLSE', b'OKAY'], |
Contributor
There was a problem hiding this comment.
Is the extra CLSE only sent after a bad OPEN? I thought it was anytime a CLSE was sent?
Contributor
Author
There was a problem hiding this comment.
I tried having another read after a CLSE and before the next OPEN, but that caused a crash (failure to unpack with a response containing ‘<6I’)
Contributor
|
Thanks! Hopefully this doesn't cause regressions! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This fixes #39 and fixes #59.
I'm not sure if this is the best fix for the issue: if CLSE is received, we attempt to re-read and see if it's CLSE again, in which case, the original behaviour is done.
I've been testing this for a few days on a Galaxy S7 & S8 (both Qualcomm), a US LG G6, all running Android 7.x, and Genymotion (6.0 and 7.0), and it seems to work fine.