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

Add AERT mixer #8881

Merged
merged 1 commit into from
Feb 14, 2018
Merged

Add AERT mixer #8881

merged 1 commit into from
Feb 14, 2018

Conversation

acfloria
Copy link
Member

Add the mixer used for HILstar in XPlane for HITL simulation.

Solves #7794.

@acfloria acfloria added Fixed Wing 🛩️ Sim: HITL hardware in the loop simulation labels Feb 13, 2018
@@ -0,0 +1,81 @@
Aileron/rudder/elevator/throttle mixer for PX4FMU
Copy link
Member

Choose a reason for hiding this comment

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

output ordering in comment

@dagar
Copy link
Member

dagar commented Feb 13, 2018

I'd prefer avoiding the confusion of having both AERT and AETR mixers if possible. Let's leave this PR open as a solution, but I'd like to first see if we can fix x-plane HIL as is.

@LorenzMeier
Copy link
Member

@dagar Given how long this is open I would love to have this fixed rather sooner than later - so if we can't resolve today, I would merge as-is.

@dagar
Copy link
Member

dagar commented Feb 14, 2018

It's easy enough to change for x-plane later.

@dagar dagar merged commit 6be5a0a into PX4:master Feb 14, 2018
@acfloria acfloria deleted the fix/x-plane-hil branch February 14, 2018 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fixed Wing 🛩️ Sim: HITL hardware in the loop simulation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants