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

Update jMAVsim submodule and use SDK port in HITL #11990

Merged
merged 2 commits into from
May 9, 2019

Conversation

julianoes
Copy link
Contributor

This includes two small fixes for jMAVSim HITL, for more detail check the commit messages.

Tested:

  • jMAVSim HITL
  • jMAVSim SITL
  • jMAVSim SITL with two vehicles

@julianoes julianoes requested a review from bkueng May 9, 2019 07:44
@julianoes
Copy link
Contributor Author

@dagar @LorenzMeier this should go into 1.9.

bkueng
bkueng previously approved these changes May 9, 2019
LorenzMeier
LorenzMeier previously approved these changes May 9, 2019
@LorenzMeier
Copy link
Member

Let's get this merged as soon as it passes.

julianoes added 2 commits May 9, 2019 17:14
This fixes cross-talk between the QGC and SDK UDP ports for HITL.
We forgot to add the option -s for jmavsim_run.sh which starts jMAVSim
with the UDP port connecting to the SDK (port 14540).
@julianoes julianoes dismissed stale reviews from LorenzMeier and bkueng via b85f964 May 9, 2019 15:14
@julianoes julianoes force-pushed the pr-jmavsim-sdk-port branch from 35009a2 to b85f964 Compare May 9, 2019 15:14
@julianoes
Copy link
Contributor Author

Submodule updated to master and branch rebased, ready to be merged.

@julianoes julianoes merged commit e80d394 into master May 9, 2019
@julianoes julianoes deleted the pr-jmavsim-sdk-port branch May 9, 2019 16:27
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.

5 participants