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.

Sign up for GitHub

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

Jump to bottom

vtol fixes #8958

Merged
merged 5 commits into from
Mar 1, 2018
Merged

vtol fixes #8958

merged 5 commits into from
Mar 1, 2018

Conversation

sanderux
Copy link
Member

Small fixes

  • Force VTOL landing also during transitions (if land is engaged during front transition)
  • Increase front transition duration limits

SITL tested.

@sanderux sanderux requested a review from LorenzMeier February 24, 2018 22:23
@sanderux sanderux added the Hybrid VTOL 🛩️🚁 Multirotor + Fixedwing! label Feb 24, 2018
@lamping7
Copy link
Member

lamping7 commented Feb 25, 2018 •
edited
Loading

CI failed because it didn't land.
http://ci.px4.io:8080/blue/organizations/jenkins/Firmware/detail/PR-8958/2/pipeline/729

FCU never reported reaching the WP. This was the WP:

    frame: 3
    command: 21
    is_current: True
    autocontinue: True
    param1: 25.0
    param2: 0.0
    param3: 0.0
    param4: 0.0
    x_lat: 47.3992118835
    y_long: 8.54301234484
    z_alt: 12.0

This log (bad): https://logs.px4.io/plot_app?log=862a9e5e-89d3-402a-803f-baf7b729bea3
Known good log: https://logs.px4.io/plot_app?log=2b04575f-b7ae-43e7-ae63-29c613e3d913

@sanderux
Copy link
Member Author

Runs a full mission fine in SITL here. I suspect a CI issue.
Log also showed a fully completed mission.
Lets see how it does now.

@lamping7
Copy link
Member

I ran this locally, outside of rostest with QGC. The vehicle doesn't land after the transition. It just hovers at the landing WP.

I converted the mission to QGCs .plan file format so you can take a look. I had to rename it .txt for GitHub to accept it.
vtol_old_2.txt

@sanderux
Copy link
Member Author

thanks, addressed

bresch
bresch previously approved these changes Feb 28, 2018
View reviewed changes
Copy link
Member

@bresch bresch left a comment

Choose a reason for hiding this comment

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

lgtm

dagar
dagar reviewed Mar 1, 2018
View reviewed changes
src/modules/navigator/navigator.h Outdated
@@ -260,7 +260,7 @@ class Navigator : public control::SuperBlock
float get_vtol_back_trans_deceleration() const { return _param_back_trans_dec_mss.get(); }
float get_vtol_reverse_delay() const { return _param_reverse_delay.get(); }

bool force_vtol() const { return _vstatus.is_vtol && !_vstatus.is_rotary_wing && _param_force_vtol.get(); }
bool force_vtol() const { return _vstatus.is_vtol && (!_vstatus.is_rotary_wing || _vstatus.in_transition_to_fw) && _param_force_vtol.get(); }
Copy link
Member

Choose a reason for hiding this comment

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

I'd say this is past being a one liner.

@sanderux
Copy link
Member Author

sanderux commented Mar 1, 2018

@dagar addressed

@dagar dagar merged commit 2ef9c4e into master Mar 1, 2018
@dagar dagar deleted the pr-vtol-fixes branch March 1, 2018 21:51
@mrpollo mrpollo mentioned this pull request Jun 5, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dagar dagar dagar approved these changes

@bresch bresch bresch left review comments

@LorenzMeier LorenzMeier Awaiting requested review from LorenzMeier

Assignees
No one assigned
Labels
Hybrid VTOL 🛩️🚁 Multirotor + Fixedwing!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sanderux @lamping7 @dagar @bresch