Fix non-functional USB2CAN interface backend #534
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
The internal reference for an opened interface via the CANAL API is returned as an integer from the CanalOpen() DLL call in Usb2CanAbstractionLayer.open(). It is supposed to be returned from the abstraction layer and stored in the Usb2canBus.handle member for later reference by all other API calls. Add the missing return statement and adjust the docstring accordingly. Only valid handles (greater than 0) will be returned, otherwise an exception is thrown already.
|
Ha. That was rather dumb. ^^ Thanks for testing it! |
|
@felixdivo Would you mind merging this rather quickly? I'd like to update my submodule reference today if possible ;-) |
felixdivo
approved these changes
Mar 14, 2019
|
Yep, I'm just waiting for the AppVeyor build to pass. |
Codecov Report
@@ Coverage Diff @@
## develop #534 +/- ##
===========================================
- Coverage 64.46% 64.44% -0.02%
===========================================
Files 63 63
Lines 5650 5651 +1
===========================================
Hits 3642 3642
- Misses 2008 2009 +1 |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
During the refactorization and cleanup in #511, something slipped the review process. I only got to testing on hardware with an actual CAN bus connected today and nothing worked.
Apparently the returned handle from
CanalOpen()needs to be saved in a backend-local.handlemember for all other API functions to use. With all the confusion about CANAL API return values, the return statement for this got removed by accident.