Skip to content

SITL: Ship landing documentation #29773

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

ohyaiamhere
Copy link

Contributing to #22903 by looking at the Ship parameters for SITL and writing documentation for the same. Corrections from previous #29769 to confirm better with contribution guidelines.

CI Checks:
shipCI

Param checks:
ShipParam

@peterbarker
Copy link
Contributor

@ohyaiamhere note that you don't need to close your PR and open a fresh one; you can "force-push your branches". See https://ardupilot.org/dev/docs/git-interactive-rebase.html

Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@peterbarker peterbarker requested a review from Georacer April 13, 2025 11:43
Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

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

Actually ,sorry, just noted that the commits aren't quite right.

We should have one commit containig changes in Tools and another for the SITL changes.

One would be prefixed with autotest: the other SITL:.

Please let me know if you would like help making those changes. They're trivial for me to do, tougher if you haven't used git way too much.

@ohyaiamhere
Copy link
Author

Hello Peter,

Thank you for the corrections and the offer. I'd like to try to figure it our myself, because I plan to contribute a lot more in this repo later :)

I hope you can excuse my erratic pull requests.

I will go through the link you posted regarding rebase and others regarding description guidelines for pull requests and do the needful.

@peterbarker
Copy link
Contributor

Thank you for the corrections and the offer. I'd like to try to figure it our myself, because I plan to contribute a lot more in this repo later :)

Great!

I hope you can excuse my erratic pull requests.

Absolutely not a problem.

I will go through the link you posted regarding rebase and others regarding description guidelines for pull requests and do the needful.

Great!

This looks good except you've now got a merge commit in your history. We don't do merge commits in the master repository. If you rebase your branch on master it should disappear, then you can force-push agian.

@ohyaiamhere
Copy link
Author

Hello Peter,

I've rebased my own fork to the current master (with the new changes) and created the two commits.

@peterbarker
Copy link
Contributor

@ohyaiamhere did you just hit the "update with merge" button again?!

@ohyaiamhere
Copy link
Author

Yes, I am so sorry. Let me rebase it on master and force push again.

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