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

OA: interface update #12349

Merged
merged 4 commits into from
Aug 5, 2019
Merged

OA: interface update #12349

merged 4 commits into from
Aug 5, 2019

Conversation

mrivi
Copy link
Contributor

@mrivi mrivi commented Jun 27, 2019

  • Add the waypoint type (mavlink command associated with the waypoint) to the points in the OA interface
  • refactor the check on the z progress of the mission

@dagar
Copy link
Member

dagar commented Jun 27, 2019

Did you see the CI failures? http://ci.px4.io:8080/blue/organizations/jenkins/PX4_misc%2FFirmware-SITL_tests/detail/PR-12349/1/pipeline

../../src/lib/FlightTasks/tasks/Utility/ObstacleAvoidance.cpp:55:1: error: narrowing conversion of '255' from 'int' to 'bool' inside { } [-Werror=narrowing]

 };

 ^

@dagar
Copy link
Member

dagar commented Jun 27, 2019

@mrivi
Copy link
Contributor Author

mrivi commented Jun 27, 2019

@dagar We cannot merge this one until there is a mavros update and consequent CI update. Problem is that TRAJECTORY_REPRESENTATION_WAYPOINT changed so the mavlink receiver is dropping all the messages coming from ROS because the definition don't match. It isn't an extention of the message but a proper change since it's still marked WIP in mavlink.

Also updating the mavlink submodule on its own will break the avoidance CI.

@mrivi mrivi changed the title [DO NOT MERGE] OA: add point type OA: interface update Aug 5, 2019
@@ -37,7 +37,7 @@ px4_add_module(
MODULE modules__mc_pos_control
MAIN mc_pos_control
COMPILE_FLAGS
STACK_MAIN 1300
STACK_MAIN 1500
Copy link
Member

Choose a reason for hiding this comment

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

Why is this needed?

@bkueng bkueng merged commit 19ad803 into master Aug 5, 2019
@bkueng bkueng deleted the oa_add_command branch August 5, 2019 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants