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

Reintroduce slow down when landing manually #11540

Merged
merged 2 commits into from
Mar 11, 2019
Merged

Conversation

MaEtUgR
Copy link
Member

@MaEtUgR MaEtUgR commented Feb 25, 2019

Test data / coverage
Implementation is in our public release and tested a lot. The port is untested (not even SITL).

Describe problem solved by the proposed pull request
Same as #11487. I'm porting our solution here for comparison. Discussing with @bresch about how to proceed with the altitude slowdown/smoothing.

Additional context
#10659
There was a global position controller wide slow down constraint when flying downwards and getting close to the ground before the flight task architecture. For auto flight it was added again but not for manual flight yet.


} else if (_sub_home_position->get().valid_alt) {
dist_to_ground = -(_position(2) - _sub_home_position->get().z);
}
Copy link
Member

Choose a reason for hiding this comment

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

@bresch
Copy link
Member

bresch commented Feb 26, 2019

I tested this branch with the SmoothVel FlightTask and worked as expected:
https://logs.px4.io/plot_app?log=27b74a04-05a6-4489-936c-48ce2c2f4acc
slow_landing

@MaEtUgR The thing I might still want is to limit the upward velocity the same way.

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Feb 27, 2019

Devcall: @bresch tested and it seems viable for him. I need to add the slow, smooth takeoff the same way and then we can use this solution as first step. Improved constraint handling which was the idea in #11487 can be added on top.

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Mar 1, 2019

I already ported the same thing to upstream some time ago 😄 : #11080

@MaEtUgR MaEtUgR force-pushed the manual-land-slowdown branch from dd9780f to 3467bdb Compare March 1, 2019 21:52
@MaEtUgR MaEtUgR marked this pull request as ready for review March 1, 2019 21:52
@MaEtUgR MaEtUgR requested a review from Stifael March 1, 2019 21:53
@MaEtUgR
Copy link
Member Author

MaEtUgR commented Mar 1, 2019

@bresch I rebased on master and added the slow start upwards when close to ground part. I did a quick successful SITL test. Could you do your checks as well?

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Mar 2, 2019

slowdown

@bresch
Copy link
Member

bresch commented Mar 2, 2019

@MaEtUgR Cool, I'll try that tomorrow if possible.

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.

I made a few SITL tests and works as expected, I think it's ready to go for the flight test team.

@bresch
Copy link
Member

bresch commented Mar 8, 2019

SITL result with Smooth position control (Velocity) sub mode:
01_plot

@bresch
Copy link
Member

bresch commented Mar 8, 2019

@PX4/testflights Can you test that on a quadcopter please?
We need to test both Smooth position control (velocity) and Smooth position control of MPC_POS_MODE.
Please set MPC_ACC_DOWN_MAX and MPC_ACC_UP_MAX to 3 m/s^2 for nicer results

Thanks!

@bresch bresch requested a review from a team March 8, 2019 09:25
@jorge789
Copy link

jorge789 commented Mar 11, 2019

Parameters tested on Pixhawk v4Pro: Smooth position control of MPC_POS_MODE; 3m/s/s for MPC_ACC_DOWN_MAX and 3m/s/s for MPC_ACC_UP_MAX, no issues were noted. Good flight in general.

https://review.px4.io/plot_app?log=bc7f38cc-da4b-46ad-bc7d-c33837659a90

Parameters tested on Pixracer v4: Smooth position control of MPC_POS_MODE; 3m/s/s for MPC_ACC_DOWN_MAX and 3m/s/s for MPC_ACC_UP_MAX, no issues were noted. Good flight in general.

https://review.px4.io/plot_app?log=bc7f38cc-da4b-46ad-bc7d-c33837659a90

Parameters tested on Pixracer v4: Smooth position control (velocity) of MPC_POS_MODE; 3m/s/s for MPC_ACC_DOWN_MAX and 3m/s/s for MPC_ACC_UP_MAX, no issues were noted. Good flight in general.

https://review.px4.io/plot_app?log=2aff3e8a-cdcc-4075-8445-39b217efc403

@LorenzMeier LorenzMeier merged commit f794ee0 into master Mar 11, 2019
@LorenzMeier LorenzMeier deleted the manual-land-slowdown branch March 11, 2019 19:09
@LorenzMeier
Copy link
Member

Thanks for testing!

@Junkim3DR
Copy link

Junkim3DR commented Mar 11, 2019

Tested on Pixhawk 4 v5, parameter tested were:

  • Smooth position control for MPC_POS_MODE.
  • 3m/s/s for MPC_ACC_DOWN_MAX.
  • 3m/s/s for MPC_ACC_UP_MAX.

Issues Noted:

  • Parameters couldn't be saved while PR was loaded (Lost connection a few seconds after changing parameters). Solution: Load Master, change parameters and then load PR.
  • Not disarming automatically nor manually, kill switch not working.

https://review.px4.io/plot_app?log=43aece45-c1ea-49dd-a22d-5ff0d577bb6a

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Mar 21, 2019

@Junkim3DR One moment. This pr does not change anything with the parameters you listed. Ar you completely sure that it was the cause of your problems? Were there any follow-ups I missed? Does this still happen on master after the pr was merged?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants