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

New vehicle action #1628

Merged
merged 1 commit into from
Sep 9, 2022
Merged

New vehicle action #1628

merged 1 commit into from
Sep 9, 2022

Conversation

rligocki
Copy link
Contributor

No description provided.

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.

What are those cmake.yml for? 🤔

@julianoes
Copy link
Collaborator

@rligocki should we try another effort to get this in?

@rligocki
Copy link
Contributor Author

rligocki commented Jan 4, 2022

Let's do it. But I will need little bit of guidance.

@julianoes
Copy link
Collaborator

@rligocki I've squashed all your commits into one, and removed the files you had added by accident. We now need to add the actual implementation back in. I suggest you fetch this state and add a commit on top with the implementation.

The way to get to this state (without ugly merges) would be:

The steps below assume that origin is your fork:

git stash # to get rid of anything dirty in your tree, in case you need it later
git fetch origin
git checkout main
git reset --hard origin/main

This should wipe your changes and reset to the state of this PR. Note that it does not have any of the actual implementation here. So if you have that one somewhere locally, make sure to stash it or put it into a branch to use it later.

@rligocki
Copy link
Contributor Author

Now it should contain implementation and tests. This should work without any problem for 1.12 and 1.11 version of PX4. Only update of proto needs to be done.

@julianoes
Copy link
Collaborator

@rligocki this is still conflicting, see what GitHub says: ⬇️.

@rligocki
Copy link
Contributor Author

CI did not passed. Is it possible that it is caused by merge requests, that has been done?

@rligocki
Copy link
Contributor Author

Based on latest CI from main branch, it looks like PX4 1.12 tests failed because of latest commits in main branch.

@rligocki
Copy link
Contributor Author

Now it should be ok.

@julianoes
Copy link
Collaborator

@rligocki CI seems to fail the new test, any idea?

[  FAILED  ] SitlTest.MissionTakeoffAndLand

https://github.com/mavlink/MAVSDK/runs/5014636341?check_suite_focus=true#step:4:47103

@julianoes
Copy link
Collaborator

Looks good. I'll merge it next time I go through all PRs.

@julianoes
Copy link
Collaborator

Rebased and force pushed.

JonasVautherin
JonasVautherin previously approved these changes Sep 9, 2022
@julianoes
Copy link
Collaborator

Thanks @rligocki and sorry it took a while.

@julianoes julianoes mentioned this pull request Dec 27, 2023
13 tasks
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