Add NO_SETPOINT_SET result to Offboard plugin #738
Merged
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
changed the title
julianoes
reviewed
May 2, 2019
plugins/offboard/offboard_impl.cpp
Outdated
| @@ -459,6 +459,8 @@ Offboard::Result OffboardImpl::offboard_result_from_command_result(MAVLinkComman | |||
| return Offboard::Result::COMMAND_DENIED; | |||
| case MAVLinkCommands::Result::TIMEOUT: | |||
| return Offboard::Result::TIMEOUT; | |||
| case MAVLinkCommands::Result::NO_SETPOINT_SET: | |||
There was a problem hiding this comment.
But MAVLinkCommands::Result::NO_SETPOINT_SET does not exist:
https://github.com/Dronecode/DronecodeSDK/blob/4332994c55c9ac8357954ccd1afcc5fa4a87172a/core/mavlink_commands.h#L19-L28
julianoes
reviewed
May 2, 2019
| @@ -67,6 +67,8 @@ const char *Offboard::result_str(Result result) | |||
| return "Command denied"; | |||
| case Result::TIMEOUT: | |||
| return "Timeout"; | |||
| case Result::NO_SETPOINT_SET: | |||
| return "No setpoint set"; | |||
julianoes
reviewed
May 2, 2019
core/mavlink_commands.h
Outdated
| @@ -24,6 +24,7 @@ class MAVLinkCommands { | |||
| COMMAND_DENIED, | |||
| TIMEOUT, | |||
| IN_PROGRESS, | |||
| NO_SETPOINT_SET, | |||
There was a problem hiding this comment.
Nono, a MAVLink command can't ever have that result. It's an invention of the SDK :)
There was a problem hiding this comment.
Ah I see. OK I removed from mavlink command results and offboard_result_from_command_result().
…vention of the SDK.
julianoes
approved these changes
May 3, 2019
|
Yay! Thanks @cswkim! |
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.
I think the 2 changed files are the only places that need updating, but I'm not 100% sure. If someone could please verify.
Resolves #732