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

MAVLab course update: typos, comments (tudelft pr#64) #2593

Merged
merged 2 commits into from
Oct 13, 2020

Conversation

dewagter
Copy link
Member

@dewagter dewagter commented Oct 3, 2020

Import PR from tudelft#64
@matteobarbera

@matteobarbera
Copy link
Contributor

@dewagter the build fails while in the pre-install phase, sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y and sudo apt-get install -y --force-yes paparazzi-dev paparazzi-jsbsim gcc-arm-embedded gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libipc-run-perl rustc cargo libgazebo9-dev libgps-dev. Is this a Travis issue? I can't recreate it locally, and I see #2592 had a similar issue in one of the earlier commits

@dewagter
Copy link
Member Author

dewagter commented Oct 5, 2020

Build error seems quite unrelated to the commits.

Is being addressed in #2594

@dewagter
Copy link
Member Author

dewagter commented Oct 5, 2020

@matteobarbera
Can you pay special attention to the waypoint_set_ functions which were waypoint_move_ functions in the tudelft branch.

@matteobarbera
Copy link
Contributor

The mavlabCourse2019 branch in the tudelft repo does not have the waypoint_move_here_2d function defined, it's lagging behind paparazzi/master by a lot of commits

@gautierhattenberger
Copy link
Member

can you rebase on top of master to get #2594 changes ?

@matteobarbera
Copy link
Contributor

I've changed the waypoint_set_here_2d function with the more recent ones, and rebased to get the travis changes, but I can't edit the pull request directly. https://github.com/matteobarbera/paparazzi/tree/matteobarbera/update_course_rebase

@gautierhattenberger gautierhattenberger merged commit 9ace124 into master Oct 13, 2020
@gautierhattenberger gautierhattenberger deleted the update_course branch October 13, 2020 09:13
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.

None yet

3 participants