Added check if instance mode is serial when trying to find if mavlin… #12642
Conversation
This file contains 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
julianoes
requested changes
Aug 6, 2019
| @@ -426,7 +426,7 @@ Mavlink::instance_exists(const char *device_name, Mavlink *self) | |||
| while (inst != nullptr) { | |||
|
|
|||
| /* don't compare with itself */ | |||
| if (inst != self && !strcmp(device_name, inst->_device_name)) { | |||
| if ((inst != self) && (inst->get_protocol() == SERIAL) && !strcmp(device_name, inst->_device_name)) { | |||
There was a problem hiding this comment.
I think the fix is correct but I would suggest that the method instance_exists is renamed to serial_instance_exists and that the comment above is adapted.
There was a problem hiding this comment.
@julianoes
I agree with you, it's a far better name.
julianoes
approved these changes
Aug 6, 2019
bozkurthan
pushed a commit
to bozkurthan/Firmware
that referenced
this pull request
Sep 4, 2019
…f instance exists (PX4#12642)
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.
…k instance exists
Describe problem solved by the proposed pull request
If using mavlink with other communication other then serial (eth) and trying to open another mavlink instance with serial communication connected to /dev/ttyS1 mavlink will not allow it because device_name default is /dev/ttyS1 and from mavlink concern the instance already exists even though there is no real use in that port.
Describe your preferred solution
at the same point where we check if the port is being used we check if it's a serial connection.