Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add clear mission support #818

Merged
merged 15 commits into from
Aug 5, 2019
Merged

Conversation

douglaswsilva
Copy link
Collaborator

@douglaswsilva douglaswsilva commented Jul 25, 2019

@douglaswsilva douglaswsilva changed the title Add clear mission to SDK [WIP] Add clear mission to SDK Jul 25, 2019
@douglaswsilva douglaswsilva changed the title [WIP] Add clear mission to SDK [WIP] Add clear mission support Jul 25, 2019
@julianoes julianoes self-requested a review July 26, 2019 06:27
julianoes
julianoes previously approved these changes Jul 26, 2019
Copy link
Collaborator

@julianoes julianoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks correct to me, thanks!

src/plugins/mission/include/plugins/mission/mission.h Outdated Show resolved Hide resolved
@julianoes
Copy link
Collaborator

@douglaswsilva check the Jenkins build issues though.

Copy link
Collaborator

@JonasVautherin JonasVautherin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking clean to me as well!

Small note: we don't have the [WIP] plugin anymore, so you could open a "draft PR" instead, if you want to make sure we don't merge it 😊

Co-Authored-By: Julian Oes <julian@oes.ch>
@douglaswsilva douglaswsilva changed the title [WIP] Add clear mission support Add clear mission support Jul 26, 2019
@julianoes
Copy link
Collaborator

@douglaswsilva it would be nice if you could add the clear command to the integration test, e.g. at the end of the mission test you could clear the mission:

LogInfo() << "Disarmed, exiting.";

JonasVautherin
JonasVautherin previously approved these changes Jul 29, 2019
@julianoes
Copy link
Collaborator

I'm just trying to understand why the integration test fails:

[11:50:20|Info ] �[0mCleared mission, exiting. (mission.cpp:261)
�[34m[11:50:20�[34m|Info ] �[0mMission accepted (mission_impl.cpp:166)
�[34m[11:50:20|Info ] �[0mDownloading mission... (mission.cpp:183)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
[11:50:20|Info ] �[0mMission uploaded. (mission.cpp:173)
�[32m[11:50:20|Debug] �[0mMAVLink: critical: IGN REQUEST LIST: Busy (system_impl.cpp:306)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mRetrying requesting mission list... (mission_impl.cpp:1401)
�[32m[11:50:20|Debug] �[0mMAVLink: critical: IGN REQUEST LIST: Busy (system_impl.cpp:306)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mRetrying requesting mission list... (mission_impl.cpp:1401)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:20|Warn ] �[0mIgnoring mission request int, not active (mission_impl.cpp:109)
�[33m[11:50:21|Warn ] �[0mRetrying requesting mission list... (mission_impl.cpp:1401)
�[32m[11:50:21|Debug] �[0mRequested mission item 0 (mission_impl.cpp:1007)
�[31m[11:50:21|Error] �[0mError: unknown mission ack: 1 (mission_impl.cpp:178)
�[33m[11:50:21|Warn ] �[0mCallback is not set (mission_impl.cpp:1216)
�[32m[11:50:21|Debug] �[0mMAVLink: critical: IGN REQUEST LIST: Busy (system_impl.cpp:306)
�[32m[11:50:21|Debug] �[0mMAVLink: critical: Operation timeout (system_impl.cpp:306)
�[32m[11:50:21|Debug] �[0mMAVLink: critical: WPM: REJ. CMD: Req. WP was unexpected (system_impl.cpp:306)
../../../../src/integration_tests/mission.cpp:206: Failure
Expected equality of these values:
  status
    Which is: 4-byte object <01-00 00-00>
  std::future_status::ready
    Which is: 4-byte object <00-00 00-00>
[  FAILED  ] SitlTest.MissionAddWaypointsAndFly (38327 ms)

src/plugins/mission/mission_impl.cpp Outdated Show resolved Hide resolved
@douglaswsilva
Copy link
Collaborator Author

@julianoes Let me know if there's anything else I need to do for the PR.

Copy link
Collaborator

@julianoes julianoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this.

@julianoes julianoes merged commit 844e0e7 into mavlink:develop Aug 5, 2019
@douglaswsilva douglaswsilva deleted the douglas/clear-mission branch October 21, 2019 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants