Merge branch 'master' into FMGC

This commit is contained in:
Joshua Davidson 2019-02-10 21:10:43 -05:00
commit c208121831

View file

@ -1503,7 +1503,6 @@
<input>hydraulics/elevator-l/switch</input>
<rate_limit>100</rate_limit>
<lag>14.5</lag>
<output>/controls/flight/elevator-left</output>
</actuator>
<aerosurface_scale name="hydraulics/elevator-l/final-deg">
@ -1542,7 +1541,6 @@
<input>hydraulics/elevator-r/switch</input>
<rate_limit>100</rate_limit>
<lag>14.5</lag>
<output>/controls/flight/elevator-right</output>
</actuator>
<aerosurface_scale name="hydraulics/elevator-r/final-deg">
@ -1555,7 +1553,7 @@
</channel>
<channel name="Elevator Trim">
<channel name="Pitch Trim">
<aerosurface_scale name="hydraulics/elevator-trim/cmd-deg">
<input>/controls/flight/elevator-trim</input>