Control: Fix wrong order of actuator implementation in FCS, spoilers are ok

This commit is contained in:
Joshua Davidson 2019-02-10 21:30:54 -05:00
parent b3f7c51cb9
commit 5d85796f88
2 changed files with 46 additions and 58 deletions

View file

@ -1367,19 +1367,19 @@
</clipto> </clipto>
</switch> </switch>
<actuator name="hydraulics/aileron-l/final"> <aerosurface_scale name="hydraulics/aileron-l/cmd-deg">
<input>hydraulics/aileron-l/switch</input> <input>hydraulics/aileron-l/switch</input>
<rate_limit>100</rate_limit>
<lag>14.5</lag>
</actuator>
<aerosurface_scale name="hydraulics/aileron-l/final-deg">
<input>hydraulics/aileron-l/final</input>
<range> <range>
<min>-25</min> <min>-25</min>
<max>25</max> <max>25</max>
</range> </range>
</aerosurface_scale> </aerosurface_scale>
<actuator name="hydraulics/aileron-l/final-deg">
<input>hydraulics/aileron-l/cmd-deg</input>
<rate_limit>150</rate_limit>
<lag>26.5</lag>
</actuator>
</channel> </channel>
@ -1442,19 +1442,19 @@
</clipto> </clipto>
</switch> </switch>
<actuator name="hydraulics/aileron-r/final"> <aerosurface_scale name="hydraulics/aileron-r/cmd-deg">
<input>hydraulics/aileron-r/switch</input> <input>hydraulics/aileron-r/switch</input>
<rate_limit>100</rate_limit>
<lag>14.5</lag>
</actuator>
<aerosurface_scale name="hydraulics/aileron-r/final-deg">
<input>hydraulics/aileron-r/final</input>
<range> <range>
<min>-25</min> <min>-25</min>
<max>25</max> <max>25</max>
</range> </range>
</aerosurface_scale> </aerosurface_scale>
<actuator name="hydraulics/aileron-r/final-deg">
<input>hydraulics/aileron-r/cmd-deg</input>
<rate_limit>150</rate_limit>
<lag>26.5</lag>
</actuator>
</channel> </channel>
@ -1499,19 +1499,19 @@
</clipto> </clipto>
</switch> </switch>
<actuator name="hydraulics/elevator-l/final"> <aerosurface_scale name="hydraulics/elevator-l/cmd-deg">
<input>hydraulics/elevator-l/switch</input> <input>hydraulics/elevator-l/switch</input>
<rate_limit>100</rate_limit>
<lag>14.5</lag>
</actuator>
<aerosurface_scale name="hydraulics/elevator-l/final-deg">
<input>hydraulics/elevator-l/final</input>
<range> <range>
<min>-30</min> <min>-30</min>
<max>17</max> <max>17</max>
</range> </range>
</aerosurface_scale> </aerosurface_scale>
<actuator name="hydraulics/elevator-l/final-deg">
<input>hydraulics/elevator-l/cmd-deg</input>
<rate_limit>150</rate_limit>
<lag>26.5</lag>
</actuator>
</channel> </channel>
@ -1537,24 +1537,31 @@
</clipto> </clipto>
</switch> </switch>
<actuator name="hydraulics/elevator-r/final"> <aerosurface_scale name="hydraulics/elevator-r/cmd-deg">
<input>hydraulics/elevator-r/switch</input> <input>hydraulics/elevator-r/switch</input>
<rate_limit>100</rate_limit>
<lag>14.5</lag>
</actuator>
<aerosurface_scale name="hydraulics/elevator-r/final-deg">
<input>hydraulics/elevator-r/final</input>
<range> <range>
<min>-30</min> <min>-30</min>
<max>17</max> <max>17</max>
</range> </range>
</aerosurface_scale> </aerosurface_scale>
<actuator name="hydraulics/elevator-r/final-deg">
<input>hydraulics/elevator-r/cmd-deg</input>
<rate_limit>150</rate_limit>
<lag>26.5</lag>
</actuator>
</channel> </channel>
<channel name="Pitch Trim"> <channel name="Pitch Trim">
<switch name="hydraulics/elevator-trim/rate">
<default value="0.125"/>
<test value="0.25">
/systems/hydraulic/green-psi ge 1500
</test>
</switch>
<aerosurface_scale name="hydraulics/elevator-trim/cmd-deg"> <aerosurface_scale name="hydraulics/elevator-trim/cmd-deg">
<input>/controls/flight/elevator-trim</input> <input>/controls/flight/elevator-trim</input>
<domain> <domain>
@ -1567,30 +1574,11 @@
</range> </range>
</aerosurface_scale> </aerosurface_scale>
<switch name="hydraulics/elevator-trim/rate"> <actuator name="hydraulics/elevator-trim/final-deg">
<default value="0.01"/> <input>hydraulics/elevator-trim/cmd-deg</input>
<test value="0.02">
/systems/hydraulic/green-psi ge 1500
</test>
</switch>
<actuator name="hydraulics/elevator-trim/final">
<input>/controls/flight/elevator-trim</input>
<rate_limit>hydraulics/elevator-trim/rate</rate_limit> <rate_limit>hydraulics/elevator-trim/rate</rate_limit>
<lag>10.5</lag> <lag>22.5</lag>
</actuator> </actuator>
<aerosurface_scale name="hydraulics/elevator-trim/final-deg">
<input>hydraulics/elevator-trim/final</input>
<domain>
<min>-1.00</min>
<max>0.32</max>
</domain>
<range>
<min>-12.5</min>
<max>4.0</max>
</range>
</aerosurface_scale>
</channel> </channel>
@ -1646,19 +1634,19 @@
</clipto> </clipto>
</switch> </switch>
<actuator name="hydraulics/rudder/final"> <aerosurface_scale name="hydraulics/rudder/cmd-deg">
<input>hydraulics/rudder/switch</input> <input>hydraulics/rudder/switch</input>
<rate_limit>100</rate_limit>
<lag>13.5</lag>
</actuator>
<aerosurface_scale name="hydraulics/rudder/final-deg">
<input>hydraulics/rudder/final</input>
<range> <range>
<min>-25</min> <min>-25</min>
<max>25</max> <max>25</max>
</range> </range>
</aerosurface_scale> </aerosurface_scale>
<actuator name="hydraulics/rudder/final-deg">
<input>hydraulics/rudder/cmd-deg</input>
<rate_limit>150</rate_limit>
<lag>25.5</lag>
</actuator>
</channel> </channel>

View file

@ -1 +1 @@
4757 4758